X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=3f6a9ac4d7f248835c5061cd28e0189019e64c13;hp=5f588b707109065661736b7d6425c2290247a765;hb=a8808601c98c76ec8344c8e4ba5a607d72c2805e;hpb=83532821ae9fab034d0d630b78330c9ea4ff4cf3

diff --git a/attach.c b/attach.c
index 5f588b7..3f6a9ac 100644
--- a/attach.c
+++ b/attach.c
@@ -30,7 +30,7 @@
 #include "pager.h"
 #include "copy.h"
 #include "mx.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 
 #include "lib/debug.h"
 
@@ -322,9 +322,11 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
          ascii_strncasecmp (type, t->data, i) == 0) ||
         ascii_strcasecmp (type, t->data) == 0) {
 
-      BODY tmp = { 0 };
+      BODY tmp;
       int n;
 
+      p_clear(&tmp, 1);
+
       if ((n = mutt_lookup_mime_type (&tmp, b->filename)) != TYPEOTHER) {
         snprintf (type, len, "%s/%s",
                   n == TYPEAUDIO ? "audio" :
@@ -397,7 +399,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
   int unlink_tempfile = 0;
 
   is_message = mutt_is_message_type (a->type, a->subtype);
-  if (WithCrypto && is_message && a->hdr && (a->hdr->security & ENCRYPT) &&
+  if (is_message && a->hdr && (a->hdr->security & ENCRYPT) &&
       !crypt_valid_passphrase (a->hdr->security))
     return (rc);
   use_mailcap = (flag == M_MAILCAP ||