From: Brendan Cully <brendan@kublai.com>
Date: Mon, 1 Aug 2005 20:06:41 +0000 (+0000)
Subject: Don't report PGP signature could not be verified unless there really is
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=352cac1928259bc7b1c0682cad7af1c2c36c3d02;p=neomutt

Don't report PGP signature could not be verified unless there really is
a signature verification problem (not some other PGP error).
---

diff --git a/commands.c b/commands.c
index db28ff47f..472796411 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 17c3d17a9..09beab5a1 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);