This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 1d9c4ab Replace "::" with "_" for the desktop link name on Windows. new d56ee8f Fix direct RDP in broker mode. 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 | 15 +++++++++++++++ 2 files changed, 16 insertions(+) -- 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 d56ee8f336826f35afcce1ae96014fdc33d8b65c Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Mon Nov 9 10:56:42 2015 +0100 Fix direct RDP in broker mode. --- debian/changelog | 1 + src/onmainwindow.cpp | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index b552f9e..fce70b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low - Add support for new style command line options of xfreerdp on direct RDP connections. (Fixes: #772). - Replace "::" with "_" for the desktop link name on Windows. + - Fix direct RDP in broker mode. [ Mike Gabriel ] * New upstream release (4.0.5.1): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index e4b6049..3e2f2f8 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -3099,6 +3099,21 @@ void ONMainWindow::slotSessEnter() if (config.brokerNoAuth && brokerNoauthWithSessionUsername) { config.brokerUser = login->text(); } +#ifdef Q_OS_LINUX + X2goSettings* st=new X2goSettings(config.iniFile, QSettings::IniFormat); + QString sid=sessionExplorer->getLastSession()->id(); + QString cmd=st->setting()->value ( sid+"/command", + ( QVariant ) QString::null ).toString(); + bool directRDP=(st->setting()->value ( sid+"/directrdp", + ( QVariant ) false ).toBool() && cmd == "RDP"); + + if (cmd =="RDP" && directRDP) + { + x2goDebug<<"Starting direct RDP Session from broker"; + startSession ( sid ); + return; + } +#endif broker->selectUserSession(sessionExplorer->getLastSession()->id()); config.session=sessionExplorer->getLastSession()->id(); setStatStatus ( tr ( "Connecting to broker" ) ); -- 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