[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: 0.1.1.4-231-g203f5fe

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:17:56 CET 2014


The branch, release/0.4.0.x has been updated
       via  203f5fe9543710232e8cfb894a25910d709afc09 (commit)
      from  fccfb5cdbc81a0bbea0c1ffeba57448bbd257d49 (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/terminal/_stdout.py |    2 ++
 x2go/defaults.py                  |    2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2365db9..400e537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -120,6 +120,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
       transformed to OS-specific path names.
     - Not using gevent to spawn MIME box default applications.
     - Protect session cache from deletion while being processed.
+    - Adapt python-x2go to launching Unity-2d on Ubuntu precise.
   * 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/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 720e0e1..5ed8d83 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -931,6 +931,8 @@ class X2goTerminalSessionSTDOUT(object):
 
         if cmd in _X2GO_GENERIC_APPLICATIONS:
             return True
+        if cmd in _X2GO_DESKTOPSESSIONS.keys():
+            return True
         elif 'XSHAD' in cmd:
             return True
         elif 'PUBLISHED' in cmd and 'X2GO_PUBLISHED_APPLICATIONS' in self.control_session.get_server_features():
diff --git a/x2go/defaults.py b/x2go/defaults.py
index f9b8bf6..8a12e23 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -375,7 +375,7 @@ X2GO_DESKTOPSESSIONS={
     'XFCE4': 'xfce4-session',
     'LXDE': 'startlxde',
     'TRINITY': 'starttrinity',
-    'UNITY': 'unity-2d-launcher',
+    'UNITY': 'unity',
 }
 """A dictionary with meta-commands for X2go's window manager sessions."""
 


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