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

[X2Go dev team]

The branch, master has been updated
       via  474c3ea4cf28b05d8c2655b725c3446fac9b6be0 (commit)
       via  67194cbf85eb95ef18e73a6eb2006d3b3c8d099d (commit)
      from  53a9d5c9ea81eb1cd903f31aa9d9c1821097bd97 (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 474c3ea4cf28b05d8c2655b725c3446fac9b6be0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 29 11:26:00 2012 +0200

    report missing published applications support for session that are configured to use it

commit 67194cbf85eb95ef18e73a6eb2006d3b3c8d099d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 29 11:25:34 2012 +0200

    fix session menu

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

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

The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 18e636c..fb8e32c 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -438,7 +438,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
 
             return pubapp_session_started | pubapp_session_resumed
 
-        elif not connected_session.has_server_feature('X2GO_PUBLISHED_APPLICATIONS'):
+        elif not connected_session.has_server_feature('X2GO_PUBLISHED_APPLICATIONS') and self.get_profile_config(profile_name)['published']:
             self.notifier.send(_(u'%s - server warning') % profile_name, _(u'The X2Go Server does not publish an application menu.'), icon='session_warning', timeout=10000)
 
         return None
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index aecaa19..403997d 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -647,6 +647,10 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
 
                             self.AppendSeparator()
 
+                    if not _session_list_names:
+
+                        self.AppendSeparator()
+
                 self._PyHocaGUI._eventid_profilenames_map[ID_EDITPROFILEWHILECONNECTED] = \
                     self._PyHocaGUI._eventid_profilenames_map[ID_SHARELOCALFOLDER] = \
                     self._PyHocaGUI._eventid_profilenames_map[ID_UNSHAREFOLDERS] = profile_name


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