[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.2.0.4-21-g6845485
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:22:32 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 684548520c09ff14d81f3be22f32676d5b3e7f29 (commit)
from d2ed0cc4ebcfc26835533fa4d9009692b08f2a2d (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 | 1 +
pyhoca/wxgui/profilemanager.py | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4dbda61..d325e05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low
- Do not offer DirectRDP sessions in profile manager while connected to a real
X2Go server via SSH.
- Configure SSH proxy port in a separate session profile option (sshproxyport).
+ - Make sure that SSH proxy port migration works flawlessly.
* /debian/control:
+ Add Oleksandr Shneyder to Uploaders.
+ Depend on python-x2go (>=0.2.0.11-0~).
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 95566cc..0b52f4a 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -836,11 +836,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
_ssh_proxy = self.profile_config['usesshproxy']
_ssh_proxy_host = self.profile_config['sshproxyhost']
_ssh_proxy_port = 22
+ if self.profile_config['sshproxyport']:
+ _ssh_proxy_port = int(self.profile_config['sshproxyport'])
if ":" in _ssh_proxy_host:
_ssh_proxy_port = _ssh_proxy_host.split(":")[1]
_ssh_proxy_host = _ssh_proxy_host.split(":")[0]
- if self.profile_config['sshproxyport']:
- _ssh_proxy_port = int(self.profile_config['sshproxyport'])
self.SSHProxyHost.SetValue("%s:%s" % (_ssh_proxy_host, _ssh_proxy_port))
self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser'])
self.SSHProxyKeyFile.SetValue(self.profile_config['sshproxykeyfile'])
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