x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

nx-libs.git - master (branch) updated: redist-server/3.5.0.14-4-g3fdfd51
by git-admin＠x2go.org 13 Jul '12

13 Jul '12

The branch, master has been updated via 3fdfd5142dc322b6c1f1afd5de853ba301dff02c (commit) from b42268b13cf1ecccc88e33c243dc5d1c2c819041 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3fdfd5142dc322b6c1f1afd5de853ba301dff02c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jul 13 16:36:27 2012 +0200 Add VERSION.x2goagent to package x2goagent package so x2goversion command lists up x2goagent in the list of X2Go server-side packages. ----------------------------------------------------------------------- Summary of changes: debian/VERSION.x2goagent | 1 + debian/changelog | 2 ++ debian/x2goagent.install | 3 ++- 3 files changed, 5 insertions(+), 1 deletions(-) create mode 100644 debian/VERSION.x2goagent The diff of changes is: diff --git a/debian/VERSION.x2goagent b/debian/VERSION.x2goagent new file mode 100644 index 0000000..a1320c3 --- /dev/null +++ b/debian/VERSION.x2goagent @@ -0,0 +1 @@ +3.5.0.15 \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 1fe61e1..46c9a11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ nx-libs (2:3.5.0.15-0) UNRELEASED; urgency=low sure nxagent launches even with pam_tmpdir.so being in use. * Improve 023_add-x2goagent-wrapper.full.patch: Properly set NX_TEMP, make sure x2goagent launches even with pam_tmpdir.so being in use. + * Add VERSION.x2goagent to package x2goagent package so x2goversion command + lists up x2goagent in the list of X2Go server-side packages. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Jun 2012 14:54:51 +0200 diff --git a/debian/x2goagent.install b/debian/x2goagent.install index 8fa8af8..20019f1 100644 --- a/debian/x2goagent.install +++ b/debian/x2goagent.install @@ -1,3 +1,4 @@ bin/x2goagent usr/bin debian/rgb usr/share/x2go -nx-X11/programs/Xserver/hw/nxagent/x2go.xpm usr/share/pixmaps \ No newline at end of file +nx-X11/programs/Xserver/hw/nxagent/x2go.xpm usr/share/pixmaps +debian/VERSION.x2goagent usr/share/x2go/versions \ No newline at end of file hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.2-1-g90e379f
by git-admin＠x2go.org 12 Jul '12

12 Jul '12

