[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 1e1f71b0ccda5bf37394301b355632958aef9357

[X2Go dev team]

The branch, brokerclient has been updated
       via  1e1f71b0ccda5bf37394301b355632958aef9357 (commit)
      from  09da9d4f9d045aa59deeef4eb2c6f78ed75c5d7f (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/defaults.py |    2 +-
 x2go/utils.py    |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2go/defaults.py b/x2go/defaults.py
index dd90ee2..e5eb76a 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -234,7 +234,7 @@ else:
 X2GO_SESSIONPROFILE_DEFAULTS = {
     'speed': 2, 'pack': '16m-jpeg', 'quality': 9, 'link':'ADSL',
     'iconvto': 'UTF-8', 'iconvfrom': 'ISO-8859-15', 'useiconv': False,
-    'usesshproxy': False, 'sshproxy': '',
+    'usesshproxy': False, 'sshproxyhost': '', 'sshproxyuser': '', 'sshproxytunnel': '', 'sshproxykeyfile': '',
     'fstunnel': True,
     'export': '',
     'fullscreen': False,
diff --git a/x2go/utils.py b/x2go/utils.py
index 2fc705b..6e2639a 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -211,7 +211,10 @@ def _convert_SessionProfileOptions_2_SessionParams(_options):
             'applications',
             'xdmcpserver',
             'usesshproxy',
-            'sshproxy',
+            'sshproxyhost',
+            'sshproxyuser',
+            'sshproxytunnel',
+            'sshproxykeyfile',
         ]
         for i in _ignored_options:
             del _params[i]


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