[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.1.0.10-277-g99e23c3

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


The branch, twofactorauth has been updated
       via  99e23c35af1a3fe3a1e06cd55a29d605d928c561 (commit)
      from  dbd4e8c2126de479b9b3d8c190ae744e78ecf51e (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, 6 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 9c5276d..77e9d75 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -364,7 +364,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         if not self.args.session_profile:
             self._X2goClient__register_all_session_profiles()
 
-    def session_auto_connect(self, session_uuid):
+    def session_auto_connect(self, session_uuid, **kwargs):
         """\
         Override C{X2goClient.session_auto_connect()} to always divert authentication to L{OnSessionAuthenticate}.
 
@@ -376,7 +376,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         if self.auto_connect and self.get_session(session_uuid).get_session_profile_option('auto_connect'):
             self.HOOK_profile_auto_connect(self.get_session_profile_name(session_uuid))
 
-    def HOOK_profile_auto_connect(self, profile_name):
+    def HOOK_profile_auto_connect(self, profile_name, **kwargs):
         """\
         Override C{X2goClient.HOOK_profile_auto_connect()} to always divert authentication to L{OnSessionAuthenticate}.
 
@@ -395,7 +395,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
 
             self.OnSessionAuthenticate(evt, session_uuid=session_uuid)
 
-    def session_auto_start_or_resume(self, session_uuid, newest=True, oldest=False, all_suspended=False):
+    def session_auto_start_or_resume(self, session_uuid, newest=True, oldest=False, all_suspended=False, **kwargs):
         """\
         Override C{X2goClient.session_auto_start_or_resume()} to differentiate between the application options
         C{resume_newest_on_connect}, C{resume_oldest_on_connect} and C{resume_all_on_connect}.
@@ -406,11 +406,11 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         """
         if not self.get_session(session_uuid).published_applications:
             if self.resume_newest_on_connect:
-                self._X2goClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect)
+                self._X2goClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect, **kwargs)
             elif self.resume_oldest_on_connect:
-                self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, oldest=True, start=self.start_on_connect)
+                self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, oldest=True, start=self.start_on_connect, **kwargs)
             elif self.resume_all_on_connect:
-                self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect)
+                self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect, **kwargs)
 
     def _exit_handler(self, *args):
         """\


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