[Commits] [SCM] claws branch, master, updated. 3.10.1-3-g7c90d01

claws at claws-mail.org claws at claws-mail.org
Mon Jun 9 18:14:04 CEST 2014


The branch master of project "claws" (Claws Mail) has been updated
       via  7c90d012048137e3d11f1220783d60394e641b85 (commit)
      from  5b06e357b4b029a01ec245b75689e5789324ac36 (commit)


- Log -----------------------------------------------------------------
commit 7c90d012048137e3d11f1220783d60394e641b85
Author: Paul <paul at claws-mail.org>
Date:   Mon Jun 9 17:13:58 2014 +0100

    in full sig info: fix check for revoked key error code, and indicate expired key

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 074c6ac..51c821d 100644
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -304,17 +304,21 @@ gchar *sgpgme_sigstat_info_full(gpgme_ctx_t ctx, gpgme_verify_result_t status)
 		
 		switch (gpg_err_code(sig->status)) {
 		case GPG_ERR_NO_ERROR:
-		case GPG_ERR_KEY_EXPIRED:
 			g_string_append_printf(siginfo,
 				_("Good signature from uid \"%s\" (Validity: %s)\n"),
 				uid, get_validity_str(user?user->validity:GPGME_VALIDITY_UNKNOWN));
 			break;
+		case GPG_ERR_KEY_EXPIRED:
+			g_string_append_printf(siginfo,
+				_("Expired key uid \"%s\"\n"),
+				uid);
+			break;
 		case GPG_ERR_SIG_EXPIRED:
 			g_string_append_printf(siginfo,
 				_("Expired signature from uid \"%s\" (Validity: %s)\n"),
 				uid, get_validity_str(user?user->validity:GPGME_VALIDITY_UNKNOWN));
 			break;
-		case GPG_ERR_CERT_EXPIRED:
+		case GPG_ERR_CERT_REVOKED:
 			g_string_append_printf(siginfo,
 				_("Revoked key uid \"%s\"\n"),
 				uid);

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/pgpcore/sgpgme.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list