This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.1.0.1 in repository x2goclient. commit 46c2dbde92c0162baff8e048700fe3d8d26b6662 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 20 05:49:14 2017 +0200 src/sessionbutton.cpp: only append "XDM@" string to server text if a direct XDMCP session was requested. Issue automatically found by GCC. --- debian/changelog | 2 ++ src/sessionbutton.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 71b5d28..e01239e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium * New upstream version (4.1.0.1): - src/onmainwindow.cpp: unbreak Windows and OS X builds - directRDP is only available on Linux, so guard new section. + - src/sessionbutton.cpp: only append "XDM@" string to server text if a + direct XDMCP session was requested. Issue automatically found by GCC. [ Oleksandr Shneyder ] * New upstream version (4.1.0.1): diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp index 26da85f..2f6fb95 100644 --- a/src/sessionbutton.cpp +++ b/src/sessionbutton.cpp @@ -462,9 +462,10 @@ void SessionButton::redraw() { #ifdef Q_OS_LINUX if (st->setting()->value ( sid+"/directxdmcp", - ( QVariant ) false ).toBool()) + ( QVariant ) false ).toBool()) { directRDP=true; server->setText ( "XDM@"+sv ); + } #endif cmdpix.load ( par->iconsPath ( "/16x16/X.png" ) ); cmdBox->setCurrentIndex ( XDMCP ); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git