X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvattach.c;h=1c2d85b8e2a28afacdc5de6ead3cf5228e2c8e65;hp=ef8fc1872f5e7b8998e484764a1c7ed7240bef41;hb=c855a6e8e9522ac9add840b18a869c831030f569;hpb=82589516e2473b5451218d7b00a9dfbc3e18f3ca;ds=sidebyside

diff --git a/recvattach.c b/recvattach.c
index ef8fc18..1c2d85b 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -17,9 +17,9 @@
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
 #include <lib-mx/mx.h>
-#include <lib-crypt/crypt.h>
 
 #include "mutt.h"
+#include "crypt.h"
 #include "handler.h"
 #include "recvattach.h"
 #include "attach.h"
@@ -333,7 +333,7 @@ int mutt_tag_attach (MUTTMENU * menu, int n, int m)
 static int mutt_query_save_attachment (FILE * fp, BODY * body, HEADER * hdr,
                                        char **directory)
 {
-  char *prompt;
+  const char *prompt;
   char buf[_POSIX_PATH_MAX], tfile[_POSIX_PATH_MAX];
   int is_message;
   int append = 0;
@@ -826,9 +826,6 @@ void mutt_view_attachments (HEADER * hdr)
     need_secured = 1;
 
     if (hdr->security & APPLICATION_SMIME) {
-      if (hdr->env)
-        crypt_smime_getkeys (hdr->env);
-
       if (mutt_is_application_smime (hdr->content)) {
         secured = !crypt_smime_decrypt_mime (msg->fp, &fp,
                                              hdr->content, &cur);
@@ -1152,5 +1149,7 @@ void mutt_view_attachments (HEADER * hdr)
 
     op = OP_NULL;
   }
+#undef CHECK_READONLY
+#undef CHECK_ATTACH
   /* not reached */
 }