X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Fcrypt.c;h=2ef6c4280f8d4d682fb04362084bdb1bed5178b2;hp=919c3bbd08b6388b0e7d48ab9dc87f8402a579bc;hb=34a7c5a388523a65f55d6d50213bd4b735cfb25b;hpb=230399f9632c37b66c1c117a17e8327eae6b3235

diff --git a/lib-mime/crypt.c b/lib-mime/crypt.c
index 919c3bb..2ef6c42 100644
--- a/lib-mime/crypt.c
+++ b/lib-mime/crypt.c
@@ -85,11 +85,10 @@ int mutt_is_application_pgp (BODY * m)
     int subtype = mime_which_token(m->subtype, -1);
 
     if (m->type == TYPEAPPLICATION) {
-        if (subtype != MIME_PGP || subtype != MIME_X_PGP_MESSAGE) {
+        if (subtype == MIME_PGP || subtype == MIME_X_PGP_MESSAGE) {
             int tok;
 
             tok = mime_which_token(parameter_getval(m->parameter, "x-action"), -1);
-
             if (tok == MIME_SIGN || tok == MIME_SIGNCLEAR)
                 t |= PGPSIGN;
 
@@ -111,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;
 
@@ -138,6 +134,8 @@ int mutt_is_application_pgp (BODY * m)
     return t ? t | PGPINLINE : 0;
 }
 
+#include "mutt.h"
+
 int mutt_is_application_smime (BODY * m)
 {
     char *t = NULL;