From: Pierre Habouzit <madcoder@debian.org>
Date: Tue, 28 Nov 2006 18:47:29 +0000 (+0100)
Subject: "gpg-sign" is not a valid token, this was a typo.
X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=055f4c1f45ad240f9095e79d3b6957db3ce29975

"gpg-sign" is not a valid token, this was a typo.
also drop some very old mutt things, just use x-action, the rest will be
re-parsed, too bad.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---

diff --git a/lib-mime/crypt.c b/lib-mime/crypt.c
index 0755b32..2ef6c42 100644
--- a/lib-mime/crypt.c
+++ b/lib-mime/crypt.c
@@ -110,13 +110,10 @@ int mutt_is_application_pgp (BODY * m)
     if (m->type == TYPETEXT && subtype == MIME_PLAIN) {
         const char *p;
 
-        if ((p = parameter_getval(m->parameter, "x-mutt-action"))
-        ||  (p = parameter_getval(m->parameter, "x-action"))
-        ||  (p = parameter_getval(m->parameter, "action")))
-        {
+        if ((p = parameter_getval(m->parameter, "x-action"))) {
             int tok = mime_which_token(p, -1);
             switch (tok) {
-              case MIME_PGP_SIGN:
+              case MIME_PGP_SIGNED:
                 t |= PGPSIGN;
                 break;
 
diff --git a/lib-mime/mime-token.def b/lib-mime/mime-token.def
index e492774..d31607e 100644
--- a/lib-mime/mime-token.def
+++ b/lib-mime/mime-token.def
@@ -56,7 +56,6 @@ organization
 pgp
 pgp-encrypt
 pgp-keys
-pgp-sign
 pgp-signed
 pkcs7-mime
 plain