2009-10-20 [colin] 3.7.3cvs5

	* src/plugins/pgpcore/sgpgme.c
		Fix bug 1996, 'S/MIME key not selected'
		Check for S/MIME certs too

diff --git a/ChangeLog b/ChangeLog
index 524a13cf9b16d71318452ecac0962008d7ec7799..258b82cb87a7c1cc3f11b161d0e69c957f70fb74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-20 [colin]     3.7.3cvs5
+
+       * src/plugins/pgpcore/sgpgme.c
+               Fix bug 1996, 'S/MIME key not selected'
+               Check for S/MIME certs too
+
 2009-10-20 [colin]     3.7.3cvs4
 
        * src/common/w32lib.h

diff --git a/PATCHSETS b/PATCHSETS
index bd84993d6110b35b9ce28e8703d705d0d16732ae..7fe573f9d823de35df3affe72dccdd94759c0c25 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3878,3 +3878,4 @@
 ( cvs diff -u -r 1.1.2.21 -r 1.1.2.22 tools/claws.i18n.status.pl;  ) > 3.7.3cvs2.patchset
 ( cvs diff -u -r 1.1.4.20 -r 1.1.4.21 src/exportldif.c;  cvs diff -u -r 1.12.2.21 -r 1.12.2.22 src/ldif.c;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/ldif.h;  ) > 3.7.3cvs3.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/common/w32lib.h;  ) > 3.7.3cvs4.patchset
+( cvs diff -u -r 1.1.2.64 -r 1.1.2.65 src/plugins/pgpcore/sgpgme.c;  ) > 3.7.3cvs5.patchset

diff --git a/configure.ac b/configure.ac
index e46ad60f34e20c1b5ba80d27a9aa3cb77eae8e89..7dbb0776bde5d31384a0066a34d1214ec28bec39 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=4
+EXTRA_VERSION=5
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 8410ab0e0a29c2fbc6ca8b11bebfcb8b0001eca0..eccc3701b7e5f2897521997d0eccfb2194726f93 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -855,14 +855,19 @@ gboolean sgpgme_has_secret_key(void)
                debug_print("err : %s\n", gpgme_strerror(err));
                return TRUE;
        }
+check_again:
        err = gpgme_op_keylist_start(ctx, NULL, TRUE);
        if (!err)
                err = gpgme_op_keylist_next(ctx, &key);
        gpgme_op_keylist_end(ctx);
        gpgme_release(ctx);
-       if (gpg_err_code(err) == GPG_ERR_EOF)
+       if (gpg_err_code(err) == GPG_ERR_EOF) {
+               if (gpgme_get_protocol(ctx) != GPGME_PROTOCOL_CMS) {
+                       gpgme_set_protocol(ctx, GPGME_PROTOCOL_CMS);
+                       goto check_again;
+               }
                return FALSE;
-       else
+       } else
                return TRUE;
 }