From 696f45c8425f60918c31bcd6168b66a2dc7914f4 Mon Sep 17 00:00:00 2001 From: Brendan Cully Date: Mon, 1 Aug 2005 20:06:41 +0000 Subject: [PATCH] Don't report PGP signature could not be verified unless there really is a signature verification problem (not some other PGP error). --- commands.c | 2 +- pgp.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/commands.c b/commands.c index db28ff47..47279641 100644 --- a/commands.c +++ b/commands.c @@ -200,7 +200,7 @@ int mutt_display_message (HEADER *cur) mutt_message (_("PGP signature successfully verified.")); else if (cur->security & PARTSIGN) mutt_message (_("Warning: Part of this message has not been signed.")); - else + else if (cur->security & SIGN) mutt_message (_("PGP signature could NOT be verified.")); } diff --git a/pgp.c b/pgp.c index 17c3d17a..09beab5a 100644 --- a/pgp.c +++ b/pgp.c @@ -916,7 +916,11 @@ void pgp_encrypted_handler (BODY *a, STATE *s) } mutt_free_body (&tattach); + /* clear 'Invoking...' message, since there's no error */ + mutt_clear_error (); } + else + mutt_error _("Could not decrypt PGP message"); fclose (fpout); mutt_unlink(tempfile); -- 2.50.1