The branch, master has been updated via 90e379f58839e4b757f73af72fb263b08bc0138a (commit) from 701b63f78215a2c6a75cbe2e1c10a9a220a23a01 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 90e379f58839e4b757f73af72fb263b08bc0138a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 12 21:48:59 2012 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ pyhoca/wxgui/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4a03674..15917bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pyhoca-gui (0.2.0.3-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 12 Jul 2012 21:48:46 +0200 + pyhoca-gui (0.2.0.2-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.2): diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 411c05d..ef6fd76 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.2.0.2' +__VERSION__ = '0.2.0.3' from frontend import * hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - build-main (branch) updated: 0.2.0.2
by git-admin＠x2go.org 12 Jul '12

12 Jul '12

The branch, build-main has been updated via 701b63f78215a2c6a75cbe2e1c10a9a220a23a01 (commit) via a53bc4370cb348d35fcc06e8710397ea9983f579 (commit) via 123028d8ae1b24d27874760bd5dbefd0fca2ba08 (commit) via 002bd87ff82e3896fb3753da08ffae4f4f7803b5 (commit) via 4c4ad0c0754ab33ebfc0005c8fcb3ca3078a3575 (commit) from 01ce60e2b2b659463f7c603dcf7be49bdefbdb8a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 12 ++++++++++++ pyhoca/wxgui/__init__.py | 2 +- pyhoca/wxgui/logon.py | 3 ++- pyhoca/wxgui/profilemanager.py | 9 +++------ 4 files changed, 18 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f1ccd86..4a03674 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +pyhoca-gui (0.2.0.2-0~x2go1) unstable; urgency=low + + * New upstream version (0.2.0.2): + - Allow modifications of session icon and shared folder tab while + a session profile is connected. + - Allow SSH ports less than 22 in session profile manager. SSH ports + below port 22 is not that much of a common practice, but it eases + keyboard input in the corresponding wx widgets. + - Avoid KeyError in logon window. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 12 Jul 2012 21:43:33 +0200 + pyhoca-gui (0.2.0.1-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.1): diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 0a61762..411c05d 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.2.0.1' +__VERSION__ = '0.2.0.2' from frontend import * diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index 07e8707..e5ba605 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -429,7 +429,8 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): if self._PyHocaGUI._X2goClient__is_session_connected(session_uuid): self._PyHocaGUI._post_authenticate(evt, session_uuid) self.sshproxy_started = False - del self._PyHocaGUI._logon_windows[self.current_profile_name] + try: del self._PyHocaGUI._logon_windows[self.current_profile_name] + except KeyError: pass self.Close() self.Destroy() diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index ea5f823..2ff1987 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -225,7 +225,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.HostLabel = wx.StaticText(self.tab_Connection, -1, _(u"Host")+':') self.Host = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) self.SSHPortLabel = wx.StaticText(self.tab_Connection, -1, _(u"Port")+':') - self.SSHPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=65534) + self.SSHPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=1, max=65534) self.SSHKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"RSA/DSA private key")+':') self.SSHKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER) self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), ) @@ -239,10 +239,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20)) self.SSHProxyTunnelLabel = wx.StaticText(self.tab_Connection, -1, _(u"SSH Proxy Tunnel")+':') self.SSHProxyTunnelFromHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) - self.SSHProxyTunnelFromPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=65534) + self.SSHProxyTunnelFromPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=1, max=65534) self.SSHProxyTunnelBetweenLabel = wx.StaticText(self.tab_Connection, -1, " -> ") self.SSHProxyTunnelToHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) - self.SSHProxyTunnelToPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=65534) + self.SSHProxyTunnelToPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=1, max=65534) self.LinkSpeed = wx.Slider(self.tab_Connection, -1, 0, 0, 4) self.ModemLabel = wx.StaticText(self.tab_Connection, -1, "|\n "+_(u"Modem"), style=wx.ALIGN_CENTRE) @@ -1116,8 +1116,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.staticbox_Profile.Enable(False) self.ProfileNameLabel.Enable(False) self.ProfileName.Enable(False) - self.IconButton.Enable(False) - self.IconButtonLabel.Enable(False) self.HostLabel.Enable(False) self.Host.Enable(False) self.UserNameLabel.Enable(False) @@ -1141,7 +1139,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyTunnelBetweenLabel.Enable(False) self.SSHProxyTunnelToHost.Enable(False) self.SSHProxyTunnelToPort.Enable(False) - self.tab_SharedFilesAndFolders.Enable(False) def __update_from_screen(self): """\ hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.1-5-g701b63f
by git-admin＠x2go.org 12 Jul '12

12 Jul '12

The branch, master has been updated via 701b63f78215a2c6a75cbe2e1c10a9a220a23a01 (commit) from a53bc4370cb348d35fcc06e8710397ea9983f579 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 701b63f78215a2c6a75cbe2e1c10a9a220a23a01 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 12 21:43:50 2012 +0200 release 0.2.0.2 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c186ccd..4a03674 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pyhoca-gui (0.2.0.2-0~x2go1) UNRELEASED; urgency=low +pyhoca-gui (0.2.0.2-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.2): - Allow modifications of session icon and shared folder tab while @@ -8,7 +8,7 @@ pyhoca-gui (0.2.0.2-0~x2go1) UNRELEASED; urgency=low keyboard input in the corresponding wx widgets. - Avoid KeyError in logon window. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 02 Jul 2012 20:51:37 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 12 Jul 2012 21:43:33 +0200 pyhoca-gui (0.2.0.1-0~x2go1) unstable; urgency=low hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

python-x2go.git - master (branch) updated: 0.2.0.7-1-g3b530bf
by git-admin＠x2go.org 12 Jul '12

12 Jul '12

The branch, master has been updated via 3b530bffe8d2908683ffb785989f6b1c420d0587 (commit) from 1b376af2f94fca115ef3f8239394416940731620 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3b530bffe8d2908683ffb785989f6b1c420d0587 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 12 21:28:50 2012 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ x2go/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9a6a1d2..2687590 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-x2go (0.2.0.8-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 12 Jul 2012 21:28:36 +0200 + python-x2go (0.2.0.7-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.7): diff --git a/x2go/__init__.py b/x2go/__init__.py index 9b73a72..31712d8 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -178,7 +178,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.2.0.7' +__VERSION__ = '0.2.0.8' from gevent import monkey monkey.patch_all() hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - build-main (branch) updated: 0.2.0.7
by git-admin＠x2go.org 12 Jul '12

12 Jul '12

The branch, build-main has been updated via 1b376af2f94fca115ef3f8239394416940731620 (commit) via 8e5e79a0cca5e63ee05b90d1c6d985bcb6306b31 (commit) via bc957c408401c7583cb07618c0fc9aee762de3ec (commit) via 4d9aad32b35c89acda9c1a6980d4de6d24eb5f02 (commit) via 1a965b5147e4bb59fe764c4130f2157195a3dae7 (commit) via 3c94299f2518a10e1514508f591eb3799ea7e809 (commit) from 7fc00a22089017c94f5b91437921c9a2aa6eca34 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 13 ++++++++++++- x2go/__init__.py | 2 +- x2go/backends/control/_stdout.py | 32 ++++++++++++++++++++++---------- 3 files changed, 35 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5fc854d..9a6a1d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +python-x2go (0.2.0.7-0~x2go1) unstable; urgency=low + + * New upstream version (0.2.0.7): + - Refresh server feature list on re-connecting (log-off, log-on). + - Fix property method X2goControlSession._x2go_remote_home on broken + connections. + - Make sure SSH proxy sessions get torn down on control session disconnect + no matter what happens to the control session itself. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 12 Jul 2012 21:27:24 +0200 + python-x2go (0.2.0.6-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.6) @@ -13,7 +24,7 @@ python-x2go (0.2.0.6-0~x2go1) unstable; urgency=low python-x2go (0.2.0.5-0~x2go1) unstable; urgency=low - * Bugfix release (0.2.0.4): + * Bugfix release (0.2.0.5): - Fix for building Python X2Go in pbuilder environment. Catch Xlib.error.DisplayConnectionError and ignore it. Now the real fix!!! diff --git a/x2go/__init__.py b/x2go/__init__.py index 14021c4..9b73a72 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -178,7 +178,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.2.0.6' +__VERSION__ = '0.2.0.7' from gevent import monkey monkey.patch_all() diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 05f355c..6dff16a 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -438,14 +438,19 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): else: return self._server_features - def query_server_features(self): + def query_server_features(self, force=False): """\ Do a query for the server-side list of X2Go features. + @param force: do not use the cached feature list, really ask the server (again) + @type force: C{bool} + @return: list of X2Go feature names @rtype: C{list} """ + if force: + self._server_features = None return self._x2go_server_features get_server_features = query_server_features @@ -457,8 +462,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): """ if self._remote_home is None: (stdin, stdout, stderr) = self._x2go_exec_command('echo $HOME') - self._remote_home = stdout.read().split()[0] - self.logger('remote user\' home directory: %s' % self._remote_home, loglevel=log.loglevel_DEBUG) + stdout_r = stdout.read() + if stdout_r: + self._remote_home = stdout_r.split()[0] + self.logger('remote user\' home directory: %s' % self._remote_home, loglevel=log.loglevel_DEBUG) return self._remote_home else: return self._remote_home @@ -816,7 +823,9 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): if self.get_transport(): self.session_died = False + self.query_server_features(force=True) + self._remote_home = None if not self.home_exists(): raise x2go_exceptions.X2goRemoteHomeException('remote home directory does not exist') @@ -869,21 +878,24 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): # in any case, release out internal transport lock self._transport_lock.release() + retval = False try: if self.get_transport() is not None: - still_active = self.get_transport().is_active() + retval = self.get_transport().is_active() try: self.close() except IOError: pass - if self.sshproxy_session is not None: - self.sshproxy_session.stop_thread() - return still_active - return False except AttributeError: # if the Paramiko _transport object has not yet been initialized, ignore it # but state that this method call did not close the SSH client, but was already closed - return False + pass + + # take down sshproxy_session no matter what happened to the control session itself + if self.sshproxy_session is not None: + self.sshproxy_session.stop_thread() + + return retval def home_exists(self): """\ @@ -959,7 +971,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): elif lang is None: lang = 'en' - if 'X2GO_PUBLISHED_APPLICATIONS' in self._x2go_server_features: + if 'X2GO_PUBLISHED_APPLICATIONS' in self.get_server_features(): if self._published_applications_menu is {} or \ not self._published_applications_menu.has_key(lang) or \ raw or very_raw or refresh or \ hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.2.0.6-6-g1b376af
by git-admin＠x2go.org 12 Jul '12

