This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 6cf765e39c6eba15bd3f13e1b1e311f6491c3226 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Mar 1 22:24:50 2018 +0100 change search string for pcsc_scan. --- debian/changelog | 1 + src/onmainwindow.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index c34aed6..a00635b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ x2goclient (4.1.1.2-0x2go1) UNRELEASED; urgency=medium [ Oleksandr Shneyder ] * New upstream version (4.1.1.2): - don't start gpg agent for PGP card authentication. Use system agent instead. + - change search string for pcsc_scan. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 22:01:32 +0100 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 4b1c9bb..2bf2223 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -9100,7 +9100,7 @@ void ONMainWindow::slotStartPGPAuth() slotScDaemonFinished ( int, QProcess::ExitStatus ) ) ); connect (scDaemon, SIGNAL (error (QProcess::ProcessError)), this, SLOT (slotScDaemonError (QProcess::ProcessError))); - scDaemon->start ( "pcsc_scan"); + scDaemon->start ( "pcsc_scan -n"); } @@ -9117,12 +9117,13 @@ void ONMainWindow::slotScDaemonStdOut() QString stdOut ( scDaemon->readAllStandardOutput() ); stdOut=stdOut.simplified(); - x2goDebug<<"PCSC out: "<<stdOut; - if(stdOut.indexOf("Card state: Card inserted")!=-1) + x2goDebug<<"PCSC out: |"<<stdOut<<"|"; + if(stdOut.indexOf("Card inserted")!=-1) { + x2goDebug<<"GOT NEW CARD!!!!!"; startGPG(); } - if(stdOut.indexOf("Card state: Card removed")!=-1) + if(stdOut.indexOf("Card removed")!=-1) { cardReady=false; if ( cardStarted ) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git