X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Fcrypt.c;h=af64a2c87406facdd05041bdfea518e854c8a89c;hp=16cbebd027efefea3854bfcb97376ef80fe0d1de;hb=819c071fa7efc8dffb4dd92f36f0111227ff692f;hpb=a0aa4a45870f1607e8b41760866071692675c84d

diff --git a/lib-mime/crypt.c b/lib-mime/crypt.c
index 16cbebd..af64a2c 100644
--- a/lib-mime/crypt.c
+++ b/lib-mime/crypt.c
@@ -32,9 +32,8 @@
 
 #include <lib-lib/lib-lib.h>
 
-#include <lib-crypt/crypt.h>
-
 #include "mime.h"
+#include "crypt.h"
 
 int mutt_is_multipart_signed(BODY * b)
 {
@@ -85,11 +84,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,17 +109,14 @@ 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;
 
-              case MIME_PGP_ENCRYPT:
+              case MIME_PGP_ENCRYPTED:
                 t |= PGPENCRYPT;
                 break;