12 Jul '12

The branch, master has been updated via 1b376af2f94fca115ef3f8239394416940731620 (commit) via 8e5e79a0cca5e63ee05b90d1c6d985bcb6306b31 (commit) from bc957c408401c7583cb07618c0fc9aee762de3ec (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1b376af2f94fca115ef3f8239394416940731620 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 12 21:27:38 2012 +0200 release 0.2.0.7 commit 8e5e79a0cca5e63ee05b90d1c6d985bcb6306b31 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 12 21:21:06 2012 +0200 Make sure SSH proxy sessions get torn down on control session disconnect no matter what happens to the control session itself. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++-- x2go/backends/control/_stdout.py | 15 +++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2bb8c70..9a6a1d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,13 @@ -python-x2go (0.2.0.7-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.2.0.7-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.7): - Refresh server feature list on re-connecting (log-off, log-on). - Fix property method X2goControlSession._x2go_remote_home on broken connections. + - Make sure SSH proxy sessions get torn down on control session disconnect + no matter what happens to the control session itself. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 02 Jul 2012 20:57:37 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 12 Jul 2012 21:27:24 +0200 python-x2go (0.2.0.6-0~x2go1) unstable; urgency=low diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index b58445c..6dff16a 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -878,21 +878,24 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): # in any case, release out internal transport lock self._transport_lock.release() + retval = False try: if self.get_transport() is not None: - still_active = self.get_transport().is_active() + retval = self.get_transport().is_active() try: self.close() except IOError: pass - if self.sshproxy_session is not None: - self.sshproxy_session.stop_thread() - return still_active - return False except AttributeError: # if the Paramiko _transport object has not yet been initialized, ignore it # but state that this method call did not close the SSH client, but was already closed - return False + pass + + # take down sshproxy_session no matter what happened to the control session itself + if self.sshproxy_session is not None: + self.sshproxy_session.stop_thread() + + return retval def home_exists(self): """\ hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.1-4-ga53bc43
by git-admin＠x2go.org 09 Jul '12

