[X2go-Commits] pyhoca-gui.git - build-main (branch) updated: 0.1.0.10

X2go dev team git-admin at x2go.org
Wed Nov 2 08:42:16 CET 2011


The branch, build-main has been updated
       via  eb867d7b4a53c2af7711d5466091d32b04254cec (commit)
       via  cad15a8bcfbccf2ecfaebd83af5e84561616932b (commit)
       via  59794584018d08a3ade4484f28a0abf797c13e26 (commit)
      from  d4b44d98c629d381d8582a4840d911e52e045965 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog               |    7 +++++++
 pyhoca/wxgui/__init__.py       |    2 +-
 pyhoca/wxgui/profilemanager.py |   10 ++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d07f042..046023e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pyhoca-gui (0.1.0.10-0~x2go1) unstable; urgency=low
+
+  * Bugfix release for Windows (0.1.0.10):
+    - Fix for shared folders tab in profile manager on Windows platform.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 02 Nov 2011 08:41:15 +0100
+
 pyhoca-gui (0.1.0.9-0~x2go1) unstable; urgency=low
 
   * New upstream version (0.1.0.9):
diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py
index 64b0747..ef20ec4 100644
--- a/pyhoca/wxgui/__init__.py
+++ b/pyhoca/wxgui/__init__.py
@@ -18,6 +18,6 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-__VERSION__ = '0.1.0.9'
+__VERSION__ = '0.1.0.10'
 
 from frontend import *
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 49f3ac2..e482644 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -24,6 +24,7 @@ import copy
 
 import sys
 import locale
+import re
 
 import x2go.log as log
 import x2go.utils as utils
@@ -916,11 +917,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         for _shared_folder in _shared_folders:
 
             # support path names with and without ":" as separator between path and autoconnect flag (pyhoca-gui < 0.1.0.9)
-            if ":" not in _shared_folder:
+            if not re.match('^.*:(1|0)$', _shared_folder):
                 _shared_folder = "%s:1" % _shared_folder
 
-            _shared_folder_path = _shared_folder.split(':')[0]
-            if int(_shared_folder.split(':')[1]):
+            print _shared_folder
+            _shared_folder_path = ":".join(_shared_folder.split(':')[:-1])
+            if int(_shared_folder.split(':')[-1]):
                 _shared_folder_autoconnect = _("automatically")
             else:
                 _shared_folder_autoconnect = _("manually")
@@ -929,7 +931,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
                 idx = self.SharedFoldersList.InsertStringItem(0, _shared_folder_path)
                 self.SharedFoldersList.SetStringItem(idx, 1, _shared_folder_autoconnect)
-                if int(_shared_folder.split(':')[1]):
+                if int(_shared_folder.split(':')[-1]):
                     self.SharedFoldersList.CheckItem(idx)
 
         self.AddSharedFolderPathButton.Enable(False)


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