[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.1.4-171-g7409baa
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:30:57 CET 2014
The branch, build-baikal has been updated
via 7409baafe0c326f2ed9dd1845df38344a6b1ffc8 (commit)
from e47f538ca397e41610720f1d61693204ad574113 (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/backends/profiles/_file.py | 18 ++++++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f850c5a..c292ac9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,6 +77,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
auto-connecting interactively.
- Provide X2goSession method get_session_profile_option().
- Fix unexpected keyword error during connect() in X2goSession instance.
+ - Fix metatype detection of session profiles.
* Depend on python-xlib.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py
index 64688df..dcacfa8 100644
--- a/x2go/backends/profiles/_file.py
+++ b/x2go/backends/profiles/_file.py
@@ -91,15 +91,21 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
if _config['host']:
if _config['rdpserver'] and _config['command'] == 'RDP':
_metatype = 'RDP/proxy'
+ elif _config['published']:
+
+ if _config['command'] in _X2GO_DESKTOPSESSIONS.keys():
+ _metatype = '%s + Published Applications' % _config['command']
+ else:
+ _metatype = 'Published Applications'
+
elif _config['rootless']:
_metatype = 'Single Applications'
+ elif _config['command'] in _X2GO_DESKTOPSESSIONS.keys():
+ _metatype = '%s Desktop' % _config['command']
+ elif _config['command'] in _X2GO_DESKTOPSESSIONS.values():
+ _metatype = '%s Desktop' % [ s for s in _X2GO_DESKTOPSESSIONS.keys() if _config['command'] == _X2GO_DESKTOPSESSIONS[s] ][0]
else:
- if _config['command'] in _X2GO_DESKTOPSESSIONS.keys():
- _metatype = '%s Desktop' % _config['command']
- elif _config['command'] in _X2GO_DESKTOPSESSIONS.values():
- _metatype = '%s Desktop' % [ s for s in _X2GO_DESKTOPSESSIONS.keys() if _config['command'] == _X2GO_DESKTOPSESSIONS[s] ][0]
- else:
- _metatype = 'CUSTOM Desktop'
+ _metatype = 'CUSTOM Desktop'
else:
if _config['rdpserver'] and _config['command'] == 'RDP':
_metatype = 'RDP/direct'
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