09 Jul '12

The branch, master has been updated via a53bc4370cb348d35fcc06e8710397ea9983f579 (commit) from 123028d8ae1b24d27874760bd5dbefd0fca2ba08 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a53bc4370cb348d35fcc06e8710397ea9983f579 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 9 11:12:29 2012 +0200 Avoid KeyError in logon window. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/logon.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6ed9aa7..c186ccd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ pyhoca-gui (0.2.0.2-0~x2go1) UNRELEASED; urgency=low - Allow SSH ports less than 22 in session profile manager. SSH ports below port 22 is not that much of a common practice, but it eases keyboard input in the corresponding wx widgets. + - Avoid KeyError in logon window. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 02 Jul 2012 20:51:37 +0200 diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index 07e8707..e5ba605 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -429,7 +429,8 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): if self._PyHocaGUI._X2goClient__is_session_connected(session_uuid): self._PyHocaGUI._post_authenticate(evt, session_uuid) self.sshproxy_started = False - del self._PyHocaGUI._logon_windows[self.current_profile_name] + try: del self._PyHocaGUI._logon_windows[self.current_profile_name] + except KeyError: pass self.Close() self.Destroy() hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

x2goclient.git - master (branch) updated: 3.99.2.1-6-gd4d0fe3
by git-admin＠x2go.org 05 Jul '12

05 Jul '12

