[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.10-55-g94bc060

X2Go dev team git-admin at x2go.org
Tue Aug 27 13:22:00 CEST 2013


The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog              |    2 ++
 pyhoca/wxgui/menus_taskbar.py |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a753683..61d7c12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
       folders.
     - Remove pointed brackets from new/derived session profile names.
     - 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