tmp

[apps/madmutt.git] / lib-mime / crypt.c

diff --git a/lib-mime/crypt.c b/lib-mime/crypt.c
index d0d3235..c17793c 100644 (file)
--- a/lib-mime/crypt.c
+++ b/lib-mime/crypt.c
@@ -30,12 +30,10 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <lib-lib/macros.h>
-#include <lib-lib/str.h>
-
-#include <lib-crypt/crypt.h>
+#include <lib-lib/lib-lib.h>
 
 #include "mime.h"
+#include "crypt.h"
 
 int mutt_is_multipart_signed(BODY * b)
 {
@@ -86,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;
 
@@ -112,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;
 
@@ -139,6 +133,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;
@@ -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;
             }
         }
     }