[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-05-10 20:40:04
Message-ID: 20040510204004.806072012 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Don't return a config object if gpgconf doesn't exist


  M +6 -2      qgpgmebackend.cpp   1.4


--- kdepim/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp  #1.3:1.4
@@ -44,4 +44,5 @@
 
 #include <klocale.h>
+#include <kstandarddirs.h>
 
 #include <qfile.h>
@@ -72,6 +73,9 @@ QString Kleo::QGpgMEBackend::displayName
 
 Kleo::CryptoConfig * Kleo::QGpgMEBackend::config() const {
-  if ( !mCryptoConfig )
+  if ( !mCryptoConfig ) {
+    static bool hasGpgConf = !KStandardDirs::findExe( "gpgconf" ).isEmpty();
+    if ( hasGpgConf )
     mCryptoConfig = new QGpgMECryptoConfig();
+  }
   return mCryptoConfig;
 }


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