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

[X2go dev team]

The branch, master has been updated
       via  b3bf6d63c5914984585e64d68630e0ac9bced9ec (commit)
      from  5c9240773522ae67692763d9061ea800b19000b7 (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 b3bf6d63c5914984585e64d68630e0ac9bced9ec
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Feb 18 01:21:25 2012 +0100

    Fix X2Go desktop sharing support.

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

Summary of changes:
 debian/changelog                  |    1 +
 x2go/backends/terminal/_stdout.py |    3 ++-
 x2go/session.py                   |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f79952c..7214750 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - Fix IndexError if x2gomountdirs did not deliver any of the expected
       results to stdout.
     - Handle session titles that just contain blanks (e.g. " ") gracefully.
+    - Fix X2Go desktop sharing support.
   * 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 0918ec8..565c6af 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -126,7 +126,7 @@ class X2goSessionParams(object):
             self.session_type = 'D'
         elif os.path.basename(cmd) in defaults.X2GO_DESKTOPSESSIONS.values():
             self.session_type = 'D'
-        else:
+        elif self.session_type not in ("S", "shared", "shadow", "D", "desktop"):
             self.session_type = 'R'
 
         if self.session_type in ("D", "desktop"):
@@ -588,6 +588,7 @@ class X2goTerminalSessionSTDOUT(object):
         """\
         Return the server-side mimebox spooldir path.
 
+
         """
         return '%s/%s' % (self.session_info.remote_container, 'mimebox')
 
diff --git a/x2go/session.py b/x2go/session.py
index 1ac2f64..5d58b63 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1248,7 +1248,7 @@ class X2goSession(object):
             if not _desktop in self._X2goSession__list_desktops():
                 _orig_desktop = _desktop
                 _desktop = '%s.0' % _desktop
-                if not _desktop in self._X2GoSession__list_desktops():
+                if not _desktop in self._X2goSession__list_desktops():
                     raise x2go_exceptions.X2goDesktopSharingException('No such desktop ID: %s' % _orig_desktop)
 
         _session_owner = _desktop.split('@')[0]


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