[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.1.0.10-106-g8cf5888

[X2Go dev team]

The branch, master has been updated
       via  8cf58882de4af11c7238aaf6a046a12b2e18ec5f (commit)
      from  0ede3ea2232bbd63e6d13a22d858ada9543c6916 (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 8cf58882de4af11c7238aaf6a046a12b2e18ec5f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Mar 13 16:19:19 2012 +0100

    handle auto-connecting of single-session-profile sessions

-----------------------------------------------------------------------

Summary of changes:
 pyhoca/wxgui/frontend.py |    4 ++--
 pyhoca/wxgui/logon.py    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index e07fa11..f198759 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -278,7 +278,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         else:
             self._X2goClient__register_session(profile_name=self.args.session_profile)
         for session_uuid in self._X2goClient__client_registered_sessions(return_objects=False):
-            if self._X2goClient__session_can_auto_connect(session_uuid):
+            if self._X2goClient__session_can_auto_connect(session_uuid) or self.args.single_session_profile:
                 self._pyhoca_logger('auto-connecting to %s session profile' % self.get_session_profile_name(session_uuid), loglevel=x2go.log.loglevel_NOTICE)
 
                 # create a dummy event and call OnAuthenticate
@@ -540,7 +540,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
                 raise
 
 
-        if connect_failed and self.exit_on_disconnect:
+        if connect_failed and (self.exit_on_disconnect or self.args.single_session_profile):
             self.WakeUpIdle()
             self.ExitMainLoop()
 
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 6b66930..9437ae6 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -397,7 +397,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
         try: wx.EndBusyCursor()
         except: pass
 
-        if connect_failed and self._PyHocaGUI.exit_on_disconnect:
+        if connect_failed and (self._PyHocaGUI.exit_on_disconnect or self._PyHocaGUI.args.single_session_profile):
             self._PyHocaGUI.WakeUpIdle()
             self._PyHocaGUI.ExitMainLoop()
 


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