This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from b9822f4 {debian/changelog,src/onmainwindow.cpp}: fixup last commit. Spelling errors, changelog format, unclear blocks. new d220069 onmainwindow.cpp: only set multidisplay mode for non-rootless sessions. The 1 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 | 1 + src/onmainwindow.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.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 d220069e8f721b2d462145cbb9cf6fe1c9ec4a47 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jul 8 05:24:18 2015 +0200 onmainwindow.cpp: only set multidisplay mode for non-rootless sessions. --- debian/changelog | 1 + src/onmainwindow.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 06d67a3..6d59ed2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,6 +66,7 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low - x2goclient.pro: reinstate old lrelease "search" behavior if qtPrepareTool() is not available. This should only happen on EPEL 6, which ships a broken Qt4 version... + - onmainwindow.cpp: only set multidisplay mode for non-rootless sessions. [ Mike Gabriel ] * debian/control: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 569ccc1..b3e0fc0 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -3838,7 +3838,7 @@ void ONMainWindow::startNewSession() xorgWidth=QString::number(width); xorgHeight=QString::number(height); uint displays=QApplication::desktop()->numScreens(); - if (st->setting()->value ( sid+"/multidisp", ( QVariant ) false ).toBool()) + if ((!rootless) && (st->setting()->value ( sid+"/multidisp", ( QVariant ) false ).toBool()) { xorgMode=MULTIDISPLAY; uint disp=st->setting()->value ( sid+"/display",( QVariant ) 1 ).toUInt(); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org