[X2Go-Commits] [x2goclient] 01/01: Fix VCXSRV parameter to disable PRIMARY clipboard in X2Go Client for Windows.

[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 7756309cb321ede5eda95867bfbc160c5e95d9a6
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Wed Feb 24 15:25:48 2016 +0100

    Fix VCXSRV parameter to disable PRIMARY clipboard in X2Go Client for Windows.
---
 debian/changelog     |    1 +
 src/onmainwindow.cpp |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b680248..77c67db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
     - Disable settings editing if a directory with central settings is exists.
     - Format long names on session buttons.
     - Central settings for Linux, Mac and Windows.
+    - Fix VCXSRV parameter to disable PRIMARY clipboard in X2Go Client for Windows.
 
   [ Mike Gabriel ]
   * New upstream release (4.0.5.1):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 3c90ba5..0f3d181 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10163,7 +10163,7 @@ void ONMainWindow::xorgSettings()
 
     QString primClip;
     if(st.setting()->value("noprimaryclip",false).toBool() && internalX==VCXSRV)
-        primClip=" -noclipboardprimary";
+        primClip=" -noprimary";
 
     if (useInternalX)
     {

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