[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.1.0.10-229-g1e6395a

[X2Go dev team]

The branch, master has been updated
       via  1e6395a15de1e7ae13442aaaf627ca0dd0881076 (commit)
      from  e8d4a46cf3d46d24f896d23feb4db6806e4b49fd (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 1e6395a15de1e7ae13442aaaf627ca0dd0881076
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Apr 20 00:35:39 2012 +0200

    For empty menu maps create a dummy menu.

-----------------------------------------------------------------------

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ddd53cc..49125f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -122,6 +122,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - Only auto-resume if session profile is not configured for published
       applications.
     - Windows packaging: remove dist directory before calling py2exe.
+    - For empty menu maps create a dummy menu.
   * 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 69a0a15..eefb3e9 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -379,7 +379,7 @@ def _generate_Menu_PublishedApplications(_PyHocaGUI, caller=None, profile_name=N
     except AttributeError:
         menu_map = None
     if not menu_map or not menu_map.has_key(_lang):
-        return {}
+        menu_map = { _lang: {} }
 
     if x2go.defaults.X2GOCLIENT_OS == 'Windows':
         _icon_size = "16x16"
@@ -525,7 +525,8 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
                                 _item = self.AppendItem(item=_menu_item)
                                 if _session_name_disabled:
                                     _item.Enable(False)
-                        self.AppendSeparator()
+                        if _category_map:
+                            self.AppendSeparator()
 
                         ID_RESUMESESSION = wx.NewId()
                         ID_REFRESHMENU = wx.NewId()


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)).