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

List:       kde-commits
Subject:    KDE/kdepim/libkleo
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-11-29 13:58:59
Message-ID: 20101129135859.81272AC8A7 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1202048 by mutz:

libkleo: port qgpgme backend to use GpgME::Configuration instead of self-rolled gpgconf parsing code

The code is only active under WinCE, because the gpgme gpgconf support is
not yet complete enough to replace our own gpgconf code. On WinCE, though,
we don't have stdin and stdout, so we need to use gpgme's gpgconf support.

 M  +1 -0      CMakeLists.txt  
 M  +7 -2      backends/qgpgme/qgpgmebackend.cpp  
 M  +1 -1      backends/qgpgme/qgpgmebackend.h  
 A             backends/qgpgme/qgpgmenewcryptoconfig.cpp   [License: GPL (v2+) (+Qt exception)]
 A             backends/qgpgme/qgpgmenewcryptoconfig.h   [License: GPL (v2+) (+Qt exception)]


--- trunk/KDE/kdepim/libkleo/CMakeLists.txt #1202047:1202048
@@ -41,6 +41,7 @@
     backends/qgpgme/qgpgmesignencryptjob.cpp
     backends/qgpgme/qgpgmedecryptverifyjob.cpp
     backends/qgpgme/qgpgmecryptoconfig.cpp
+    backends/qgpgme/qgpgmenewcryptoconfig.cpp
     backends/qgpgme/qgpgmerefreshkeysjob.cpp
     )
 
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmebackend.cpp #1202047:1202048
@@ -33,6 +33,7 @@
 #include "qgpgmebackend.h"
 
 #include "qgpgmecryptoconfig.h"
+#include "qgpgmenewcryptoconfig.h"
 
 #include "qgpgmekeygenerationjob.h"
 #include "qgpgmekeylistjob.h"
@@ -316,8 +317,12 @@
 
 Kleo::CryptoConfig * Kleo::QGpgMEBackend::config() const {
   if ( !mCryptoConfig ) {
-    static bool hasGpgConf = !QGpgMECryptoConfig::gpgConfPath().isEmpty();
-    if ( hasGpgConf )
+#ifdef _WIN32_WCE // for now...
+    if ( GpgME::hasFeature( GpgME::GpgConfEngineFeature, 0 ) )
+      mCryptoConfig = new QGpgMENewCryptoConfig;
+    else
+#endif
+      if ( !QGpgMECryptoConfig::gpgConfPath().isEmpty() )
       mCryptoConfig = new QGpgMECryptoConfig();
   }
   return mCryptoConfig;
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmebackend.h #1202047:1202048
@@ -69,7 +69,7 @@
     const char * enumerateProtocols( int i ) const;
 
   private:
-    mutable QGpgMECryptoConfig * mCryptoConfig;
+    mutable Kleo::CryptoConfig * mCryptoConfig;
     mutable Protocol * mOpenPGPProtocol;
     mutable Protocol * mSMIMEProtocol;
   };
[prev in list] [next in list] [prev in thread] [next in thread]