talons

commit acfc0f85269c799d53f31f7a4a87b3bb5954a08d
parent 8aa8aed17175f7adfdcfde86d62cabcf8ba2e688
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 14 Nov 2008 16:46:53 +0000

2008-11-14 [colin]	3.6.1cvs26

	* src/plugins/pgpcore/sgpgme.c
		Fix bug 1768, 'claws-mail crashes while
		checking smime bad signature'

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

4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-14 [colin]	3.6.1cvs26
+
+	* src/plugins/pgpcore/sgpgme.c
+		Fix bug 1768, 'claws-mail crashes while 
+		checking smime bad signature'
+
 2008-11-13 [colin]	3.6.1cvs25
 
 	* src/account.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3607,3 +3607,4 @@
 ( cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/prefs_gtk.h;  ) > 3.6.1cvs23.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/popfile-link.sh;  ) > 3.6.1cvs24.patchset
 ( cvs diff -u -r 1.61.2.90 -r 1.61.2.91 src/account.c;  cvs diff -u -r 1.60.2.47 -r 1.60.2.48 src/filtering.c;  ) > 3.6.1cvs25.patchset
+( cvs diff -u -r 1.1.2.54 -r 1.1.2.55 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs26.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=25
+EXTRA_VERSION=26
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
@@ -72,7 +72,6 @@ gpgme_verify_result_t sgpgme_verify_signature(gpgme_ctx_t ctx, gpgme_data_t sig,
 		debug_print("op_verify err %s\n", gpgme_strerror(err));
 		privacy_set_error("%s", gpgme_strerror(err));
 		return GINT_TO_POINTER(-GPG_ERR_SYSTEM_ERROR);
-		
 	}
 	status = gpgme_op_verify_result(ctx);
 	if (status && status->signatures == NULL) {
@@ -201,6 +200,9 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status)
 		else
 			g_warning(_("PGP Core: Can't get key - no gpg-agent running."));
 		warned = TRUE;
+	} else {
+		return g_strdup_printf(_("The signature can't be checked - %s"), 
+			gpgme_strerror(err));
 	}
 	if (key)
 		uname = extract_name(key->uids->uid);