This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 6ff714b {macbuild.sh,src/{x2goutils.h,{pulsemanager,onmainwindow}.cpp},x2goclient.pro}: make MacPorts prefix selectable at compile time. new 8529206 Disable sound button on direct RDP and XDMCP sessions. Set for direct XDMCP session autologin=true. Set for direct XDMCP session username=XDM. 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 | 3 +++ src/onmainwindow.cpp | 10 +++++++++- src/sessionbutton.cpp | 10 ++++++++++ 3 files changed, 22 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 852920607866f61d45a20c24ea5d9bfc9c0e42da Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Sat Feb 25 10:05:17 2017 +0100 Disable sound button on direct RDP and XDMCP sessions. Set for direct XDMCP session autologin=true. Set for direct XDMCP session username=XDM. --- debian/changelog | 3 +++ src/onmainwindow.cpp | 10 +++++++++- src/sessionbutton.cpp | 10 ++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fb32acc..e46199a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -128,6 +128,9 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium [ Oleksandr Shneyder ] * New upstream version (4.1.0.1): - Add "direct XDMCP" functionality. + - Disable sound button on direct RDP and XDMCP sessions. + Set for direct XDMCP session autologin=true. + Set for direct XDMCP session username=XDM. [ Robert Parts ] * New upstream version (4.1.0.1): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 9585ec5..be99196 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -2730,6 +2730,12 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) autologin=st->setting()->value ( sid+"/autologin", ( QVariant ) false ).toBool(); +#ifdef Q_OS_LINUX + if(command =="XDMCP" && st->setting()->value ( + sid+"/directxdmcp", + ( QVariant ) false ).toBool()) + autologin=true; +#endif krblogin=st->setting()->value ( sid+"/krblogin", ( QVariant ) false ).toBool(); @@ -3469,14 +3475,16 @@ void ONMainWindow::startDirectRDP() break; } proxyCmd= client +" "+params+ grOpt + " -query "+host +" :"+QString::number(p) ; + login->setText(tr("XDM")); + resumingSession.display=tr("XDMCP"); } else { x2goDebug<<"starting direct RDP session"; + resumingSession.display=tr("RDP"); } // x2goDebug<<"starting direct session with cmd:"<<proxyCmd; nxproxy->start ( proxyCmd ); - resumingSession.display="RDP"; resumingSession.server=host; resumingSession.sessionId=sessionExplorer->getLastSession()->name(); resumingSession.crTime=QDateTime::currentDateTime().toString("dd.MM.yy HH:mm:ss"); diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp index c87d8ac..26da85f 100644 --- a/src/sessionbutton.cpp +++ b/src/sessionbutton.cpp @@ -449,15 +449,23 @@ void SessionButton::redraw() } else if ( command =="RDP" ) { +#ifdef Q_OS_LINUX if (st->setting()->value ( sid+"/directrdp", ( QVariant ) false ).toBool()) directRDP=true; +#endif cmdpix.load ( par->iconsPath ( "/16x16/rdp.png" ) ); cmdBox->setCurrentIndex ( RDP ); command=tr ( "RDP connection" ); } else if ( command =="XDMCP" ) { +#ifdef Q_OS_LINUX + if (st->setting()->value ( sid+"/directxdmcp", + ( QVariant ) false ).toBool()) + directRDP=true; + server->setText ( "XDM@"+sv ); +#endif cmdpix.load ( par->iconsPath ( "/16x16/X.png" ) ); cmdBox->setCurrentIndex ( XDMCP ); command=tr ( "XDMCP" ); @@ -566,6 +574,8 @@ void SessionButton::redraw() snd=st->setting()->value ( sid+"/sound", ( QVariant ) true ).toBool(); + if(directRDP) + snd=false; if ( snd ) sound->setText ( tr ( "Enabled" ) ); else -- 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