[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.2.0.4-103-g8df7c7a

[X2Go dev team]

The branch, master has been updated
       via  8df7c7aae88494c4017543320352f55c5297e2e8 (commit)
      from  3390847c9d1458585dffb454e979441b5866285e (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 8df7c7aae88494c4017543320352f55c5297e2e8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Nov 20 13:26:42 2012 +0100

    Hide the file sharing submenu if the master session's submenu is currently disabled due to some current action and an expected session status change.

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

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 a01cba1..1acf521 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,8 @@ pyhoca-gui (0.2.1.0-0~x2go1) UNRELEASED; urgency=low
       _init_pubapp_sessions() method.
     - Implement functionality for restoring mounted shares on session
       resumption / re-start. Sponsored by Dick Kniep, LinDix NL.
+    - Hide the file sharing submenu if the master session's submenu is currently
+      disabled due to some current action and an expected session status change.
   * /debian/control:
     + Maintainer change in package: X2Go Developers
       <x2go-dev at lists.berlios.de>.
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index f7dc1f8..97b56cd 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -745,7 +745,10 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
                     self._PyHocaGUI._eventid_profilenames_map[ID_SHARELOCALFOLDER] = \
                     self._PyHocaGUI._eventid_profilenames_map[ID_UNSHAREFOLDERS] = profile_name
 
-                if current_profile_config['useexports'] and self._PyHocaGUI._X2goClient__profile_is_folder_sharing_available(profile_name=profile_name):
+                if current_profile_config['useexports'] and \
+                   self._PyHocaGUI._X2goClient__profile_is_folder_sharing_available(profile_name=profile_name) and \
+                   self._PyHocaGUI.get_master_session(profile_name) is not None and \
+                   self._PyHocaGUI.is_session_name_enabled(profile_name, self._PyHocaGUI.get_master_session(profile_name).get_session_name()):
 
                     if self._PyHocaGUI.restricted_trayicon:
                         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)).