x2go-commits March 2012

x2go-commits@lists.x2go.org

1 participants
192 discussions

pyhoca-gui.git - master (branch) updated: 0.1.0.10-132-g05e3a08
by git-admin＠x2go.org 22 Mar '12

22 Mar '12

The branch, master has been updated via 05e3a08419451b405d1a8b1d6e676df554b8c1c0 (commit) from f5950620dc1520bb5ea57f61e13bfe82715ec7a2 (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 05e3a08419451b405d1a8b1d6e676df554b8c1c0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 22 18:03:48 2012 +0100 Provide a separate SetExitHandler function to catch signals from outside. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/frontend.py | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f9c6b0a..76d75af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -82,6 +82,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Add connect and exit menu items if in single-session-profile mode. - Properly catch CTRL-C and SIGTERM signals. - Make sure application really exits gracefully. + - Provide a separate SetExitHandler function to catch signals from outside. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index f74a58a..4ec9ef0 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -69,6 +69,26 @@ import sessiontitle wx.SetDefaultPyEncoding("utf-8") wx.InitAllImageHandlers() +def SetExitHandler(func): + + if os.name == 'nt' : + try : + import win32api + result = win32api.SetConsoleCtrlHandler( func, True ) + if result == 0: + print '\nCould not SetConsoleCtrlHandler (error %r)' % win32api.GetLastError() + else : + print '\nSetConsoleCtrlHandler SUCCESS' + + except ImportError : + version = '.'.join( map( str, sys.version_info[ :2] ) ) + raise Exception( 'PyWin32 (win32api) is not installed.' ) + + else : + import signal + signal.signal( signal.SIGTERM, func ) + + class PyHocaGUI(wx.App, x2go.X2goClient): def __init__(self, args, logger, liblogger, @@ -155,12 +175,16 @@ class PyHocaGUI(wx.App, x2go.X2goClient): x2go.X2goClient.__init__(self, **_x2goclient_kwargs) + SetExitHandler(self._exit_handler) wx.App.__init__(self, redirect=False, clearSigInt=False) if not self.args.disable_splash: splash.PyHocaGUI_SplashScreen() self.Bind(wx.EVT_IDLE, self.OnIdle) + def _exit_handler(self): + WakeUpIdle() + ExitMainLoop() def OnInit(self): """\ @@ -998,3 +1022,4 @@ class PyHocaGUI(wx.App, x2go.X2goClient): evt = wx.IdleEvent() evt.SetId(_dummy_id) self.OnServerDisconnect(evt) + 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.1.0.10-131-gf595062
by git-admin＠x2go.org 22 Mar '12

22 Mar '12

The branch, master has been updated via f5950620dc1520bb5ea57f61e13bfe82715ec7a2 (commit) from c637f0d561f171465ad8edc57087e5a02fb8e51d (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 f5950620dc1520bb5ea57f61e13bfe82715ec7a2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 22 00:09:33 2012 +0100 do not redirect stdout/stderr, do not destroy wx objects ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 5ba1065..f74a58a 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -155,7 +155,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): x2go.X2goClient.__init__(self, **_x2goclient_kwargs) - wx.App.__init__(self, clearSigInt=False) + wx.App.__init__(self, redirect=False, clearSigInt=False) if not self.args.disable_splash: splash.PyHocaGUI_SplashScreen() @@ -300,7 +300,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient): # close open password dialogs (or other remaining windows) for _win in self._sub_windows: _win.Close() - _win.Destroy() for session_obj in [ _s for _s in self._X2goClient__client_running_sessions(return_objects=True) if _s.is_associated() ]: profile_name = session_obj.get_profile_name() if not self._hide_notifications_map.has_key(profile_name): @@ -309,7 +308,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient): gevent.spawn(session_obj.suspend) x2go.x2go_cleanup() self.about.Close() - self.about.Destroy() self.taskbar.Close() # the taskbar's OnExit method... 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.1.1.4-154-g451748c
by git-admin＠x2go.org 22 Mar '12

22 Mar '12

The branch, master has been updated via 451748c73bc038c127e89e05e8bb30d5814416aa (commit) from dc1531278cb19352e0744f2bc979022031be01b5 (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 451748c73bc038c127e89e05e8bb30d5814416aa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 21 23:45:40 2012 +0100 slight change in logging X-Server activities ----------------------------------------------------------------------- Summary of changes: x2go/xserver.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/xserver.py b/x2go/xserver.py index e239aee..217b577 100644 --- a/x2go/xserver.py +++ b/x2go/xserver.py @@ -252,13 +252,14 @@ class X2goXServer(threading.Thread): try: win32process.TerminateProcess(hProcess, 0) except win32process.error: - pass + self.logger('XServer ,,%s\'\' could not be terminated.' % self.xserver_name, loglevel=log.loglevel_DEBUG) + def stop_thread(self): """\ A call to this method will stop the XServer application and do a cleanup afterwards. """ - self.logger('stop_thread() method has been called', loglevel=log.loglevel_DEBUG) self._keepalive = False + self.logger('stop_thread() method has been called', loglevel=log.loglevel_DEBUG) 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.1.0.10-130-gc637f0d
by git-admin＠x2go.org 22 Mar '12

22 Mar '12

The branch, master has been updated via c637f0d561f171465ad8edc57087e5a02fb8e51d (commit) from 20652a1dcd988190b59e7cc9378c1409453c7c88 (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 c637f0d561f171465ad8edc57087e5a02fb8e51d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 21 23:44:04 2012 +0100 Make sure application really exits gracefully. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/frontend.py | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index afe7ea6..f9c6b0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -81,6 +81,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Do not let wx.EndBusyCursor crash the application on Windows. - Add connect and exit menu items if in single-session-profile mode. - Properly catch CTRL-C and SIGTERM signals. + - Make sure application really exits gracefully. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 74a2a88..5ba1065 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -311,7 +311,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self.about.Close() self.about.Destroy() self.taskbar.Close() - self.Destroy() # the taskbar's OnExit method... def OnTaskbarExit(self, evt): 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.1.0.10-129-g20652a1
by git-admin＠x2go.org 22 Mar '12

22 Mar '12

The branch, master has been updated via 20652a1dcd988190b59e7cc9378c1409453c7c88 (commit) from fc925cb37581beb10ab990cf9fd08dfb1453c21e (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 20652a1dcd988190b59e7cc9378c1409453c7c88 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 21 23:22:49 2012 +0100 Properly catch CTRL-C and SIGTERM signals. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca-gui | 2 ++ pyhoca/wxgui/frontend.py | 3 +-- 3 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 443408f..afe7ea6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -80,6 +80,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low to session profiles has been moved into Python X2Go. - Do not let wx.EndBusyCursor crash the application on Windows. - Add connect and exit menu items if in single-session-profile mode. + - Properly catch CTRL-C and SIGTERM signals. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca-gui b/pyhoca-gui index 3a2c3e8..b053624 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -330,8 +330,10 @@ def main(): thisPyHocaGUI = PyHocaGUI(args, logger, liblogger, version=VERSION) thisPyHocaGUI.MainLoop() except KeyboardInterrupt: + thisPyHocaGUI.WakeUpIdle() thisPyHocaGUI.ExitMainLoop() except SystemExit: + thisPyHocaGUI.WakeUpIdle() thisPyHocaGUI.ExitMainLoop() if __name__ == '__main__': diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index d8c7d31..74a2a88 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -155,7 +155,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): x2go.X2goClient.__init__(self, **_x2goclient_kwargs) - wx.App.__init__(self) + wx.App.__init__(self, clearSigInt=False) if not self.args.disable_splash: splash.PyHocaGUI_SplashScreen() @@ -297,7 +297,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient): STILL UNDOCUMENTED """ - # close open password dialogs (or other remaining windows) for _win in self._sub_windows: _win.Close() 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.1.1.4-153-gdc15312
by git-admin＠x2go.org 22 Mar '12

22 Mar '12

The branch, master has been updated via dc1531278cb19352e0744f2bc979022031be01b5 (commit) via aafd3280d5efd4df43199f3937b000427141a756 (commit) from 29e4a2a0c4ce194601992bc0e3e0dd9528dd9394 (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 dc1531278cb19352e0744f2bc979022031be01b5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 21 21:51:46 2012 +0100 add missing VcXsrv_development to known_xservers commit aafd3280d5efd4df43199f3937b000427141a756 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 21 21:51:14 2012 +0100 add newline at EOF ----------------------------------------------------------------------- Summary of changes: x2go/defaults.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/defaults.py b/x2go/defaults.py index 4c0705e..afc5de3 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -239,7 +239,7 @@ if X2GOCLIENT_OS == 'Windows': if X2GOCLIENT_OS == 'Windows': X2GO_CLIENTXCONFIG_DEFAULTS = { 'XServers': { - 'known_xservers': ['VcXsrv_shipped', 'VcXsrv', 'Xming', 'Cygwin-X', ], + 'known_xservers': ['VcXsrv_development', 'VcXsrv_shipped', 'VcXsrv', 'Xming', 'Cygwin-X', ], }, 'Cygwin-X': { 'display': 'localhost:40', @@ -421,4 +421,4 @@ X2GO_MIMEBOX_EXTENSIONS_BLACKLIST = [ X2GO_SHARE_VIEWONLY=0 X2GO_SHARE_FULLACCESS=1 -PUBAPP_MAX_NO_SUBMENUS=10 \ No newline at end of file +PUBAPP_MAX_NO_SUBMENUS=10 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.1.1.4-151-g29e4a2a
by git-admin＠x2go.org 22 Mar '12

22 Mar '12

The branch, master has been updated via 29e4a2a0c4ce194601992bc0e3e0dd9528dd9394 (commit) from ee383080755920c5078dbbba0de336939f83c467 (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 29e4a2a0c4ce194601992bc0e3e0dd9528dd9394 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 22 15:37:49 2012 +0100 For the Windows version, make VcXsrv-Server at the development location known to Python X2Go. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/defaults.py | 7 +++++++ 2 files changed, 9 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f23f549..33797eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low defaults.py. - For the Windows version, make shipped VcXsrv-Server known to Python X2Go. The shipped VcXsrv has to rest in $CLIENTAPPDIR/VcXsrv/vcxsrv.exe. + - For the Windows version, make VcXsrv-Server at the development location + known to Python X2Go. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/defaults.py b/x2go/defaults.py index 5f3939a..4c0705e 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -262,6 +262,13 @@ if X2GOCLIENT_OS == 'Windows': 'run_command': os.path.join(os.getcwd(), 'VcXsrv', 'vcxsrv.exe'), 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ], }, + 'VcXsrv_development': { + 'display': 'localhost:40', + 'process_name': 'vcxsrv.exe', + 'test_installed': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.11.4.0', 'vcxsrv.exe'), + 'run_command': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.11.4.0', 'vcxsrv.exe'), + 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ], + }, 'Xming': { 'display': 'localhost:40', 'process_name': 'Xming.exe', 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.1.1.4-150-gee38308
by git-admin＠x2go.org 22 Mar '12

22 Mar '12

The branch, master has been updated via ee383080755920c5078dbbba0de336939f83c467 (commit) from 07cdbad46bc21ca469e903eaf5b8a00e76e188d3 (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 ee383080755920c5078dbbba0de336939f83c467 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 22 15:27:48 2012 +0100 typo fix ----------------------------------------------------------------------- Summary of changes: x2go/defaults.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/defaults.py b/x2go/defaults.py index 8149520..5f3939a 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -255,7 +255,7 @@ if X2GOCLIENT_OS == 'Windows': 'run_command': os.path.join(os.environ['ProgramFiles'], 'VcXsrv', 'vcxsrv.exe'), 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ], }, - 'VcXsrv-shipped': { + 'VcXsrv_shipped': { 'display': 'localhost:40', 'process_name': 'vcxsrv.exe', 'test_installed': os.path.join(os.getcwd(), 'VcXsrv', 'vcxsrv.exe'), 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.1.1.4-149-g07cdbad
by git-admin＠x2go.org 22 Mar '12

22 Mar '12

The branch, master has been updated via 07cdbad46bc21ca469e903eaf5b8a00e76e188d3 (commit) from 7067c12cf3a2f575872cbd8b3490efd8a6d978bd (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 07cdbad46bc21ca469e903eaf5b8a00e76e188d3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 22 15:26:51 2012 +0100 For the Windows version, make shipped VcXsrv-Server known to Python X2Go. The shipped VcXsrv has to rest in $CLIENTAPPDIR/VcXsrv/vcxsrv.exe. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/defaults.py | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2fc90f5..f23f549 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Fix auto_start_or_resume method when using SSH proxy with interactive authentication. Provide default value for PUBAPP_MAX_NO_SUBMENUS in defaults.py. + - For the Windows version, make shipped VcXsrv-Server known to Python X2Go. + The shipped VcXsrv has to rest in $CLIENTAPPDIR/VcXsrv/vcxsrv.exe. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/defaults.py b/x2go/defaults.py index 0230435..8149520 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -239,7 +239,7 @@ if X2GOCLIENT_OS == 'Windows': if X2GOCLIENT_OS == 'Windows': X2GO_CLIENTXCONFIG_DEFAULTS = { 'XServers': { - 'known_xservers': ['VcXsrv', 'Xming', 'Cygwin-X', ], + 'known_xservers': ['VcXsrv_shipped', 'VcXsrv', 'Xming', 'Cygwin-X', ], }, 'Cygwin-X': { 'display': 'localhost:40', @@ -255,6 +255,13 @@ if X2GOCLIENT_OS == 'Windows': 'run_command': os.path.join(os.environ['ProgramFiles'], 'VcXsrv', 'vcxsrv.exe'), 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ], }, + 'VcXsrv-shipped': { + 'display': 'localhost:40', + 'process_name': 'vcxsrv.exe', + 'test_installed': os.path.join(os.getcwd(), 'VcXsrv', 'vcxsrv.exe'), + 'run_command': os.path.join(os.getcwd(), 'VcXsrv', 'vcxsrv.exe'), + 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ], + }, 'Xming': { 'display': 'localhost:40', 'process_name': 'Xming.exe', 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.1.1.4-148-g7067c12
by git-admin＠x2go.org 21 Mar '12

21 Mar '12

The branch, master has been updated via 7067c12cf3a2f575872cbd8b3490efd8a6d978bd (commit) from c7e4817344e2d930efdab307ed15e6845533f2ca (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 7067c12cf3a2f575872cbd8b3490efd8a6d978bd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 21 22:51:01 2012 +0100 Fix auto_start_or_resume method when using SSH proxy with interactive authentication. Provide default value for PUBAPP_MAX_NO_SUBMENUS in defaults.py. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2go/backends/control/_stdout.py | 2 +- x2go/defaults.py | 1 + x2go/session.py | 8 +++++--- 4 files changed, 10 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c567e73..2fc90f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,9 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Support auto-resuming and auto-starting of session with Python X2Go. - Include development location of nxproxy in possible file locations. - Add X2goClient method is_profile_connected. + - Fix auto_start_or_resume method when using SSH proxy with interactive + authentication. Provide default value for PUBAPP_MAX_NO_SUBMENUS in + defaults.py. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 58c6922..1a54f15 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -599,7 +599,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): return True return False - def get_published_applications(self, lang=None, refresh=False, raw=False, very_raw=False, max_no_submenus=0): + def get_published_applications(self, lang=None, refresh=False, raw=False, very_raw=False, max_no_submenus=defaults.PUBAPP_MAX_NO_SUBMENUS): """\ Retrieve the menu tree of published applications from X2Go server. diff --git a/x2go/defaults.py b/x2go/defaults.py index ce9190f..0230435 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -407,3 +407,4 @@ X2GO_MIMEBOX_EXTENSIONS_BLACKLIST = [ X2GO_SHARE_VIEWONLY=0 X2GO_SHARE_FULLACCESS=1 +PUBAPP_MAX_NO_SUBMENUS=10 \ No newline at end of file diff --git a/x2go/session.py b/x2go/session.py index ea0170d..1bbea20 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -37,11 +37,13 @@ import gevent import re # Python X2Go modules +import defaults import log import utils import session import x2go_exceptions + from x2go.backends.control import X2goControlSession as _X2goControlSession from x2go.backends.terminal import X2goTerminalSession as _X2goTerminalSession from x2go.backends.info import X2goServerSessionInfo as _X2goServerSessionInfo @@ -960,8 +962,6 @@ class X2goSession(object): self.control_params['password'] = '' if self.sshproxy_params and self.sshproxy_params.has_key('sshproxy_password'): del self.sshproxy_params['sshproxy_password'] - if self.auto_start_or_resume: - self.do_auto_start_or_resume() if not self.connected: # then tidy up... @@ -972,6 +972,8 @@ class X2goSession(object): if self.connected: self.update_status() self.retrieve_server_features() + if self.auto_start_or_resume: + gevent.spawn(self.do_auto_start_or_resume) return self.connected __connect = connect @@ -1257,7 +1259,7 @@ class X2goSession(object): return self.terminal_session.is_desktop_session() return False - def get_published_applications(self, lang=None, refresh=False, raw=False, very_raw=False, max_no_submenus=0): + def get_published_applications(self, lang=None, refresh=False, raw=False, very_raw=False, max_no_submenus=defaults.PUBAPP_MAX_NO_SUBMENUS): """\ Return a list of published menu items from the X2Go server for session type published applications. 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

← Newer
1
2
3
4
5
6
7
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits March 2012