This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/general in repository x2goclient. commit 5e1351dade7803521c9d65fd018efa2eb90f9621 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Mar 25 19:41:18 2015 +0100 onmainwindow:cpp: correctly pass escaped single quote when writing remote xinerama config file. Post-fixup for #797. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ff72971..5481173 100644 --- a/debian/changelog +++ b/debian/changelog @@ -241,6 +241,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low add MacPorts location. - onmainwindow.cpp: do not define Ctrl+Q two times. Made it unusable on Linux and Windows. + - onmainwindow:cpp: correctly pass escaped single quote when writing + remote xinerama config file. Post-fixup for #797. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 9a2dc19..fe10646 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -10252,7 +10252,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