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

X2Go dev team git-admin at x2go.org
Mon Nov 5 21:11:32 CET 2012


The branch, master has been updated
       via  f93c37e1cbbdf9727a2480e8b037eab9ed5fa038 (commit)
      from  31c69980c908bfd90d247b3325f934b4a766f971 (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 f93c37e1cbbdf9727a2480e8b037eab9ed5fa038
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Nov 5 20:52:15 2012 +0100

    Allow autologin and SSH key file at the same time.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4b91853..499af8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ pyhoca-gui (0.2.1.0-0~x2go1) UNRELEASED; urgency=low
     - Add SSH agent README.
     - Rename session type XFCE4 to XFCE (using an unversioned session type name).
     - Make pub app session startup more robust.
+    - Allow autologin and SSH key file at the same time.
   * /debian/control:
     + Maintainer change in package: X2Go Developers
       <x2go-dev at lists.berlios.de>.
@@ -48,7 +49,6 @@ pyhoca-gui (0.2.1.0-0~x2go1) UNRELEASED; urgency=low
   * /debian/pyhoca-gui.docs:
     + Install README.i18n into package.
 
-
   [ Daniel Lindgren ]
   * New upstream version (0.2.1.0):
     - Update Swedish translation file.
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 48f8e52..3f6e22d 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -844,10 +844,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.SSHPort.SetValue(self.profile_config['sshport'])
         self.SSHAutoLogin.SetValue(self.profile_config['autologin'])
         self.SSHForwardAuthAgent.SetValue(self.profile_config['forwardsshagent'])
-        if not self.profile_config['autologin']:
-            self.SSHKeyFile.SetValue(self.profile_config['key'])
-        else:
-            self.SSHKeyFile.SetValue("")
+        self.SSHKeyFile.SetValue(self.profile_config['key'])
+        if self.profile_config['autologin']:
             self.SSHKeyFileLabel.Enable(False)
             self.SSHKeyFile.Enable(False)
             self.SSHKeyFileBrowseButton.Enable(False)
@@ -1842,12 +1840,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         if self.SSHAutoLogin.GetValue():
             self.SSHKeyFileLabel.Enable(False)
             self.SSHKeyFile.Enable(False)
-            self.SSHKeyFile.SetValue("")
             self.SSHKeyFileBrowseButton.Enable(False)
         else:
             self.SSHKeyFileLabel.Enable(True)
             self.SSHKeyFile.Enable(True)
-            self.SSHKeyFile.SetValue(self.profile_config_bak['key'])
             self.SSHKeyFileBrowseButton.Enable(True)
 
     def OnSSHProxyAutoLogin(self, event):
@@ -1859,12 +1855,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
         """
         if self.SSHProxyAutoLogin.GetValue():
-            self.SSHProxyKeyFile.SetValue("")
             self.SSHProxyKeyFileLabel.Enable(False)
             self.SSHProxyKeyFile.Enable(False)
             self.SSHProxyKeyFileBrowseButton.Enable(False)
         else:
-            self.SSHProxyKeyFile.SetValue(self.profile_config_bak['sshproxykeyfile'])
             self.SSHProxyKeyFileLabel.Enable(True)
             self.SSHProxyKeyFile.Enable(True)
             self.SSHProxyKeyFileBrowseButton.Enable(True)


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