[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.6-7-gcd0ed6d
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:21:44 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
pyhoca/wxgui/frontend.py | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7496342..a22af15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ 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.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 06 Jul 2011 22:17:10 +0200
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index e35cb44..8732d55 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -705,7 +705,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
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)).
More information about the x2go-commits
mailing list