[X2Go-Commits] [python-x2go] 01/01: Fix cross-user desktop sharing feature since introduction of clipboard mode feature.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit d5472a9ce4bbffd5c32248135452796ea4f9d0c1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 15 21:31:13 2014 +0100

    Fix cross-user desktop sharing feature since introduction of clipboard mode feature.
---
 debian/changelog                |    2 ++
 x2go/backends/terminal/plain.py |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f2f8d83..1c8ffb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ python-x2go (0.5.0.2-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (0.5.0.2):
     - Catch control session disconnects during session's
       run_command call.
+    - Fix cross-user desktop sharing feature since introduction of
+      clipboard mode feature.    
   * debian/control:
     + Bump Standards: to 3.9.6. No changes needed.
     + Mention "client side printing support" in LONG_DESCRIPTION.
diff --git a/x2go/backends/terminal/plain.py b/x2go/backends/terminal/plain.py
index c902f02..1239b1e 100644
--- a/x2go/backends/terminal/plain.py
+++ b/x2go/backends/terminal/plain.py
@@ -1487,8 +1487,11 @@ class X2GoTerminalSession(object):
                      str(setkbd),
                      str(self.params.session_type),
                      str(self.params.cmd),
-                     str(self.params.clipboard),
                    ]
+        if self.params.session_type != 'S':
+            cmd_line.append(
+                     str(self.params.clipboard),
+            )
 
         if self.params.cmd == 'XDMCP' and self.params.xdmcp_server:
             cmd_line = ['X2GOXDMCP=%s' % self.params.xdmcp_server] + cmd_line

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git