well this makes things fail for people ...

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

diff --git a/lib-mime/crypt.c b/lib-mime/crypt.c
index 2ef6c42..c17793c 100644 (file)
--- 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)
 {
@@ -117,7 +116,7 @@ int mutt_is_application_pgp (BODY * m)
                 t |= PGPSIGN;
                 break;
 
-              case MIME_PGP_ENCRYPT:
+              case MIME_PGP_ENCRYPTED:
                 t |= PGPENCRYPT;
                 break;
 
@@ -193,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;
             }
         }
     }