X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=3ea036316ea83215d6d2dc93865877f626dd223b;hp=0ecc70b5eb0e9dfb86aba2ecc111cf6a0ad026d2;hb=13ce824381b10ea5a66d6ec6177863e4a5e73639;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/recvcmd.c b/recvcmd.c
index 0ecc70b..3ea0363 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -157,7 +157,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
   if (mutt_addrlist_to_idna (adr, &err) < 0) {
     mutt_error (_("Bad IDN: '%s'"), err);
     p_delete(&err);
-    rfc822_free_address (&adr);
+    address_delete (&adr);
     return;
   }
 
@@ -182,7 +182,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
   }
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
-    rfc822_free_address (&adr);
+    address_delete (&adr);
     CLEARLINE (LINES - 1);
     mutt_message (p ? _("Message not bounced.") : _("Messages not bounced."));
     return;
@@ -388,8 +388,8 @@ static void attach_forward_bodies (FILE * fp, HEADER * hdr,
     parent = hdr;
 
 
-  tmphdr = mutt_new_header ();
-  tmphdr->env = mutt_new_envelope ();
+  tmphdr = header_new();
+  tmphdr->env = envelope_new();
   mutt_make_forward_subject (tmphdr->env, Context, parent);
 
   mutt_mktemp (tmpbody);
@@ -507,7 +507,7 @@ bail:
     mutt_unlink (tmpbody);
   }
 
-  mutt_free_header (&tmphdr);
+  header_delete(&tmphdr);
 }
 
 
@@ -548,8 +548,8 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr,
       }
   }
 
-  tmphdr = mutt_new_header ();
-  tmphdr->env = mutt_new_envelope ();
+  tmphdr = header_new();
+  tmphdr->env = envelope_new();
   mutt_make_forward_subject (tmphdr->env, Context, curhdr);
 
 
@@ -563,7 +563,7 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr,
     mutt_mktemp (tmpbody);
     if (!(tmpfp = safe_fopen (tmpbody, "w"))) {
       mutt_error (_("Can't create %s."), tmpbody);
-      mutt_free_header (&tmphdr);
+      header_delete(&tmphdr);
       return;
     }
 
@@ -615,7 +615,7 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr,
     }
   }
   else
-    mutt_free_header (&tmphdr);
+    header_delete(&tmphdr);
 
   ci_send_message (flags, tmphdr, *tmpbody ? tmpbody : NULL, NULL, curhdr);
 
@@ -800,21 +800,21 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
   else if (nattach == 1)
     mime_reply_any = 1;
 
-  tmphdr = mutt_new_header ();
-  tmphdr->env = mutt_new_envelope ();
+  tmphdr = header_new();
+  tmphdr->env = envelope_new();
 
   if (attach_reply_envelope_defaults (tmphdr->env, idx, idxlen,
                                       parent ? parent : (cur ? cur->
                                                          hdr : NULL),
                                       flags) == -1) {
-    mutt_free_header (&tmphdr);
+    header_delete(&tmphdr);
     return;
   }
 
   mutt_mktemp (tmpbody);
   if ((tmpfp = safe_fopen (tmpbody, "w")) == NULL) {
     mutt_error (_("Can't create %s."), tmpbody);
-    mutt_free_header (&tmphdr);
+    header_delete(&tmphdr);
     return;
   }
 
@@ -872,7 +872,7 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
     if (mime_reply_any && !cur &&
         copy_problematic_attachments (fp, &tmphdr->content, idx, idxlen,
                                       0) == NULL) {
-      mutt_free_header (&tmphdr);
+      header_delete(&tmphdr);
       fclose (tmpfp);
       return;
     }