The branch, master has been updated via 81d7b9b10739b9d8e316d3ed67cbb58d1372b551 (commit) via cd0ed6db4a738bc0f4cdcac7db2f4c6f928a411e (commit) from ce46482629e575dc947cd57c7a1a76f88e80977b (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 81d7b9b10739b9d8e316d3ed67cbb58d1372b551 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 20 19:33:30 2011 +0200 Add HOOK_session_startup_failed as a GUI notification (was: exception raisure), requires Python X2go >= 0.1.1.5. commit cd0ed6db4a738bc0f4cdcac7db2f4c6f928a411e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 20 19:31:31 2011 +0200 On no such command errors, detect if we already have a session_name. If not, leave it out in the GUI notification. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ debian/control | 2 +- pyhoca/wxgui/frontend.py | 11 ++++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7496342..f151394 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ pyhoca-gui (0.1.0.7-0~x2go1) UNRELEASED; urgency=low - minor i18n fixes (de) - Delaying taskbar icon closure as much as possible (closes upstream issue #79). - Check if print system (CUPS/WinSpool) is available or not (close upstream issue #74) + - On no such command errors, detect if we already have a session_name. If not, leave it out in + the GUI notification. + - Add HOOK_session_startup_failed as a GUI notification (was: exception raisure), requires + Python X2go >= 0.1.1.5. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 06 Jul 2011 22:17:10 +0200 diff --git a/debian/control b/debian/control index ae979f0..2aa772c 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.1.1.3-0~), + python-x2go (>=0.1.1.5-0~), python-argparse, python-notify, python-setproctitle, diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index e35cb44..6300b73 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -704,8 +704,17 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self.WakeUpIdle() self.ExitMainLoop() + def HOOK_session_startup_failed(self, profile_name='UNKNOWN'): + self.notifier.send(_(u'%s - session failure') % profile_name, _('The session startup failed.'), icon='session_error', timeout=10000) + if self.exit_on_disconnect: + 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 session_name == 'UNKNOWN': + self.notifier.send(_(u'%s - session failure') % profile_name, _('The command ,,%s\'\' is not available on X2go server.') % cmd, icon='session_error', timeout=10000) + else: + 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.WakeUpIdle() self.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)).