[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.2.1.1-48-g4966ddd

[X2Go dev team]

The branch, master has been updated
       via  4966ddd53b72e3e3a6563c74198155efeae871e2 (commit)
      from  40cf50288c994d3e9b899d52fa09890283dc11dc (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 4966ddd53b72e3e3a6563c74198155efeae871e2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jan 20 16:38:30 2013 +0100

    fix mal-assignment of sshport parameter when used with usesshproxy

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

Summary of changes:
 pyhoca/wxgui/profilemanager.py |   18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 9f01a78..61b939b 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -162,7 +162,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             if _to_host: self.profile_config['host'] = _to_host
             if _to_port: self.profile_config['sshport'] = int(_to_port)
 
+            self.profile_config['sshproxytunnel'] = 'DEPRECATED_CAN_BE_SAFELY_REMOVE'
+
         # we create a backup dict of our profile_config immediately (for being able to reset erroneously made changes)
+        self.profile_config_orig = copy.deepcopy(self.profile_config)
         self.profile_config_bak = copy.deepcopy(self.profile_config)
 
         self._last_rdpclient = self.profile_config['rdpclient']
@@ -1279,19 +1282,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.profile_config['user'] = self.UserName.GetValue()
         self.profile_config['key'] = self.SSHKeyFile.GetValue()
         self.profile_config['host'] = self.Host.GetValue()
-        if self.UseSSHProxy.GetValue():
-            self.profile_config['usesshproxy'] = True
-        else:
-            self.profile_config['usesshproxy'] = False
-            if _session_type != 'DirectRDP':
-                self.profile_config['sshport'] = self.SSHPort.GetValue()
+        self.profile_config['usesshproxy'] = self.UseSSHProxy.GetValue()
+        if _session_type != 'DirectRDP':
+            self.profile_config['sshport'] = self.SSHPort.GetValue()
         self.profile_config['sshproxysameuser'] = self.SSHProxySameUser.GetValue()
         self.profile_config['sshproxysamepass'] = self.SSHProxySamePassword.GetValue()
 
         self.profile_config['sshproxyhost'] = self.SSHProxyHost.GetValue()
         self.profile_config['sshproxyport'] = self.SSHProxyPort.GetValue()
-        if self.profile_config.has_key('sshproxytunnel'):
-            self.profile_config['sshproxytunnel'] = 'DEPRECATED_CAN_BE_REMOVED'
         self.profile_config['sshproxyautologin'] = self.SSHProxyAutoLogin.GetValue()
         self.profile_config['uniquehostkeyaliases'] = self.UniqueHostKeyAliases.GetValue()
         if self.profile_config['sshproxysameuser']:
@@ -2389,7 +2387,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.__update_from_screen()
         if self.__validate():
 
-            if self.profile_config != self.profile_config_bak:
+            if self.profile_config != self.profile_config_orig:
 
                 if self.action in ('ADD', 'COPY'):
                     self.profile_id = self.session_profiles.add_profile()
@@ -2437,7 +2435,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         @type event: C{obj}
 
         """
-        self.profile_config = copy.deepcopy(self.profile_config_bak)
+        self.profile_config = copy.deepcopy(self.profile_config_orig)
         self.__update_fields()
 
     def Close(self):


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