This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from c24a334 src/settingswidgets.cpp: don't incorrectly enable whole display settings in single display setups. new 22ccf70 src/onmainwindow.cpp: pass X2GO_RANDR_XINERAMA=[yes,no] to x2gostartagent as an environment variable based upon the xinerama session setting. new c2bd0ed src/onmainwindow.cpp: fix another leaked X2goSettings object. 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 | 5 +++++ src/onmainwindow.cpp | 18 +++++++++++++++++- 2 files changed, 22 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 22ccf7056398173f0fd05e894781a83016efc7dd Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 10 07:44:41 2018 +0100 src/onmainwindow.cpp: pass X2GO_RANDR_XINERAMA=[yes,no] to x2gostartagent as an environment variable based upon the xinerama session setting. Has no effect when connecting to older X2Go Server versions and handles startup correctly with X2Go Server 4.1.0.0. --- debian/changelog | 4 ++++ src/onmainwindow.cpp | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 478faea..0453a13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,10 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium - src/settingswidgets.cpp: don't incorrectly enable whole display settings in single display setups. Let debugging mode override this behavior, though. + - src/onmainwindow.cpp: pass X2GO_RANDR_XINERAMA=[yes,no] to + x2gostartagent as an environment variable based upon the xinerama + session setting. Has no effect when connecting to older X2Go Server + versions and handles startup correctly with X2Go Server 4.1.0.0. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index ae3f11d..97b5039 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -4130,6 +4130,7 @@ void ONMainWindow::startNewSession() bool rootless=false; resumingSession.published=false; bool setDPI=defaultSetDPI; + bool xinerama = false; uint dpi=defaultDPI; QString layout; QString type; @@ -4148,6 +4149,7 @@ void ONMainWindow::startNewSession() width=defaultWidth; quality=defaultQuality; speed=defaultLink; + xinerama = defaultXinerama; usekbd=defaultSetKbd; layout=defaultLayout[0]; type=defaultKbdType; @@ -4240,6 +4242,9 @@ void ONMainWindow::startNewSession() 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(); @@ -4458,13 +4463,22 @@ void ONMainWindow::startNewSession() } QString dpiEnv; QString xdmcpEnv; + QString xinerama_env = "X2GO_RANDR_XINERAMA="; if ( runRemoteCommand==false && command=="XDMCP" ) xdmcpEnv="X2GOXDMCP="+xdmcpServer+" "; if ( setDPI ) { dpiEnv="X2GODPI="+QString::number ( dpi ) +" "; } - QString cmd=dpiEnv+xdmcpEnv+"x2gostartagent "+ + + if (xinerama) { + xinerama_env += "yes"; + } + else { + xinerama_env += "no"; + } + + QString cmd=dpiEnv+xdmcpEnv+ xinerama_env + " x2gostartagent "+ geometry+" "+link+" "+pack+ " unix-kde-depth_"+depth+" "+layout+" "+type+" "; if ( usekbd ) -- 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 c2bd0ed2229839663ef7cec5d3f12230177df5b9 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 10 07:45:32 2018 +0100 src/onmainwindow.cpp: fix another leaked X2goSettings object. --- debian/changelog | 1 + src/onmainwindow.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0453a13..9c576bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,7 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium x2gostartagent as an environment variable based upon the xinerama 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. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 97b5039..34e3d43 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -11424,6 +11424,7 @@ void ONMainWindow::slotFindProxyWin() { uint disp=st->setting()->value ( sid+"/display", ( QVariant ) 1 ).toUInt(); + delete st; if (disp>displays) { disp=1; @@ -11433,6 +11434,7 @@ void ONMainWindow::slotFindProxyWin() return; } #endif + delete st; } if (xinerama) { -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org