The branch, master has been updated via 7ddc4960eed4405306aae04853b5ea0a89ab5266 (commit) from 299bb0ee83d70c6c98cbc834e7d876cdff27d91f (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 7ddc4960eed4405306aae04853b5ea0a89ab5266 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 29 18:37:02 2013 +0100 Become aware of new Python X2Go hook method (HOOK_on_failing_SFTP_client). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/frontend.py | 18 ++++++++++++++++++ pyhoca/wxgui/profilemanager.py | 8 ++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9abb3f9..73c874f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ pyhoca-gui (0.4.0.9-0~x2go1) UNRELEASED; urgency=low - Implement two-factor authentication. - Don't crash if no notification-daemon provide is registered in DBUS. (Fixes: #321). + - Become aware of new Python X2Go hook method + (HOOK_on_failing_SFTP_client). * /debian/copyright: + Update file. Add entry for file icon2exe.py. diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 96c530b..5f7b14b 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -1560,6 +1560,24 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): self.WakeUpIdle() self.ExitMainLoop() + def HOOK_on_failing_SFTP_client(self, profile_name='UNKNOWN', **kwargs): + """\ + Notify about SFTP client failures + + @param profile_name: profile name of session that called this hook method + @type profile_name: C{str} + + """ + if not self._exiting: + self.notifier.send(_(u'%s - SFTP client error') % profile_name, _(u'New X2Go session will lack SFTP client support.\nCheck your server setup.\n\nAvoid echoing ~/.*shrc files on server!!!\n\nNot starting new session...'), icon='session_error', timeout=10000) + try: + del self._temp_disabled_session_names[profile_name] + except KeyError: + pass + if self.exit_on_disconnect: + self.WakeUpIdle() + self.ExitMainLoop() + def HOOK_session_startup_failed(self, profile_name='UNKNOWN', **kwargs): """\ Notify about session startup failures. diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 35ff313..d73b36d 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -870,7 +870,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyAutoLogin.SetValue(self.profile_config['sshproxyautologin']) _ssh_proxy = self.profile_config['usesshproxy'] - _ssh_proxy_host = self.profile_config['sshproxyhost'] + _ssh_proxy_host = self.profile_config['sshproxyhost'].strip() _ssh_proxy_port = 22 try: _ssh_proxy_port = int(self.profile_config['sshproxyport']) @@ -888,7 +888,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyUser.SetValue(self.profile_config['user']) else: self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser']) - self.SSHProxyKeyFile.SetValue(self.profile_config['sshproxykeyfile']) + + if self.profile_config['sshproxysamepass']: + self.SSHProxyKeyFile.SetValue(self.profile_config['sshproxykeyfile']) + else: + self.SSHProxyKeyFile.SetValue(self.profile_config['key']) self.UseSSHProxy.SetValue(_ssh_proxy) self.SSHProxySameUser.SetValue(self.profile_config['sshproxysameuser']) 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)).