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

List:       kde-commits
Subject:    kdepim/libkdenetwork/gpgmepp
From:       Marc Mutz <mutz () kde ! org>
Date:       2005-04-29 6:29:09
Message-ID: 20050429062909.D0890629 () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

From KDE_3_3_BRANCH: Add support for GPGME_INCLUDE_CERTS_DEFAULT.


  M +1 -1      Makefile.am   1.13
  M +10 -0     configure.in.in   1.21
  M +12 -6     context.cpp   1.14
  M +5 -4      context.h   1.18


--- kdepim/libkdenetwork/gpgmepp/Makefile.am  #1.12:1.13
@@ -47,5 +47,5 @@
 #   (Interfaces added:                  AGE++)
 #   (Interfaces removed/changed:        AGE=0)
-libgpgme___la_LDFLAGS = -no-undefined -version-info 1:0:1
+libgpgme___la_LDFLAGS = -no-undefined -version-info 2:0:2
 libgpgme___la_LIBADD = $(GPGME_LIBS)
 libgpgme___la_DEPENDENCIES = $(GPGME_LIBS_DEP)

--- kdepim/libkdenetwork/gpgmepp/configure.in.in  #1.20:1.21
@@ -138,4 +138,14 @@
         ])
 
+        AC_MSG_CHECKING([if gpgme has GPGME_INCLUDE_CERTS_DEFAULT])
+        AC_TRY_COMPILE([#include <gpgme.h>], [
+                int i = GPGME_INCLUDE_CERTS_DEFAULT;
+        ], [
+                AC_DEFINE(HAVE_GPGME_INCLUDE_CERTS_DEFAULT, 1, [Define to 1 if your \
gpgme has the GPGME_INCLUDE_CERTS_DEFAULT macro]) +                \
AC_MSG_RESULT([yes]) +        ], [
+                AC_MSG_RESULT([no])
+        ])
+
         CFLAGS="$kdepim_gpgmepp_save_cflags"
         LIBS="$kdepim_gpgmepp_save_libs"

--- kdepim/libkdenetwork/gpgmepp/context.cpp  #1.13:1.14
@@ -137,5 +137,11 @@ namespace GpgME {
 
   void Context::setIncludeCertificates( int which ) {
-    assert( which >= -2 );
+    if ( which == DefaultCertificates ) {
+#ifdef HAVE_GPGME_INCLUDE_CERTS_DEFAULT
+      which = GPGME_INCLUDE_CERTS_DEFAULT;
+#else
+      which = 1;
+#endif
+    }
     gpgme_set_include_certs( d->ctx, which );
   }

--- kdepim/libkdenetwork/gpgmepp/context.h  #1.17:1.18
@@ -90,4 +90,5 @@ namespace GpgME {
 
     enum CertificateInclusion {
+      DefaultCertificates = -256,
       AllCertificatesExceptRoot = -2,
       AllCertificates = -1,


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