The branch, master has been updated via be7d894c9c82d590626fdf05bfbe66dd763f772d (commit) from 626410a639380a6a6b54840e0af42790ce02bf44 (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 be7d894c9c82d590626fdf05bfbe66dd763f772d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 23 11:16:19 2011 +0200 Use X2goClient.session_can_auto_connect method to detect if we can use SSH pubkey authentication. Speeds up appearance of password dialog box. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/frontend.py | 34 +++++++++++++++++++--------------- 2 files changed, 21 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cd937cc..0d1db30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ pyhoca-gui (0.1.0.9-0~x2go1) UNRELEASED; urgency=low - Update of en/de translation files. - Suspend running sessions properly on application exit (or STRG-C in terminal window if run from the command line). + - Use X2goClient.session_can_auto_connect method to detect if we can use + SSH pubkey authentication. Speeds up appearance of password dialog box. * Depend on python-x2go (>=0.1.1.7). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 14 Sep 2011 21:49:08 +0200 diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 14a8542..a954ba1 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -352,22 +352,26 @@ class PyHocaGUI(wx.App, x2go.X2goClient): connect_failed = False profile_name = self.current_profile_name try: - self._X2goClient__connect_session(session_uuid) - if not self._X2goClient__server_valid_x2gouser(session_uuid): - self.notifier.send(_(u'%s - connect failure') % profile_name, _(u'User is not allowed to start X2go sessions!'), icon='session_warning', timeout=10000) - self.OnServerDisconnect(evt) - try: - self._temp_disabled_profile_names.remove(profile_name) - except ValueError: - pass + if self._X2goClient__session_can_auto_connect(session_uuid): + self._X2goClient__connect_session(session_uuid) + if not self._X2goClient__server_valid_x2gouser(session_uuid): + self.notifier.send(_(u'%s - connect failure') % profile_name, _(u'User is not allowed to start X2go sessions!'), icon='session_warning', timeout=10000) + self.OnServerDisconnect(evt) + try: + self._temp_disabled_profile_names.remove(profile_name) + except ValueError: + pass + else: + self.notifier.send(_(u'%s - connect') % profile_name, _(u'Public SSH key authentication has been successful.'), icon='auth_success', timeout=4000) + _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True) + self._post_authenticate(evt, session_uuid) + try: + self._temp_disabled_profile_names.remove(profile_name) + except ValueError: + pass else: - self.notifier.send(_(u'%s - connect') % profile_name, _(u'Public SSH key authentication has been successful.'), icon='auth_success', timeout=4000) - _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True) - self._post_authenticate(evt, session_uuid) - try: - self._temp_disabled_profile_names.remove(profile_name) - except ValueError: - pass + _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, ) + self._logon_windows[profile_name] = _logon_window except x2go.AuthenticationException: self._pyhoca_logger('public SSH key authentication to server failed, trying next auth-mechanism', loglevel=x2go.log.loglevel_INFO, ) _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=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)).