talons

commit f65c20760530cbc26458c6fb8064b1074f4d381e
parent 2e001b095f171bf440cda58ae2e05e4ea395a12a
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 20 Oct 2009 17:40:30 +0000

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

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/plugins/pgpcore/sgpgme.c
 | 
9
+++++++--

4 files changed, 15 insertions(+), 3 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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;
 }