This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from c2bd0ed src/onmainwindow.cpp: fix another leaked X2goSettings object. new d66bd70 src/onmainwindow.cpp: rename xinerama env variable on session startup to X2GO_XINERAMA in accordance with server changes. new 8ee5979 src/onmainwindow.cpp: supply xinerama option as another parameter to x2goresume-session on session resume. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 ++++ src/onmainwindow.cpp | 17 ++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit d66bd7000bca6e588ba1b2272277cb788f4bbd03 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jan 12 10:16:49 2018 +0100 src/onmainwindow.cpp: rename xinerama env variable on session startup to X2GO_XINERAMA in accordance with server changes. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9c576bc..e9e5b6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium session setting. Has no effect when connecting to older X2Go Server versions and handles startup correctly with X2Go Server 4.1.0.0. - 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. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 34e3d43..8c2d457 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -4463,7 +4463,7 @@ void ONMainWindow::startNewSession() } QString dpiEnv; QString xdmcpEnv; - QString xinerama_env = "X2GO_RANDR_XINERAMA="; + QString xinerama_env = "X2GO_XINERAMA="; if ( runRemoteCommand==false && command=="XDMCP" ) xdmcpEnv="X2GOXDMCP="+xdmcpServer+" "; if ( setDPI ) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
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
-
git-admin＠x2go.org