[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.10-220-gbae5b82
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:22:20 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via bae5b829194d0c480c1bac2988da6613302db46e (commit)
from 5c29aff94f6cf0963793a70b78d75fb56a6f8969 (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 | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 41b455a..68135c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -112,6 +112,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
- Fix missing declaration of notificationmessage_NotifierPopup.timeout.
- Make sure the log file on Windows does not grow limitlessly.
- Fix initialization of published applications sessions.
+ - Catch AttributeError in case a published applications session has not yet
+ fully started.
* 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 8c4726e..f1669b8 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -374,7 +374,10 @@ def _generate_Menu_PublishedApplications(_PyHocaGUI, caller=None, profile_name=N
"""
_lang = _PyHocaGUI.lang
_pubapp_session = _PyHocaGUI.get_session_of_session_name(session_name, return_object=True)
- menu_map = _pubapp_session.get_published_applications(lang=_lang, max_no_submenus=_PyHocaGUI.args.published_applications_no_submenus)
+ try:
+ menu_map = _pubapp_session.get_published_applications(lang=_lang, max_no_submenus=_PyHocaGUI.args.published_applications_no_submenus)
+ except AttributeError:
+ menu_map = None
if not menu_map or not menu_map.has_key(_lang):
return {}
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