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

List:       kde-commits
Subject:    kdepim/certmanager/lib
From:       David Faure <faure () kde ! org>
Date:       2004-08-11 17:24:50
Message-ID: 20040811172450.0E7D5999B () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Fix compilation with kpgp backends disabled


  M +3 -1      Makefile.am   1.10
  M +0 -6      cryptplugfactory.cpp   1.16
  M +2 -0      kleo/cryptobackendfactory.cpp   1.3


--- kdepim/certmanager/lib/Makefile.am  #1.9:1.10
@@ -14,5 +14,4 @@
                         kleo/libkleopatra_core.la \
                         backends/qgpgme/libkleopatra_backend_qgpgme.la \
-                        backends/kpgp/libkleopatra_backend_kpgp.la \
                         ui/libkleopatra_ui.la \
                         \
@@ -21,4 +20,7 @@
                         $(LIB_KDEUI)
 
+# Disabled for kdepim-3.3, see also kleo/cryptobackendfactory.cpp
+# backends/kpgp/libkleopatra_backend_kpgp.la
+
 libkleopatra_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
 

--- kdepim/certmanager/lib/cryptplugfactory.cpp  #1.15:1.16
@@ -37,10 +37,4 @@
 #include "cryptplugfactory.h"
 #include "cryptplugwrapperlist.h"
-#include <backends/qgpgme/qgpgmebackend.h>
-#include <backends/kpgp/pgp2backend.h>
-#include <backends/kpgp/pgp5backend.h>
-#include <backends/kpgp/pgp6backend.h>
-#include <backends/kpgp/gpg1backend.h>
-#include <ui/backendconfigwidget.h>
 
 #include <kconfig.h>

--- kdepim/certmanager/lib/kleo/cryptobackendfactory.cpp  #1.2:1.3
@@ -60,8 +60,10 @@ Kleo::CryptoBackendFactory::CryptoBacken
   mConfigObject = 0;
   mBackendList.push_back( new QGpgMEBackend() );
+#if 0 // disabled for kde-3.3
   mBackendList.push_back( new PGP2Backend() );
   mBackendList.push_back( new PGP5Backend() );
   mBackendList.push_back( new PGP6Backend() );
   mBackendList.push_back( new GPG1Backend() );
+#endif
   scanForBackends();
   readConfig();


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