X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=7f5aff132df967aa5bb73af4925635650ae78dc3;hp=7198d53528d76c870f19c97b718579d74ed60aa5;hb=7dea2ed3be5f5aaa2975647e69a414925ccb3cb8;hpb=ac1ea3143e61def7fc9000bee6d0d59d56c5b997

diff --git a/postpone.c b/postpone.c
index 7198d53..7f5aff1 100644
--- a/postpone.c
+++ b/postpone.c
@@ -15,6 +15,7 @@
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
 #include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
 
 #include <lib-sys/unix.h>
 
@@ -22,7 +23,6 @@
 #include "handler.h"
 #include "sort.h"
 #include "thread.h"
-#include "mx.h"
 #include <lib-crypt/crypt.h>
 
 #include <imap/imap.h>
@@ -135,14 +135,14 @@ static void post_entry (char *s, ssize_t slen, MUTTMENU * menu, int entry)
   CONTEXT *ctx = (CONTEXT *) menu->data;
 
   _mutt_make_string (s, slen, NONULL (HdrFmt), ctx, ctx->hdrs[entry],
-                     M_FORMAT_ARROWCURSOR);
+                     option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }
 
 static HEADER *select_msg (void)
 {
   MUTTMENU *menu;
   int i, done = 0, r = -1;
-  char helpstr[SHORT_STRING];
+  char helpstr[STRING];
   short orig_sort;
 
   menu = mutt_new_menu ();
@@ -343,8 +343,6 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       string_list_wipe(&tmp);
       tmp = next;
     }
-
-#ifdef MIXMASTER
     else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
       char *t;
 
@@ -365,8 +363,6 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       string_list_wipe(&tmp);
       tmp = next;
     }
-#endif
-
     else {
       last = tmp;
       tmp = tmp->next;
@@ -512,9 +508,6 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
   {
     int ccap = (APPLICATION_PGP | APPLICATION_SMIME) & hdr->security;
     newhdr->security |= ENCRYPT | ccap;
-    if (!crypt_valid_passphrase (ccap))
-      goto err;
-
     mutt_message _("Decrypting message...");
 
     if (((ccap & APPLICATION_PGP)
@@ -593,22 +586,18 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
     s.flags = 0;
 
     if (b->type == TYPETEXT) {
-      if (!ascii_strcasecmp
-          ("yes", parameter_getval(b->parameter, "x-mutt-noconv")))
-        b->noconv = 1;
-      else {
+      b->noconv = !ascii_strcasecmp("yes", parameter_getval(b->parameter,
+                                                            "x-mutt-noconv"));
+      if (b->noconv)
         s.flags |= M_CHARCONV;
-        b->noconv = 0;
-      }
 
       parameter_delval(&b->parameter, "x-mutt-noconv");
     }
 
-    mutt_adv_mktemp (NULL, file, sizeof (file));
-    if ((s.fpout = safe_fopen (file, "w")) == NULL)
+    s.fpout = m_tempfile(file, sizeof(file), NONULL(MCore.tmpdir), file);
+    if (!s.fpout)
       goto bail;
 
-
     if (mutt_is_application_pgp (b) & (ENCRYPT | SIGN)) {
 
       mutt_body_handler (b, &s);
@@ -622,7 +611,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
     else
       mutt_decode_attachment (b, &s);
 
-    if (safe_fclose (&s.fpout) != 0)
+    if (m_fclose(&s.fpout) != 0)
       goto bail;
 
     m_strreplace(&b->filename, file);
@@ -656,7 +645,7 @@ bail:
 
   /* that's it. */
   if (bfp != fp)
-    fclose (bfp);
+    m_fclose(&bfp);
   if (msg)
     mx_close_message (&msg);