X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=ccbf3086d2ba5884b354b4e5daca31d5b8c488f0;hp=d658ffc96cd02618509779ca773ff6e24c55c543;hb=0dbe922d4298aed78dcba64b7c770f315a64505e;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23

diff --git a/copy.c b/copy.c
index d658ffc..ccbf308 100644
--- a/copy.c
+++ b/copy.c
@@ -346,7 +346,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
     fputs ("MIME-Version: 1.0\n", out);
     fputs ("Content-Transfer-Encoding: 8bit\n", out);
     fputs ("Content-Type: text/plain; charset=", out);
-    mutt_canonical_charset (chsbuf, sizeof (chsbuf),
+    charset_canonicalize (chsbuf, sizeof (chsbuf),
                             Charset ? Charset : "us-ascii");
     rfc822_strcpy(buffer, sizeof(buffer), chsbuf, MimeSpecials);
     fputs (buffer, out);
@@ -571,7 +571,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
           Context->vsize -= body->length - new_length;
 
         body->length = new_length;
-        mutt_free_body (&body->parts);
+        body_list_wipe(&body->parts);
       }
 
       return 0;
@@ -630,10 +630,10 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
     fseeko (fp, cur->offset, 0);
     if (mutt_copy_bytes (fp, fpout, cur->length) == -1) {
       fclose (fp);
-      mutt_free_body (&cur);
+      body_list_wipe(&cur);
       return (-1);
     }
-    mutt_free_body (&cur);
+    body_list_wipe(&cur);
     fclose (fp);
   }
   else {
@@ -658,7 +658,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
   if ((flags & M_CM_UPDATE) && (flags & M_CM_NOHEADER) == 0
       && new_offset != -1) {
     body->offset = new_offset;
-    mutt_free_body (&body->parts);
+    body_list_wipe(&body->parts);
   }
 
   return rc;