[X2Go-Commits] [x2goclient] 01/01: onmainwindow.cpp: fix bad quoting when writing remote xinerama config file. Fixes: #797.

git-admin at x2go.org git-admin at x2go.org
Sun Mar 15 17:47:46 CET 2015


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

x2go pushed a commit to branch master
in repository x2goclient.

commit 3d4c38eff304949e90ffcf68527c6c078620b6c1
Author: Fernando Pedemonte <fpedemonte at sintys.gob.ar>
Date:   Sun Mar 15 17:47:04 2015 +0100

    onmainwindow.cpp: fix bad quoting when writing remote xinerama config file. Fixes: #797.
---
 debian/changelog     |    5 +++++
 src/onmainwindow.cpp |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b51ab6a..6301aa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -240,6 +240,11 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
     - configdialog.cpp: make XQuartz detection algorithm QStringList-based and
       add MacPorts location.
 
+  [ Fernando Pedemonte ]
+  * New upstream release (4.0.4.0):
+    - onmainwindow.cpp: fix bad quoting when writing remote xinerama config file.
+      Fixes: #797.
+
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 19 Feb 2015 13:25:28 +0100
 
 x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 73b8dfd..50db7b5 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10254,7 +10254,7 @@ void ONMainWindow::slotConfigXinerama()
         foreach (QRect disp, xineramaScreens)
             screens<<QString::number(disp.x())+" "+QString::number(disp.y())+" "+QString::number(disp.width())+
                    " "+QString::number(disp.height());
-        QString cmd="export DISPLAY=:"+resumingSession.display+";printf '"+screens.join("\\\\n")+"' >  $HOME/.x2go/C-"+
+        QString cmd="export DISPLAY=:"+resumingSession.display+";printf '\''"+screens.join("\\n")+"'\'' >  $HOME/.x2go/C-"+
                     resumingSession.sessionId+"/xinerama.conf";
 
         sshConnection->executeCommand(cmd, this, SLOT(slotXineramaConfigured()));

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


More information about the x2go-commits mailing list