[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.0.32.0-2-g1695f04

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:54:55 CEST 2013


The branch, twofactorauth has been updated
       via  1695f0489687fc51ed2c5e01c8c70af49b480646 (commit)
      from  e4ccf57a72e1bcb61f583462578e17718208a66e (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:
 pyhoca/wxgui/frontend.py |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index bbdb399..b462e46 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -642,22 +642,26 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         except KeyError:
             pass
         if self.exit_on_disconnect:
-            self.Exit()
+            self.WakeUpIdle()
+            self.ExitMainLoop()
 
     def HOOK_no_such_command(self, cmd, profile_name='UNKNOWN', session_name='UNKNOWN'):
         self.notifier.send(_(u'%s - session failure') % profile_name, _('The command ,,%s\'\' is not available on X2go server\n%s).') % (cmd, session_name), icon='session_error', timeout=10000)
         if self.exit_on_disconnect:
-            self.Exit()
+            self.WakeUpIdle()
+            self.ExitMainLoop()
 
     def HOOK_rforward_request_denied(self, profile_name='UNKNOWN', session_name='UNKNOWN', server_port=0):
         self.notifier.send(_(u'%s - session warning') % profile_name, _(u'Reverse TCP port forwarding request for session %s to server port %s has been denied by the X2go server. This is a common issue with SSH, it might help to restart the X2go server\'s SSH daemon.') % (session_name, server_port), icon='session_warning', timeout=10000)
         if self.exit_on_disconnect:
-            self.Exit()
+            self.WakeUpIdle()
+            self.ExitMainLoop()
 
     def HOOK_forwarding_tunnel_setup_failed(self, profile_name='UNKNOWN', session_name='UNKNOWN', chain_host='UNKNOWN', chain_port=0):
         self.notifier.send(_(u'%s - session failure') % profile_name, _(u'Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed.') % (chain_host, chain_port, session_name), icon='session_error', timeout=10000)
         if self.exit_on_disconnect:
-            self.Exit()
+            self.WakeUpIdle()
+            self.ExitMainLoop()
 
     def HOOK_pulseaudio_not_supported_in_RDPsession(self):
         self.notifier.send(_(u'%s - audio warning') % self.appname, _(u'The X2go PulseAudio system is not available within Remote Desktop sessions.'), icon='audio_error', timeout=10000)


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)).




More information about the x2go-commits mailing list