[X2Go-Commits] [x2goclient] 01/01: Fix (cross-user) desktop sharing 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 x2goclient.

commit b6d31bace19ea693486f5db7c76314bea071fb58
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 15 21:34:05 2014 +0100

    Fix (cross-user) desktop sharing since introduction of clipboard mode feature.
---
 debian/changelog |    2 ++
 onmainwindow.cpp |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 61544c9..d5beff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ x2goclient (4.0.3.1-0x2go1) UNRELEASED; urgency=medium
     - Fully rework x2goclient man page. Add many options that haven't been
       documented so far.
     - Make sound options configurable via X2Go Session Broker. (Fixes: #652).
+    - Fix (cross-user) desktop sharing since introduction of clipboard mode
+      feature.
 
   [ Mark Pedersen-Cook ]
   * New upstream release (4.0.3.1):
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index fa6465a..863817a 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -3888,6 +3888,7 @@ void ONMainWindow::startNewSession()
     QFileInfo f ( command );
     if ( !shadowSession )
         cmd+=sessTypeStr+f.fileName();
+        cmd+=" "+clipMode;
     else
     {
         cmd+=sessTypeStr+QString::number ( shadowMode ) +"XSHAD"+
@@ -3895,7 +3896,6 @@ void ONMainWindow::startNewSession()
     }
 
     resumingSession.fullscreen=fullscreen;
-    cmd+=" "+clipMode;
 
     x2goDebug<<"Executing remote command: "<<cmd;
 

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