[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.1.0.10-99-g4e9abab
X2Go dev team
git-admin at x2go.org
Sat Sep 14 15:55:42 CEST 2013
The branch, twofactorauth has been updated
via 4e9ababbb27bb1718f35ea4a2b38805e4d0d87a7 (commit)
from 5ea8099a87cea6efe6c44a6b2e70c170559cffd2 (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/menus_taskbar.py | 9 ++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2ee297a..12e28ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
- Provide 'en' as default language if --lang has not been given on the
command line (MS Windows issue).
- Published Applications on MS Windows: icon size is 16x16.
+ - Catch X2GoSessionRegistryException if used session uuid is not valid
+ anymore.
* 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 05a4ba7..fb443c2 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -800,9 +800,12 @@ class PyHocaGUI_Menu_TaskbarSessionManager(wx.Menu):
_this_id = wx.NewId()
_menu_profile_name = self._PyHocaGUI.show_profile_metatypes and '%s (%s)' % (profile_name, self._PyHocaGUI.get_profile_metatype(profile_name)) or profile_name
- self.AppendMenu(text=_menu_profile_name,
- id=_this_id,
- submenu=PyHocaGUI_Menu_TaskbarSessionProfile(self._PyHocaGUI, caller=self, profile_name=profile_name))
+ try:
+ self.AppendMenu(text=_menu_profile_name,
+ id=_this_id,
+ submenu=PyHocaGUI_Menu_TaskbarSessionProfile(self._PyHocaGUI, caller=self, profile_name=profile_name))
+ except X2GoSessionRegistryException:
+ pass
if _connected_sessions:
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