This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 8ee5979d6ebb2495cd735439abd3217560e2b8a9 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jan 12 10:17:53 2018 +0100 src/onmainwindow.cpp: supply xinerama option as another parameter to x2goresume-session on session resume. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/debian/changelog b/debian/changelog index e9e5b6f..aaf1979 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium - src/onmainwindow.cpp: fix another leaked X2goSettings object. - src/onmainwindow.cpp: rename xinerama env variable on session startup to X2GO_XINERAMA in accordance with server changes. + - src/onmainwindow.cpp: supply xinerama option as another parameter to + x2goresume-session on session resume. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 8c2d457..740a4d8 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -4532,6 +4532,7 @@ void ONMainWindow::resumeSession ( const x2goSession& s ) int width; int quality; int speed; + bool xinerama = false; bool usekbd; QString layout; QString type; @@ -4545,6 +4546,7 @@ void ONMainWindow::resumeSession ( const x2goSession& s ) width=defaultWidth; quality=defaultQuality; speed=defaultLink; + xinerama = defaultXinerama; usekbd=defaultSetKbd; layout=defaultLayout[0]; type=defaultKbdType; @@ -4594,6 +4596,9 @@ void ONMainWindow::resumeSession ( const x2goSession& s ) speed=st->setting()->value ( sid+"/speed", ( QVariant ) defaultLink ).toInt(); + xinerama = st->setting ()->value (sid + "/xinerama", + static_cast<QVariant>(defaultXinerama)).toBool (); + clipMode=st->setting()->value ( sid+"/clipboard", ( QVariant ) defaultClipboardMode ).toString(); @@ -4761,6 +4766,16 @@ void ONMainWindow::resumeSession ( const x2goSession& s ) cmd += "0"; cmd +=" "+clipMode; + QString xinerama_opt; + if (xinerama) { + xinerama_opt = "yes"; + } + else { + xinerama_opt = "no"; + } + + cmd += " " + xinerama_opt; + sshConnection->executeCommand ( cmd, this, SLOT ( slotRetResumeSess ( bool, QString, int ) )); resumingSession=s; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git