The branch, master has been updated via 60ee3404e96f23e81dfd45561405db53d3e316f5 (commit) from b026eb6b729095f6907a2a6a00f1c59de2664850 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 60ee3404e96f23e81dfd45561405db53d3e316f5 Author: Oleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de> Date: Thu Apr 5 11:12:50 2012 +0200 Not starting smart card daemon before users are loaded in LDAP mode. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- onmainwindow.cpp | 45 ++++++++++++++++++++++++++------------------- onmainwindow.h | 1 + 3 files changed, 30 insertions(+), 20 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2467f37..ee397c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2goclient (3.99.2.1-0~x2go1) UNRELEASED; urgency=low - * Continue development... + [ Oleksandr Shneyder ] + * New upstream version (3.99.2.1): + - Not starting smart card daemon before users are loaded in LDAP mode. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 04 Apr 2012 11:55:57 +0200 diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 4ba3231..309e9c2 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -56,6 +56,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) cleanAllFiles=false; drawMenu=true; usePGPCard=false; + PGPInited=false; extLogin=false; startMaximized=false; startHidden=false; @@ -268,7 +269,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) } - if ( usePGPCard ) + if ( usePGPCard && !useLdap) { QTimer::singleShot ( 10, this, SLOT ( slotStartPGPAuth() ) ); } @@ -1035,8 +1036,8 @@ void ONMainWindow::trayIconInit() trayIconActiveConnectionMenu->addAction(tr ("Share folder..." ),this, SLOT(slotExportDirectory())); trayIconActiveConnectionMenu->addAction(tr("Suspend"),this, SLOT(slotSuspendSessFromSt())); trayIconActiveConnectionMenu->addAction(tr("Terminate"),this, SLOT(slotTermSessFromSt())); - connect (trayIconActiveConnectionMenu, SIGNAL(triggered(QAction*)), this, - SLOT(slotAppMenuTriggered(QAction*))); + connect (trayIconActiveConnectionMenu, SIGNAL(triggered(QAction*)), this, + SLOT(slotAppMenuTriggered(QAction*))); if (sessionStatusDlg && sessionStatusDlg->isVisible()) @@ -1081,8 +1082,8 @@ QMenu* ONMainWindow::initTrayAppMenu(QString text, QPixmap icon) void ONMainWindow::slotAppMenuTriggered(QAction* action) { x2goDebug<<"slotAppMenuTriggered :"<<action->data().toString()<<endl; - if(action->data().toString() != "") - runApplication(action->data().toString()); + if (action->data().toString() != "") + runApplication(action->data().toString()); } void ONMainWindow::plugAppsInTray() @@ -1095,18 +1096,18 @@ void ONMainWindow::plugAppsInTray() topActions.clear(); foreach(Application app, applications) { - QAction* act; - if(app.category==Application::TOP) - { - act=new QAction(app.icon,app.name,trayIconActiveConnectionMenu); - trayIconActiveConnectionMenu->insertAction(appSeparator, act); - topActions.append(act); - } - else - { - act=appMenu[app.category]->addAction(app.icon,app.name); - appMenu[app.category]->menuAction()->setVisible(true); - } + QAction* act; + if (app.category==Application::TOP) + { + act=new QAction(app.icon,app.name,trayIconActiveConnectionMenu); + trayIconActiveConnectionMenu->insertAction(appSeparator, act); + topActions.append(act); + } + else + { + act=appMenu[app.category]->addAction(app.icon,app.name); + appMenu[app.category]->menuAction()->setVisible(true); + } act->setToolTip(app.comment); act->setData(app.exec); empty=false; @@ -1128,8 +1129,8 @@ void ONMainWindow::removeAppsFromTray() } foreach (QAction* act, topActions) { - trayIconActiveConnectionMenu->removeAction(act); - delete act; + trayIconActiveConnectionMenu->removeAction(act); + delete act; } topActions.clear(); appSeparator->setVisible(false); @@ -1555,6 +1556,12 @@ void ONMainWindow::displayUsers() SLOT ( slotSnameChanged ( const QString& ) ) ); connect ( uname,SIGNAL ( textEdited ( const QString& ) ),this, SLOT ( slotUnameChanged ( const QString& ) ) ); + if ( usePGPCard && !PGPInited) + { + PGPInited=true; + x2goDebug<<"Users loaded, starting smart card daemon\n"; + QTimer::singleShot ( 10, this, SLOT ( slotStartPGPAuth() ) ); + } } void ONMainWindow::showPass ( UserButton* user ) diff --git a/onmainwindow.h b/onmainwindow.h index 4a17a92..7e9cb94 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -518,6 +518,7 @@ private: bool showTbTooltip; bool noSessionEdit; bool cleanAllFiles; + bool PGPInited; struct SshProxy sshProxy; QString sshPort; QString clientSshPort; hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).