[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: 0.2.0.10-38-g4d14558
X2Go dev team
git-admin at x2go.org
Tue Jan 7 16:18:16 CET 2014
The branch, release/0.4.0.x has been updated
via 4d14558d12ba6b319527dedf1fa36bb95945d6dc (commit)
from d4c2a7c746c1b1dd9095d533d12ea484b2839769 (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 +
x2go/defaults.py | 2 +-
x2go/utils.py | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3669d8b..4dd18b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low
- Only monkey patch Python Paramiko based on the currently used Paramiko
version (our monkey patches have been sent upstream, so we might not
need the monkey patching for paramiko >= 1.8.0 anymore).
+ - Rename session type XFCE4 to XFCE (using an unversioned name).
* /debian/rules:
+ Allow package build on systems with missing dh_python2.
* /debian/control:
diff --git a/x2go/defaults.py b/x2go/defaults.py
index 790ec53..b158bb2 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -376,7 +376,7 @@ pack_methods_nx3.sort()
X2GO_DESKTOPSESSIONS={
'KDE': 'startkde',
'GNOME': 'gnome-session',
- 'XFCE4': 'xfce4-session',
+ 'XFCE': 'xfce4-session',
'LXDE': 'startlxde',
'TRINITY': 'starttrinity',
'UNITY': 'unity',
diff --git a/x2go/utils.py b/x2go/utils.py
index 23e3184..5bc8838 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -250,6 +250,7 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
else:
_params[opt] = []
+ if _params['cmd'] == "XFCE4": _params['cmd'] = "XFCE"
if _params['look_for_keys']:
_params['allow_agent'] = True
if _params['sshproxy_look_for_keys']:
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