This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 79d90574a2176c2429b3366ed97ef7551a359c82 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Oct 16 10:33:37 2014 +0200 Add support for session selection in broker mode. --- debian/changelog | 1 + httpbrokerclient.cpp | 2 +- onmainwindow.cpp | 30 ++++++++++++++++++++---------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8adc640..f23a3c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -59,6 +59,7 @@ x2goclient (4.0.3.0-0x2go1) UNRELEASED; urgency=low (Fixes: #580). - Fix placing sessions folders in broker mode. - Fix onmainwindow.cpp after 76ae96781f1d2d5754ee4751539d5de47f1d0297. + - Add support for session selection in broker mode. [ Mike DePaulo ] * New upstream release (4.0.3.0): diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index a066240..fc4d891 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -536,7 +536,7 @@ void HttpBrokerClient::parseSession(QString sinfo) if (sinfo.indexOf("SESSION_INFO")!=-1) { QStringList lst=sinfo.split("SESSION_INFO:",QString::SkipEmptyParts); - config->sessiondata=(lst[1].split("\n"))[0]; + config->sessiondata=lst[1]; x2goDebug<<"session data: "<<config->sessiondata<<"\n"; } x2goDebug<<"parsing has finished\n"; diff --git a/onmainwindow.cpp b/onmainwindow.cpp index b0534bd..9234a2e 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -3425,7 +3425,7 @@ void ONMainWindow::slotListSessions ( bool result,QString output, uname->setEnabled ( false ); u->setEnabled ( false ); } - if ( managedMode || brokerMode ) + if ( managedMode ) { x2goDebug<<"Session data: " + config.sessiondata; if ( config.sessiondata.indexOf ( "|S|" ) ==-1 ) @@ -3442,8 +3442,17 @@ void ONMainWindow::slotListSessions ( bool result,QString output, return; } - QStringList sessions=output.trimmed().split ( '\n', - QString::SkipEmptyParts ); + QStringList sessions; + if(!brokerMode) + { + sessions=output.trimmed().split ( '\n', + QString::SkipEmptyParts ); + } + else + { + sessions=config.sessiondata.trimmed().split ( '\n', + QString::SkipEmptyParts ); + } if ( shadowSession ) { selectSession ( sessions ); @@ -7554,17 +7563,17 @@ void ONMainWindow::exportDefaultDirs() { QStringList dirs; bool clientPrinting= ( useLdap && LDAPPrintSupport ); - X2goSettings* st; if ( !useLdap ) { if ( !embedMode ) { - if (!brokerMode) - st= new X2goSettings( "sessions" ); - else - st= new X2goSettings(config.iniFile,QSettings::IniFormat); + X2goSettings* st; + if (!brokerMode) + st= new X2goSettings( "sessions" ); + else + st= new X2goSettings(config.iniFile,QSettings::IniFormat); clientPrinting= st->setting()->value ( sessionExplorer->getLastSession()->id() + @@ -7606,6 +7615,7 @@ void ONMainWindow::exportDefaultDirs() dirs+=tails[0]; } } + delete st; } else { @@ -7656,7 +7666,6 @@ void ONMainWindow::exportDefaultDirs() SLOT ( slotCheckPrintSpool() ) ); spoolTimer->start ( 2000 ); } - delete st; if ( dirs.size() <=0 ) return; exportDirs ( dirs.join ( ":" ) ); @@ -11225,7 +11234,8 @@ void ONMainWindow::initSelectSessDlg() connect ( sessTv,SIGNAL ( selected ( const QModelIndex& ) ), this,SLOT ( slotActivated ( const QModelIndex& ) ) ); - connect ( sessTv,SIGNAL ( activated ( const QModelIndex& ) ), + + connect ( sessTv,SIGNAL ( doubleClicked ( const QModelIndex& ) ), this,SLOT ( slotResumeDoubleClick ( const QModelIndex& ) ) ); connect ( sOk,SIGNAL ( clicked() ),this, SLOT ( slotResumeSess() ) ); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git