X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Fcrypt.c;h=c17793c5c2788ee3a8c7e4b7901556f82216af36;hp=2ef6c4280f8d4d682fb04362084bdb1bed5178b2;hb=9a5f2da8f1779dc7cbb550c0b54ed9eb82b4d594;hpb=055f4c1f45ad240f9095e79d3b6957db3ce29975

diff --git a/lib-mime/crypt.c b/lib-mime/crypt.c
index 2ef6c42..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)
 {
@@ -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;
             }
         }
     }