X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvattach.c;h=82aa139eca1954235eb116c6da1423d189d82462;hp=b9db799f523531d45a2020469f25d69324ffa9fe;hb=6a7c1f87b97c733b63c177d41a5aca3427e9521a;hpb=3b7a8f7577e7b40d39ba510f54bde0d3ec0cc58f

diff --git a/recvattach.c b/recvattach.c
index b9db799..82aa139 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"
@@ -186,8 +186,7 @@ mutt_attach_fmt(char *dest, ssize_t destlen, char op, const char *src,
         char s[STRING];
 
         _mutt_make_string (s, sizeof (s), MsgFmt, NULL, aptr->content->hdr,
-                           M_FORMAT_FORCESUBJ | M_FORMAT_MAKEPRINT |
-                           (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0));
+                           M_FORMAT_FORCESUBJ | M_FORMAT_MAKEPRINT);
         if (*s) {
           mutt_format_s (dest, destlen, prefix, s);
           break;
@@ -317,8 +316,7 @@ mutt_attach_fmt(char *dest, ssize_t destlen, char op, const char *src,
 static void attach_entry(char *b, ssize_t blen, MUTTMENU * menu, int num)
 {
     m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt,
-                ((ATTACHPTR **) menu->data)[num],
-                option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+                ((ATTACHPTR **) menu->data)[num], 0);
 }
 
 int mutt_tag_attach (MUTTMENU * menu, int n, int m)
@@ -333,7 +331,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;
@@ -500,7 +498,7 @@ mutt_query_pipe_attachment(char *command, FILE * fp, BODY * body, int afilter)
       CLEARLINE (LINES - 1);
       return;
     }
-    tempfd = m_tempfd(tfile, sizeof(tfile), NONULL(Tempdir), NULL);
+    tempfd = m_tempfd(tfile, sizeof(tfile), NONULL(mod_core.tmpdir), NULL);
   }
 
   if (mutt_pipe_attachment(fp, body, command, tempfd)) {
@@ -634,7 +632,7 @@ static void print_attachment_list (FILE * fp, int tag, BODY * top,
           FILE *ifp;
           int newfile_fd;
 
-          newfile_fd = m_tempfd(newfile, sizeof(newfile), NONULL(Tempdir), NULL);
+          newfile_fd = m_tempfd(newfile, sizeof(newfile), NONULL(mod_core.tmpdir), NULL);
           if (mutt_decode_save_attachment (fp, top, newfile_fd, M_PRINTING) == 0) {
             if ((ifp = fopen (newfile, "r")) != NULL) {
               mutt_copy_stream (ifp, state->fpout);
@@ -825,14 +823,7 @@ void mutt_view_attachments (HEADER * hdr)
   {
     need_secured = 1;
 
-    if ((hdr->security & ENCRYPT) && !crypt_valid_passphrase (hdr->security)) {
-      mx_close_message (&msg);
-      return;
-    }
     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);
@@ -935,10 +926,6 @@ void mutt_view_attachments (HEADER * hdr)
       mutt_update_attach_index (cur, &idx, &idxlen, &idxmax, menu);
       break;
 
-    case OP_FORGET_PASSPHRASE:
-      crypt_forget_passphrase ();
-      break;
-
     case OP_EXTRACT_KEYS:
       crypt_pgp_extract_keys_from_attachment_list (fp, menu->tagprefix,
                                                    menu->
@@ -1160,5 +1147,7 @@ void mutt_view_attachments (HEADER * hdr)
 
     op = OP_NULL;
   }
+#undef CHECK_READONLY
+#undef CHECK_ATTACH
   /* not reached */
 }