The branch, master has been updated via f5c94ccec939abd931ddddbc649b7ea1864e58af (commit) from f5d508c28cfee81e3b96dc9a57767ebe959e8edd (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 f5c94ccec939abd931ddddbc649b7ea1864e58af Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Sep 24 04:26:26 2011 +0200 Only offer foldering sharing in menus if server provides it. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/menus_taskbar.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 32e85ff..352dda9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ pyhoca-gui (0.1.0.9-0~x2go1) UNRELEASED; urgency=low - Profile manager: x2goclient compat fix, add auto-connect flag for shared folders. - Add submenu support for sharing non-auto-connected shared folders. + - Only offer foldering sharing in menus if server provides it. * Depend on python-x2go (>=0.1.1.7). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 14 Sep 2011 21:49:08 +0200 diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index ee63dbd..c817c7d 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -223,7 +223,7 @@ class PyHocaGUI_Menu_TaskbarProfileSharedFolders(wx.Menu): _sharable_folders.append(_folder_path) self._PyHocaGUI._eventid_unshared_folders_map={} - _unshared_folders = [ f for f in _sharable_folders if f not in _shared_folders ] + _unshared_folders = [ f for f in _sharable_folders if f and f not in _shared_folders ] if _unshared_folders: self.Append(id=wx.NewId(), text=_(u'Share:')) @@ -320,12 +320,13 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu): self.Append(id=ID_CLEANSESSIONS, text=_(u"&Clean all sessions")) self.AppendSeparator() self.Append(id=ID_EDITPROFILEWHILECONNECTED, text=_(u"Customize &profile")) - if current_profile_config['useexports']: + if current_profile_config['useexports'] and self._PyHocaGUI._X2goClient__profile_is_folder_sharing_available(profile_name=profile_name): + _shared_folders = self.AppendMenu(id=ID_SHARELOCALFOLDER, text=_(u"Shared &folders"), submenu=PyHocaGUI_Menu_TaskbarProfileSharedFolders(self._PyHocaGUI, caller=self, profile_name=profile_name) ) - if not self._PyHocaGUI._X2goClient__client_associated_sessions_of_profile_name(profile_name, return_objects=False): + if not self._PyHocaGUI._X2goClient__client_associated_sessions_of_profile_name(profile_name=profile_name, return_objects=False): _shared_folders.Enable(False) 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)).