X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=recvattach.c;h=b9237f80b115c8d185e7af4d82b01a43eeb74220;hb=7480539010bab6905c944b11b036492a1a625994;hp=53383bded0731df57847ae05bc4f3d6ff80e59bb;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b;p=apps%2Fmadmutt.git

diff --git a/recvattach.c b/recvattach.c
index 53383bd..b9237f8 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -17,7 +17,6 @@
 #include "mutt_menu.h"
 #include "rfc1524.h"
 #include "mime.h"
-#include "mailbox.h"
 #include "attach.h"
 #include "mapping.h"
 #include "mx.h"
@@ -96,7 +95,7 @@ void mutt_update_tree (ATTACHPTR ** idx, short idxlen)
     }
 
     if (idx[x]->tree) {
-      if (safe_strcmp (idx[x]->tree, buf) != 0)
+      if (mutt_strcmp (idx[x]->tree, buf) != 0)
         str_replace (&idx[x]->tree, buf);
     }
     else
@@ -887,7 +886,7 @@ void mutt_view_attachments (HEADER * hdr)
 
   char helpstr[SHORT_STRING];
   MUTTMENU *menu;
-  BODY *cur;
+  BODY *cur = NULL;
   MESSAGE *msg;
   FILE *fp;
   ATTACHPTR **idx = NULL;
@@ -1078,7 +1077,7 @@ void mutt_view_attachments (HEADER * hdr)
       }
 #endif
 
-      if (WithCrypto && hdr->security) {
+      if (WithCrypto && (hdr->security & (~PGP_TRADITIONAL_CHECKED))) {
         mutt_message
           _
           ("Deletion of attachments from encrypted messages is unsupported.");