X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=9ab5231b44bd4cbf4fa4cccb33004c3750f98c4d;hp=3a9dd146a4f2913a95e4b01ffda732d1e240245a;hb=4282401a0bcdc285a228da4ad635cbf7baf71488;hpb=2a06362a155582cd59ae2ef6f0df71694a7eede3

diff --git a/handler.c b/handler.c
index 3a9dd14..9ab5231 100644
--- a/handler.c
+++ b/handler.c
@@ -23,24 +23,25 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
+#include <lib-lib/debug.h>
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "recvattach.h"
 #include "handler.h"
-#include "mutt_curses.h"
 #include "rfc1524.h"
 #include "rfc3676.h"
 #include "keymap.h"
 #include "copy.h"
 #include "charset.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "state.h"
 #include "attach.h"
 #include "lib.h"
 
-#include "lib/debug.h"
 
 typedef int handler_f (BODY *, STATE *);
 typedef handler_f *handler_t;
@@ -771,7 +772,7 @@ static int alternative_handler (BODY * a, STATE * s)
 {
   BODY *choice = NULL;
   BODY *b;
-  LIST *t;
+  string_list_t *t;
   char buf[STRING];
   int type = 0;
   int mustfree = 0;
@@ -968,11 +969,9 @@ int mutt_can_decode (BODY * a)
   else if (a->type == TYPEMULTIPART) {
     BODY *p;
 
-    if (WithCrypto) {
-      if (ascii_strcasecmp (a->subtype, "signed") == 0 ||
-          ascii_strcasecmp (a->subtype, "encrypted") == 0)
-        return (1);
-    }
+    if (ascii_strcasecmp (a->subtype, "signed") == 0 ||
+        ascii_strcasecmp (a->subtype, "encrypted") == 0)
+      return (1);
 
     for (p = a->parts; p; p = p->next) {
       if (mutt_can_decode (p))
@@ -980,10 +979,10 @@ int mutt_can_decode (BODY * a)
     }
 
   }
-  else if (WithCrypto && a->type == TYPEAPPLICATION) {
-    if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (a))
+  else if (a->type == TYPEAPPLICATION) {
+    if (mutt_is_application_pgp(a))
       return (1);
-    if ((WithCrypto & APPLICATION_SMIME) && mutt_is_application_smime (a))
+    if (mutt_is_application_smime (a))
       return (1);
   }
 
@@ -1285,24 +1284,20 @@ void mutt_decode_attachment (BODY * b, STATE * s)
   fseeko (s->fpin, b->offset, 0);
   switch (b->encoding) {
   case ENCQUOTEDPRINTABLE:
-    mutt_decode_quoted (s, b->length, istext ||
-                        ((WithCrypto & APPLICATION_PGP) &&
-                         mutt_is_application_pgp (b)), cd);
+    mutt_decode_quoted(s, b->length,
+                       istext || mutt_is_application_pgp(b), cd);
     break;
   case ENCBASE64:
-    mutt_decode_base64 (s, b->length, istext ||
-                        ((WithCrypto & APPLICATION_PGP) &&
-                         mutt_is_application_pgp (b)), cd);
+    mutt_decode_base64(s, b->length,
+                       istext || mutt_is_application_pgp(b), cd);
     break;
   case ENCUUENCODED:
-    mutt_decode_uuencoded (s, b->length, istext
-                           || ((WithCrypto & APPLICATION_PGP) &&
-                               mutt_is_application_pgp (b)), cd);
+    mutt_decode_uuencoded(s, b->length,
+                          istext || mutt_is_application_pgp(b), cd);
     break;
   default:
-    mutt_decode_xbit (s, b->length, istext
-                      || ((WithCrypto & APPLICATION_PGP) &&
-                          mutt_is_application_pgp (b)), cd);
+    mutt_decode_xbit(s, b->length,
+                     istext || mutt_is_application_pgp(b), cd);
     break;
   }
 
@@ -1341,7 +1336,7 @@ int mutt_body_handler (BODY * b, STATE * s)
       /* avoid copying this part twice since removing the transfer-encoding is
        * the only operation needed.
        */
-      if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
+      if (mutt_is_application_pgp (b))
         handler = crypt_pgp_application_pgp_handler;
       else
         if (ascii_strcasecmp
@@ -1368,7 +1363,7 @@ int mutt_body_handler (BODY * b, STATE * s)
 
     if (ascii_strcasecmp ("alternative", b->subtype) == 0)
       handler = alternative_handler;
-    else if (WithCrypto && ascii_strcasecmp ("signed", b->subtype) == 0) {
+    else if (ascii_strcasecmp ("signed", b->subtype) == 0) {
       p = mutt_get_parameter ("protocol", b->parameter);
 
       if (!p)
@@ -1377,8 +1372,7 @@ int mutt_body_handler (BODY * b, STATE * s)
       else if (s->flags & M_VERIFY)
         handler = mutt_signed_handler;
     }
-    else if ((WithCrypto & APPLICATION_PGP)
-             && m_strcasecmp("encrypted", b->subtype) == 0) {
+    else if (m_strcasecmp("encrypted", b->subtype) == 0) {
       p = mutt_get_parameter ("protocol", b->parameter);
 
       if (!p)
@@ -1392,10 +1386,10 @@ int mutt_body_handler (BODY * b, STATE * s)
     if (!handler)
       handler = multipart_handler;
   }
-  else if (WithCrypto && b->type == TYPEAPPLICATION) {
-    if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
+  else if (b->type == TYPEAPPLICATION) {
+    if (mutt_is_application_pgp (b))
       handler = crypt_pgp_application_pgp_handler;
-    if ((WithCrypto & APPLICATION_SMIME) && mutt_is_application_smime (b))
+    if (mutt_is_application_smime (b))
       handler = crypt_smime_application_smime_handler;
   }