X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=4a08b97f0c08cfd1fbbd62e95eecfc2e79d98231;hp=4f57af201287ab66efbc820c6353041fd3eba3c2;hb=fc854762626c5e2dce8c5618860a882934ec81d2;hpb=8476307969a605bea67f6b702b0c1e7a52038bed

diff --git a/postpone.c b/postpone.c
index 4f57af2..4a08b97 100644
--- a/postpone.c
+++ b/postpone.c
@@ -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;
@@ -593,22 +589,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(Tempdir), file);
+    if (!s.fpout)
       goto bail;
 
-
     if (mutt_is_application_pgp (b) & (ENCRYPT | SIGN)) {
 
       mutt_body_handler (b, &s);
@@ -622,7 +614,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 +648,7 @@ bail:
 
   /* that's it. */
   if (bfp != fp)
-    fclose (bfp);
+    m_fclose(&bfp);
   if (msg)
     mx_close_message (&msg);