[X2Go-Commits] [x2goclient] 06/06: src/sessionbutton.cpp: only append "XDM@" string to server text if a direct XDMCP session was requested.
git-admin at x2go.org
git-admin at x2go.org
Sun Aug 20 05:49:59 CEST 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit f012dac91eecedcd1a87969d5b7531135d67738b
Author: Mihai Moldovan <ionic at 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 5621f60..88ca0d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -166,6 +166,8 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
- src/sshmasterconnection.cpp: typo fix in log message only.
- src/sshmasterconnection.cpp: don't leak ssh_session data, free it once
we're done with it.
+ - src/sessionbutton.cpp: only append "XDM@" string to server text if a
+ direct XDMCP session was requested. Issue automatically found by GCC.
* x2goclient.spec:
- Respect %{optflags} and pass QMAKE_STRIP=: to fix missing debug info
issues.
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
More information about the x2go-commits
mailing list