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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepimlibs
From:       Marc Mutz <mutz () kde ! org>
Date:       2008-06-27 18:15:17
Message-ID: 1214590517.642573.7508.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 825270 by mutz:

Merged revisions 825268 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........
  r825268 | mutz | 2008-06-27 20:10:59 +0200 (Fri, 27 Jun 2008) | 1 line
  
  Use gpgme_cancel_async, of available
........


 _M            . (directory)  
 M  +3 -0      gpgme++/ConfigureChecks.cmake  
 M  +3 -0      gpgme++/config-gpgme++.h.cmake  
 M  +7 -0      gpgme++/context.cpp  
 M  +1 -1      gpgme++/global.h  


** branches/kdepim/enterprise4/kdepimlibs #property svnmerge-integrated
   - /trunk/KDE/kdepimlibs:1-810326,810878-810943,811116-811399,811738,812038-812698,8 \
13143,814124-816491,816680-817025,817240,817874-818565,819282,819632,820196-820198,820462-820624,820669-820902,821149-821238,821534,822014
  + /trunk/KDE/kdepimlibs:1-810326,810878-810943,811116-811399,811738,812038-812698,81 \
3143,814124-816491,816680-817025,817240,817874-818565,819282,819632,820196-820198,820462-820624,820669-820902,821149-821238,821534,822014,825268
                
--- branches/kdepim/enterprise4/kdepimlibs/gpgme++/ConfigureChecks.cmake \
#825269:825270 @@ -258,6 +258,9 @@
 " HAVE_GPGME_PROTOCOL_GPGCONF
 )
 
+# check if gpgme has gpgme_cancel_async
+check_function_exists ("gpgme_cancel_async" HAVE_GPGME_CANCEL_ASYNC )
+
 set(CMAKE_REQUIRED_INCLUDES)
 set(CMAKE_REQUIRED_LIBRARIES)
 
--- branches/kdepim/enterprise4/kdepimlibs/gpgme++/config-gpgme++.h.cmake \
#825269:825270 @@ -57,3 +57,6 @@
 
 /* Define to 1 if your gpgme has GPGME_PROTOCOL_GPGCONF */
 #cmakedefine HAVE_GPGME_PROTOCOL_GPGCONF 1
+
+/* Define to 1 if your gpgme has gpgme_cancel_async */
+#cmakedefine HAVE_GPGME_CANCEL_ASYNC 1
--- branches/kdepim/enterprise4/kdepimlibs/gpgme++/context.cpp #825269:825270
@@ -785,7 +785,11 @@
 
 
   Error Context::cancelPendingOperation() {
+#ifdef HAVE_GPGME_CANCEL_ASYNC
+    return Error( gpgme_cancel_async( d->ctx ) );
+#else
     return Error( gpgme_cancel( d->ctx ) );
+#endif
   }
 
   bool Context::poll() {
@@ -933,6 +937,9 @@
 #ifdef HAVE_GPGME_PROTOCOL_GPGCONF
     | GpgME::GpgConfEngineFeature
 #endif
+#ifdef HAVE_GPGME_CANCEL_ASYNC
+    | GpgME::CancelOperationAsyncFeature
+#endif
     ;
 
 bool GpgME::hasFeature( unsigned long features ) {
--- branches/kdepim/enterprise4/kdepimlibs/gpgme++/global.h #825269:825270
@@ -90,8 +90,8 @@
 
         AuditLogFeature                            = 0x00001000,
         GpgConfEngineFeature                       = 0x00002000,
+        CancelOperationAsyncFeature                = 0x00004000,
         // reserved
-        // reserved
 
         ClearAddGetSignatureNotationsFeature       = 0x00010000,
         SignatureNotationsKeylistModeFeature       = 0x00020000,


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