[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.1.0.10-56-g06ac055
X2go dev team
git-admin at x2go.org
Sun Feb 12 00:11:43 CET 2012
The branch, master has been updated
via 06ac0550a15231e2c427f4e5ca2a1cdfe1cf982a (commit)
via 94bc060beb7fb65b6886a3d6620adb0b0694224c (commit)
from 19ece3551adb36c82ee6c93eff3aef0f3e102203 (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 06ac0550a15231e2c427f4e5ca2a1cdfe1cf982a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Feb 12 00:11:37 2012 +0100
typo fix in changelog
commit 94bc060beb7fb65b6886a3d6620adb0b0694224c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Feb 12 00:11:08 2012 +0100
Catch AttributeError during taskbar menu generation that occured during querying the session command from a non-existent session.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 +++-
pyhoca/wxgui/menus_taskbar.py | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a753683..48da175 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,7 +32,9 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
- Use x2golistmounts to detect server-side unsharing of client-side
folders.
- Remove pointed brackets from new/derived session profile names.
- - Mark master sessions with a marker ,,(*)'',
+ - Mark master sessions with a marker ,,(*)''.
+ - Catch AttributeError during taskbar menu generation that occured
+ during querying the session command from a non-existent session.
* Depend on Python X2Go 0.1.2.0.
* Install GNOME icons via dh_links.
* Install X2Go icons with explicit install paths.
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index 01c4488..b582a98 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -164,7 +164,7 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
_s = self._PyHocaGUI.get_session_of_session_name(session_name, return_object=True)
- if _s.get_session_cmd() in x2go.defaults.X2GO_DESKTOPSESSIONS and status == 'R':
+ if _s is not None and _s.get_session_cmd() in x2go.defaults.X2GO_DESKTOPSESSIONS and status == 'R':
_title = self.Append(text=_("Window title") + ": " + _s.get_session_title(), id=wx.NewId())
self.AppendSeparator()
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