[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: 0.2.1.1-13-g60047c1
X2Go dev team
git-admin at x2go.org
Tue Jan 7 16:18:26 CET 2014
The branch, release/0.4.0.x has been updated
via 60047c179c15e332894d321f323270b0675093ad (commit)
from 2a9b2742b4f4386750758c6c67f6d003225f168a (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:
x2go/utils.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/x2go/utils.py b/x2go/utils.py
index ab98120..421e066 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -205,7 +205,6 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
'sshproxyport': 'sshproxy_port',
'sshproxyuser': 'sshproxy_user',
'sshproxykeyfile': 'sshproxy_key_filename',
- 'sshproxytunnel': 'sshproxy_tunnel',
'sessiontitle': 'session_title',
'setsessiontitle': 'set_session_title',
'published': 'published_applications',
@@ -328,6 +327,12 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
_params['sshproxy_key_filename'] = _params['key_filename']
del _params['sshproxysamepass']
+ if options['sshproxytunnel']:
+ del _params['sshproxytunnel']
+
+ if _params['use_sshproxy']:
+ _params['sshproxy_tunnel'] = 'localhost:44444:%s:%s' % (_params['server'], _params['port'])
+
# currently known but ignored in Python X2go
_ignored_options = [
'startsoundsystem',
@@ -336,6 +341,7 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
'icon',
'xinerama',
'multidisp',
+ 'display',
'krblogin',
'directrdp',
'directrdpsettings',
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
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 "python-x2go.git" (Python X2Go Client API).
More information about the x2go-commits
mailing list