[X2go-Commits] python-x2go.git - master (branch) updated: 0.1.1.4-238-g5165769

X2Go dev team git-admin at x2go.org
Wed May 23 11:00:41 CEST 2012


The branch, master has been updated
       via  5165769cfce78c0c9a0c47c842ad97322019b40f (commit)
      from  274f40e28bb16559463a25c934c526eec99f130f (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 -----------------------------------------------------------------
commit 5165769cfce78c0c9a0c47c842ad97322019b40f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed May 23 11:00:36 2012 +0200

    fix detection of rootless sessions

-----------------------------------------------------------------------

Summary of changes:
 x2go/backends/terminal/_stdout.py |    2 +-
 x2go/utils.py                     |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 0cc54ae..4c401a7 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -133,7 +133,7 @@ class X2goSessionParams(object):
             self.session_type = 'D'
         elif self.session_type in ("S", "shared", "shadow"):
             self.session_type = 'S'
-        elif self.session_type in ("R", "rootless"):
+        elif self.session_type in ("R", "rootless", "application"):
             self.session_type = 'R'
         elif self.session_type in ("P", "published", "published_applications"):
             self.session_type = 'P'
diff --git a/x2go/utils.py b/x2go/utils.py
index f6894bb..652799d 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -241,10 +241,10 @@ def _convert_SessionProfileOptions_2_SessionParams(_options):
         _params['snd_system'] = 'none'
     del _params['sound']
 
-    if _options['rootless']:
-        _params['session_type'] = 'application'
-    else:
+    if not _options['rootless']:
         _params['session_type'] = 'desktop'
+    else:
+        _params['session_type'] = 'application'
     del _params['rootless']
 
     if _params['mimebox_action'] not in _X2GO_MIMEBOX_ACTIONS.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