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

List:       kde-commits
Subject:    KDE/kdepim/libkleo
From:       Frank Osterfeld <frank.osterfeld () kdemail ! net>
Date:       2008-05-05 16:03:34
Message-ID: 1210003414.511961.21369.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 804288 by osterfeld:

remove/replace all KLEO_BUILD_OLD_MAINWINDOW occurrences

 M  +0 -12     backends/qgpgme/qgpgmebackend.cpp  
 M  +4 -6      kleo/cryptobackendfactory.cpp  
 M  +6 -12     tests/CMakeLists.txt  


--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmebackend.cpp #804287:804288
@@ -51,10 +51,6 @@
 #include "qgpgmeverifyopaquejob.h"
 #include "qgpgmechangeexpiryjob.h"
 
-#ifdef KLEO_BUILD_OLD_MAINWINDOW // kleo_no_compat
-# include "kleo/cryptplugwrapper.h"
-#endif
-
 #include <gpgme++/error.h>
 #include <gpgme++/engineinfo.h>
 
@@ -315,22 +311,14 @@
 Kleo::CryptoBackend::Protocol * Kleo::QGpgMEBackend::openpgp() const {
   if ( !mOpenPGPProtocol )
     if ( checkForOpenPGP() )
-#ifdef KLEO_BUILD_OLD_MAINWINDOW // KLEO_NO_COMPAT
-      mOpenPGPProtocol = new CryptPlugWrapper( "gpg", "openpgp" );
-#else
       mOpenPGPProtocol = new ::Protocol( GpgME::OpenPGP );
-#endif
   return mOpenPGPProtocol;
 }
 
 Kleo::CryptoBackend::Protocol * Kleo::QGpgMEBackend::smime() const {
   if ( !mSMIMEProtocol )
     if ( checkForSMIME() )
-#ifdef KLEO_BUILD_OLD_MAINWINDOW // KLEO_NO_COMPAT
-      mSMIMEProtocol = new CryptPlugWrapper( "gpgsm", "smime" );
-#else
       mSMIMEProtocol = new ::Protocol( GpgME::CMS );
-#endif
   return mSMIMEProtocol;
 }
 
--- trunk/KDE/kdepim/libkleo/kleo/cryptobackendfactory.cpp #804287:804288
@@ -39,11 +39,9 @@
 #include "libkleo/backends/kpgp/pgp6backend.h"
 #include "libkleo/backends/kpgp/gpg1backend.h"
 #endif
-#ifdef KLEO_BUILD_OLD_MAINWINDOW
-# include "libkleo/backends/chiasmus/chiasmusbackend.h"
-#endif
 
 #ifndef ONLY_KLEO
+# include "libkleo/backends/chiasmus/chiasmusbackend.h"
 # include "libkleo/ui/backendconfigwidget.h"
 #endif
 
@@ -62,7 +60,7 @@
 Kleo::CryptoBackendFactory * Kleo::CryptoBackendFactory::mSelf = 0;
 
 static const char * availableProtocols[] = {
-#ifdef KLEO_BUILD_OLD_MAINWINDOW
+#ifndef ONLY_KLEO
   "Chiasmus",
 #endif
   "OpenPGP", "SMIME",
@@ -82,7 +80,7 @@
   mBackendList.push_back( new PGP6Backend() );
   mBackendList.push_back( new GPG1Backend() );
 #endif
-#ifdef KLEO_BUILD_OLD_MAINWINDOW
+#ifndef ONLY_KLEO
   mBackendList.push_back( new ChiasmusBackend() );
 #endif
   scanForBackends();
@@ -231,7 +229,7 @@
   } defaults[] = {
     { "OpenPGP", "gpgme" },
     { "SMIME", "gpgme" },
-#ifdef KLEO_BUILD_OLD_MAINWINDOW
+#ifndef ONLY_KLEO
     { "Chiasmus", "chiasmus" },
 #endif
   };
--- trunk/KDE/kdepim/libkleo/tests/CMakeLists.txt #804287:804288
@@ -1,18 +1,15 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories( ${CMAKE_SOURCE_DIR}/libkleo  )
 
-if ( KLEO_BUILD_OLD_MAINWINDOW )
 ########### next target ###############
 
-set(test_keylister_SRCS test_keylister.cpp )
+#set(test_keylister_SRCS test_keylister.cpp )
 
+#kde4_add_executable(test_keylister TEST ${test_keylister_SRCS})
 
+#target_link_libraries(test_keylister  kleo ${KDE4_KDECORE_LIBS} )
 
-kde4_add_executable(test_keylister TEST ${test_keylister_SRCS})
 
-target_link_libraries(test_keylister  kleo ${KDE4_KDECORE_LIBS} )
-
-
 ########### next target ###############
 
 set(test_keygen_SRCS test_keygen.cpp )
@@ -26,13 +23,12 @@
 
 ########### next target ###############
 
-set(test_keyselectiondialog_SRCS test_keyselectiondialog.cpp )
+#set(test_keyselectiondialog_SRCS test_keyselectiondialog.cpp )
 
+#kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
 
-kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
+#target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} )
 
-target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} )
-
 ########### next target ###############
 
 set(test_cryptoconfig_SRCS test_cryptoconfig.cpp )
@@ -42,8 +38,6 @@
 
 target_link_libraries(test_cryptoconfig  kleo ${KDE4_KDECORE_LIBS} )
 
-endif ( KLEO_BUILD_OLD_MAINWINDOW )
-
 ########### next target ###############
 
 set(test_gnupgprocessbase_SRCS test_gnupgprocessbase.cpp )
[prev in list] [next in list] [prev in thread] [next in thread]