[X2Go-Commits] [x2goclient] 01/01: xinerama.conf: Don't choke if screen coordintate lines in xinerama.conf start with a dash ("-"). (Fixes: #948).

[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 164b4fe05783280ad4cd988c90a8af9d2f3a1cd0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Sep 24 13:46:09 2015 +0200

    xinerama.conf: Don't choke if screen coordintate lines in xinerama.conf start with a dash ("-"). (Fixes: #948).
---
 debian/changelog     |    5 +++++
 src/onmainwindow.cpp |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9bada0b..fb7d6e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,11 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
     - Add support for new style command line options of xfreerdp on direct RDP
       connections.
 
+  [ Mike Gabriel ]
+  * New upstream release (4.0.5.1):
+    - xinerama.conf: Don't choke if screen coordintate lines in xinerama.conf
+      start with a dash ("-"). (Fixes: #948).
+
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 28 Jul 2015 06:05:27 +0200
 
 x2goclient (4.0.5.0-0x2go1) unstable; urgency=low
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 35faced..e4b6049 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10377,7 +10377,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 %b '\\''"+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