X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-mime%2Fcrypt.c;h=c17793c5c2788ee3a8c7e4b7901556f82216af36;hb=fc9b0f39b53ad39e08c45d4c036af036f512755e;hp=0755b325978fb4facf8c360cc3d92383a8eea517;hpb=ceffe3e66d8c6690ac460046945f09aee43e6d46;p=apps%2Fmadmutt.git

diff --git a/lib-mime/crypt.c b/lib-mime/crypt.c
index 0755b32..c17793c 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)
 {
@@ -110,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;
 
@@ -196,10 +192,10 @@ int mutt_is_application_smime (BODY * m)
               case 'm': case 'M':
                 /* Not sure if this is the correct thing to do, but 
                    it's required for compatibility with Outlook */
-                return (SMIMESIGN | SMIMEOPAQUE);
+                return SMIMESIGN | SMIMEOPAQUE;
 
               case 's': case 'S':
-                return (SMIMESIGN | SMIMEOPAQUE);
+                return SMIMESIGN | SMIMEOPAQUE;
             }
         }
     }