This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 58e4845 Add new cmdline option --broker-noauth-use-session-username. When --broker-noauth is used, the broker does not know on behalf of which user to operate. This new option enables username syncing. When logging into X2Go Server, that username will be sent to the broker and be used for querying X2Go Broker Agents etc. (Fixes: #781). new 2b105f1 Reformat onmainwindow.cpp new ae6efce Fix multiply creation of modmap timer (OS_DARWIN). The 2 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 | 2 ++ onmainwindow.cpp | 29 +++++++++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) -- Alioth's /srv/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 2b105f11d73998111956b9964292ff23583d29f4 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Tue Feb 17 12:15:18 2015 +0100 Reformat onmainwindow.cpp --- debian/changelog | 1 + onmainwindow.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c40f3ab..14c1bca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Reformat onmainwindow.cpp - Fix placement of session folders in session card column. (Fixes: #681). - Send empty message in x2gohelper to stop AppStarting cursor. (Fixes: #616). + - Reformat onmainwindow.cpp [ Mike Gabriel ] * New upstream release (4.0.3.2): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 6dadd87..5bb4210 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -3032,7 +3032,7 @@ void ONMainWindow::slotSessEnter() if(brokerMode) { - if (config.brokerNoAuth && brokerNoauthWithSessionUsername) { + if (config.brokerNoAuth && brokerNoauthWithSessionUsername) { config.brokerUser = login->text(); } broker->selectUserSession(sessionExplorer->getLastSession()->id()); @@ -9723,8 +9723,8 @@ void ONMainWindow::startPulsed() else { pulseCookieArg="auth-cookie="+ - QDir::toNativeSeparators (wapiShortFileName( pulseBaseDir))+ - "\\.pulse-cookie"; + QDir::toNativeSeparators (wapiShortFileName( pulseBaseDir))+ + "\\.pulse-cookie"; // Double backslashes are required in config.pa pulseCookieArg.replace("\\", "\\\\"); out << "load-module module-native-protocol-tcp port="+ -- Alioth's /srv/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 ae6efce6e6d7e28fccad9d9a786c62b02f73ecaf Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Tue Feb 17 12:17:57 2015 +0100 Fix multiply creation of modmap timer (OS_DARWIN). --- debian/changelog | 1 + onmainwindow.cpp | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 14c1bca..102a564 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Fix placement of session folders in session card column. (Fixes: #681). - Send empty message in x2gohelper to stop AppStarting cursor. (Fixes: #616). - Reformat onmainwindow.cpp + - Fix multiply creation of modmap timer (OS_DARWIN). [ Mike Gabriel ] * New upstream release (4.0.3.2): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 5bb4210..b6922e8 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -192,6 +192,9 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) isPassShown=true; readExportsFrom=QString::null; spoolTimer=0l; +#ifdef Q_OS_DARWIN + modMapTimer=0; +#endif ldapOnly=false; embedControlChanged=false; statusString=tr ( "connecting" ); @@ -5463,9 +5466,12 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) { #ifdef Q_OS_DARWIN - disconnect(modMapTimer, SIGNAL(timeout()), this, SLOT(slotSetModMap())); - delete modMapTimer; - modMapTimer=0; + if(modMapTimer) + { + disconnect(modMapTimer, SIGNAL(timeout()), this, SLOT(slotSetModMap())); + delete modMapTimer; + modMapTimer=0; + } kbMap=QString::null; //fixes bug, when mainwindow inputs not accepting focus under mac setFocus(); @@ -5725,10 +5731,13 @@ void ONMainWindow::slotProxyStderr() } sbSusp->setToolTip ( tr ( "Suspend" ) ); #ifdef Q_OS_DARWIN - modMapTimer=new QTimer(this); - connect(modMapTimer, SIGNAL(timeout()), this, SLOT (slotSetModMap())); - modMapTimer->start(10000); - slotSetModMap(); + if(!modMapTimer) + { + modMapTimer=new QTimer(this); + connect(modMapTimer, SIGNAL(timeout()), this, SLOT (slotSetModMap())); + modMapTimer->start(10000); + slotSetModMap(); + } #endif if ( newSession ) { -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org