This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 76ae96781f1d2d5754ee4751539d5de47f1d0297 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 13:57:19 2014 +0200 Honor exports (client-side shared folders) from broker session profiles. Thanks to Ming Song for providing a patch for this (Fixes: 612). --- debian/changelog | 3 +++ onmainwindow.cpp | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ccd72cc..aa9543c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ x2goclient (4.0.3.0-0x2go1) UNRELEASED; urgency=low qt_<lang>.qm files from Debian unstable as of today. - Update German translation file (after session folder feature got added). - Makefile.man2html: Test if man2html exists. If not, don't fail. + - Honor exports (client-side shared folders) from broker session profiles. + Thanks to Ming Song for providing a patch for this (Fixes: 612). * debian/control: + Add B-D: apache2-dev. On squeeze / lucid builds, this is a superfluous B-D, but for later Debian/Ubuntu versions, this smoothes the installation @@ -17,6 +19,7 @@ x2goclient (4.0.3.0-0x2go1) UNRELEASED; urgency=low * x2goclient.spec: + Adapt to building for openSUSE/SLES. + [ Oleksandr Shneyder ] * New upstream release (4.0.3.0): - Fix running x2goclient without arguments on Windows. (Fixes: #522). diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 7fe7501..9c702b5 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -7554,18 +7554,23 @@ void ONMainWindow::exportDefaultDirs() { QStringList dirs; bool clientPrinting= ( useLdap && LDAPPrintSupport ); + X2goSettings st; if ( !useLdap ) { if ( !embedMode ) { - X2goSettings st ( "sessions" ); - clientPrinting= st.setting()->value ( + if (!brokerMode) + st= new X2goSettings( "sessions" ); + else + st= new X2goSettings(config.iniFile,QSettings::IniFormat); + + clientPrinting= st->setting()->value ( sessionExplorer->getLastSession()->id() + "/print", true ).toBool(); - QString exd=st.setting()->value ( + QString exd=st->setting()->value ( sessionExplorer->getLastSession()->id() +"/export", ( QVariant ) QString::null ).toString(); QStringList lst=exd.split ( ";", @@ -7651,6 +7656,7 @@ void ONMainWindow::exportDefaultDirs() SLOT ( slotCheckPrintSpool() ) ); spoolTimer->start ( 2000 ); } + delete st; if ( dirs.size() <=0 ) return; exportDirs ( dirs.join ( ":" ) ); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git