[X2Go-Commits] pyhoca-gui.git - master (branch) updated: 0.4.0.2-2-ge10c24c

X2Go dev team git-admin at x2go.org
Mon Apr 29 14:01:45 CEST 2013


The branch, master has been updated
       via  e10c24cf8733bec511fb7be8182bd0bb21394826 (commit)
      from  bdfcaf307c52ef66b4faa1ef69b26d811b9c5ffe (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 e10c24cf8733bec511fb7be8182bd0bb21394826
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 29 14:01:38 2013 +0200

    On selecting »Unshare All Local Folders« purge all shares from the »export« session profile parameter if »restoreexports« is set to true in the session profile.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0005b7b..50ca626 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 pyhoca-gui (0.4.0.3-0~x2go1) UNRELEASED; urgency=low
 
-  * Continue development...
+  * New upstream version (0.4.0.3):
+    - On selecting »Unshare All Local Folders« purge all shares from the
+      »export« session profile parameter if »restoreexports« is set to true
+      in the session profile.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 21 Apr 2013 23:09:12 +0200
 
diff --git a/debian/control b/debian/control
index 1cfaf9a..060cabb 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Architecture: all
 Depends: 
  ${misc:Depends},
  python,
- python-x2go (>=0.4.0.3-0~),
+ python-x2go (>=0.4.0.4-0~),
  python-argparse,
  python-notify,
  python-setproctitle,
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 4f49af5..f845672 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -1229,6 +1229,8 @@ class PyHocaGUI(wx.App, x2go.X2GoClient):
         """
         profile_name = self._eventid_profilenames_map[evt.GetId()]
         self._X2GoClient__unshare_all_local_folders_from_profile(profile_name=profile_name)
+        if self._X2GoClient__get_profile_config(profile_name, 'restoreexports'):
+            self._X2GoClient__set_profile_config(profile_name, 'export', {})
 
     def OnShareLocalFolder(self, evt):
         """\
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index 2d08231..831cc35 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -335,15 +335,11 @@ class PyHocaGUI_Menu_TaskbarProfileSharedFolders(wx.Menu):
         self.Append(id=ID_SHARECUSTOMLOCALFOLDER, text=_(u"&Share custom local folder"))
 
         self.AppendSeparator()
+        self._PyHocaGUI._eventid_unshared_folders_map={}
 
         _exported_folders = self._PyHocaGUI.get_profile_config(profile_name, 'export')
         _shared_folders = self._PyHocaGUI._X2GoClient__profile_get_shared_folders(profile_name=profile_name, check_list_mounts=True) or []
-
-        _sharable_folders = []
-        for _folder_path in _exported_folders.keys():
-            _sharable_folders.append(_folder_path)
-
-        self._PyHocaGUI._eventid_unshared_folders_map={}
+        _sharable_folders = _exported_folders.keys()
         _unshared_folders = [ f for f in _sharable_folders if f and f not in _shared_folders ]
 
         if _unshared_folders:


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