The branch, master has been updated via d4d0fe38610d3e514dc2e4e259ce8f103e4ac535 (commit) from 647ab75f420637994b0cc400590adedd106e0c28 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d4d0fe38610d3e514dc2e4e259ce8f103e4ac535 Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Date: Thu Jul 5 13:29:48 2012 +0200 Fixing X2Go Plugin ----------------------------------------------------------------------- Summary of changes: config_linux_plugin.sh | 2 + debian/changelog | 4 +++ onmainwindow.cpp | 69 ++++++++++++++++++++++++++--------------------- 3 files changed, 44 insertions(+), 31 deletions(-) The diff of changes is: diff --git a/config_linux_plugin.sh b/config_linux_plugin.sh index 6081d51..d33a481 100755 --- a/config_linux_plugin.sh +++ b/config_linux_plugin.sh @@ -2,4 +2,6 @@ make distclean +lrelease x2goclient.pro + X2GO_CLIENT_TARGET=plugin qmake-qt4 diff --git a/debian/changelog b/debian/changelog index 3490eb6..27b94f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ x2goclient (3.99.2.2-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (3.99.2.2): - Drop Encoding key from .desktop file (as it is deprecated according to latest FreeDesktop.org specs). @@ -9,6 +10,9 @@ x2goclient (3.99.2.2-0~x2go1) UNRELEASED; urgency=low - Provide CPPFLAGS for QMAKE_CFLAGS _and_ QMAKE_CXXFLAGS. Provide them as first build parameters. + [ Oleksandr Shneyder ] + * Fixing X2Go Plugin + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 08 Jun 2012 23:17:02 +0200 x2goclient (3.99.2.1-0~x2go1) unstable; urgency=low diff --git a/onmainwindow.cpp b/onmainwindow.cpp index a85e37f..f68696a 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -382,6 +382,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) #if defined(CFGPLUGIN) && defined(Q_OS_LINUX) x2goDebug<<"create embedContainer"<<endl; embedContainer=new QX11EmbedContainer ( fr ); + #endif if ( !embedMode ) { @@ -7723,7 +7724,7 @@ QString ONMainWindow::getXDisplay() } else { - return (xsocket); + return (xsocket); } } } @@ -8944,6 +8945,8 @@ void ONMainWindow::startSshd() void ONMainWindow::setProxyWinTitle() { + if(embedMode) + return; QString title; @@ -9161,45 +9164,49 @@ void ONMainWindow::slotFindProxyWin() x2goDebug<<"proxy win found:"<<proxyWinId; setProxyWinTitle(); proxyWinTimer->stop(); - if (!useLdap) + if (!embedMode) { - X2goSettings *st; - QString sid; - if ( !embedMode ) - sid=lastSession->id(); - else - sid="embedded"; - - if (brokerMode) - st=new X2goSettings(config.iniFile,QSettings::IniFormat); - else - st= new X2goSettings( "sessions" ); - uint displays=QApplication::desktop()->numScreens(); - xinerama=st->setting()->value ( sid+"/xinerama", - ( QVariant ) defaultXinerama ).toBool(); - if (st->setting()->value ( sid+"/multidisp", - ( QVariant ) false ).toBool()) + if (!useLdap) { - uint disp=st->setting()->value ( sid+"/display", - ( QVariant ) 1 ).toUInt(); - if (disp>displays) + X2goSettings *st; + QString sid; + if ( !embedMode ) + sid=lastSession->id(); + else + sid="embedded"; + + if (brokerMode) + st=new X2goSettings(config.iniFile,QSettings::IniFormat); + else + st= new X2goSettings( "sessions" ); + uint displays=QApplication::desktop()->numScreens(); + xinerama=st->setting()->value ( sid+"/xinerama", + ( QVariant ) defaultXinerama ).toBool(); + if (st->setting()->value ( sid+"/multidisp", + ( QVariant ) false ).toBool()) { - disp=1; + uint disp=st->setting()->value ( sid+"/display", + ( QVariant ) 1 ).toUInt(); + if (disp>displays) + { + disp=1; + } + resizeProxyWinOnDisplay(disp); + return; } - resizeProxyWinOnDisplay(disp); - return; } - } - if (xinerama) - { - x2goDebug<<"Starting xinerama timer\n"; - lastDisplayGeometry=QRect(); - xineramaScreens.clear(); - xineramaTimer->start(500); + if (xinerama) + { + x2goDebug<<"Starting xinerama timer\n"; + lastDisplayGeometry=QRect(); + xineramaScreens.clear(); + xineramaTimer->start(500); + } } if ( embedMode ) { + x2goDebug<<"checking rootless config"; if ( config.rootless ) { x2goDebug<<"win is rootless"; hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.7-7-g88d814a
by git-admin＠x2go.org 04 Jul '12

04 Jul '12

The branch, master has been updated via 88d814adc6cc578c0e43806a29f5643451f58894 (commit) from bf757b40e4a378e416aefa140bd27222ef7b816d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 88d814adc6cc578c0e43806a29f5643451f58894 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 4 12:18:17 2012 +0200 Fix spelling of X2Go. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/x2gothinclient.init | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2e29800..16fca8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x2gothinclient (1.0.1.8-0~x2go1) UNRELEASED; urgency=low - Make x2gothinclient init script more robust. - Stop x2gothinclient init script if either x2gothinclient_init or x2gothinclient_start is missing/non-executable. + - Fix spelling of X2Go. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Jun 2012 22:27:46 +0200 diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init index c0950a1..42866d3 100644 --- a/debian/x2gothinclient.init +++ b/debian/x2gothinclient.init @@ -37,7 +37,7 @@ DESC="X2Go Thinclient Service" test -x $DAEMON || exit 0 if [ ! -x /etc/x2go/x2gothinclient_init ] || [ ! -x /etc/x2go/x2gothinclient_start ]; then - echo "X2go thin client system will not start as it is not configured, yet." + echo "X2Go Thin Client system will not start as it is not configured, yet." echo "See http://wiki.x2go.org/installing_x2go_thin_client_environment_debian" exit 0 fi hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits