X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=174d8e106d8d04d7efba2334301d7e1329e00673;hp=548e0d10cccd0d2491f82f095b0b8b3adc2157a7;hb=c8c9a616c8c369da6aa06e656eacfb82af8707a8;hpb=2a2f2f9a5bad73c883b7f9c9b4166d932b6aaf37

diff --git a/postpone.c b/postpone.c
index 548e0d1..174d8e1 100644
--- a/postpone.c
+++ b/postpone.c
@@ -537,13 +537,13 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
     err:
       mx_close_message (&msg);
       envelope_delete(&newhdr->env);
-      mutt_free_body (&newhdr->content);
+      body_list_wipe(&newhdr->content);
       mutt_error _("Decryption failed.");
 
       return -1;
     }
 
-    mutt_free_body (&newhdr->content);
+    body_list_wipe(&newhdr->content);
     newhdr->content = b;
 
     mutt_clear_error ();
@@ -563,7 +563,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
       newhdr->security |= APPLICATION_SMIME;
 
     /* destroy the signature */
-    mutt_free_body (&newhdr->content->parts->next);
+    body_list_wipe(&newhdr->content->parts->next);
     newhdr->content = mutt_remove_multipart (newhdr->content);
   }
 
@@ -613,7 +613,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
         b->noconv = 0;
       }
 
-      mutt_delete_parameter ("x-mutt-noconv", &b->parameter);
+      parameter_delval(&b->parameter, "x-mutt-noconv");
     }
 
     mutt_adv_mktemp (NULL, file, sizeof (file));
@@ -629,7 +629,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
 
       b->type = TYPETEXT;
       m_strreplace(&b->subtype, "plain");
-      mutt_delete_parameter ("x-action", &b->parameter);
+      parameter_delval(&b->parameter, "x-action");
     }
     else
       mutt_decode_attachment (b, &s);
@@ -642,7 +642,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
 
     mutt_stamp_attachment (b);
 
-    mutt_free_body (&b->parts);
+    body_list_wipe(&b->parts);
     if (b->hdr)
       b->hdr->content = NULL;   /* avoid dangling pointer */
   }
@@ -674,7 +674,7 @@ bail:
 
   if (rv == -1) {
     envelope_delete(&newhdr->env);
-    mutt_free_body (&newhdr->content);
+    body_list_wipe(&newhdr->content);
   }
 
   return rv;