[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/certmanager/lib/backends/qgpgme
From:       David Faure <faure () kde ! org>
Date:       2004-09-01 11:32:30
Message-ID: 20040901113230.248641D91 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Don't suggest to install gpg-agent when it's already installed; suggest to use it \
instead. Based on patch by Diego Pettenò, with an improved check for the installed \
                binary.
CCMAIL: 85430-done@bugs.kde.org


  M +13 -4     qgpgmejob.cpp   1.7


--- kdepim/certmanager/lib/backends/qgpgme/qgpgmejob.cpp  #1.6:1.7
@@ -48,4 +48,5 @@
 
 #include <klocale.h>
+#include <kstandarddirs.h>
 
 #include <qstring.h>
@@ -158,8 +159,16 @@ char * Kleo::QGpgMEJob::getPassphrase( c
   msg = msg.arg( QString::fromUtf8( useridHint ) ) + "<br/><br/>";
   msg.prepend( "<qt>" );
-  msg += i18n( "This dialog will reappear every time the passphrase is needed. For a \
more secure solution that also allows caching the passphrase, install gpg-agent." ); \
+  msg += i18n( "This dialog will reappear every time the passphrase is needed. For a \
more secure solution that also allows caching the passphrase, use gpg-agent." ) + \
"<br/>"; +  const QString gpgAgent = KStandardDirs::findExe( "gpg-agent" );
+  if ( !gpgAgent.isEmpty() ) {
+    msg += i18n( "gpg-agent was found in %1, but doesn't appear to be running." );
+  } else {
   msg += i18n( "gpg-agent is part of gnupg-%1, which you can download from %2" )
          .arg( "1.9" )
          .arg( "http://www.gnupg.org/download" );  // add #gnupg2 if you can make \
this a real link +  }
+  msg += "<br/>";
+  msg += i18n( "For information on how to set it gpg-agent, see %1" )
+         .arg( "http://kmail.kde.org/kmail-pgpmime-howto.html" ) + "<br/>";
   Kleo::PassphraseDialog dlg( msg, i18n("Passphrase Dialog") );
   if ( dlg.exec() != QDialog::Accepted ) {


[prev in list] [next in list] [prev in thread] [next in thread]