X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=d3ee54111d3fd82bb25102884225ca1b9c11918d;hp=a9f329890a96dcbb3f82d9b5f1016f6c66a7fd92;hb=dbb9a1e16d03a2d4664d6dc6a30c721b889d4982;hpb=b8c71f93b0296f815a6538182343ba67e88c0012

diff --git a/commands.c b/commands.c
index a9f3298..d3ee541 100644
--- a/commands.c
+++ b/commands.c
@@ -19,16 +19,17 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "recvattach.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "sort.h"
 #include "copy.h"
 #include "mx.h"
 #include "pager.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 #include "rfc1524.h"
 #include <sys/types.h>
@@ -854,7 +855,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
     return;
 
   /* clean up previous junk */
-  mutt_free_parameter (&b->parameter);
+  parameter_delete(&b->parameter);
   p_delete(&b->subtype);
 
   mutt_parse_content_type (buf, b);
@@ -891,14 +892,14 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
 
   b->force_charset |= charset_changed ? 1 : 0;
 
-  if (!is_multipart (b) && b->parts)
+  if (!is_multipart(b) && b->parts)
     mutt_free_body (&b->parts);
   if (!mutt_is_message_type (b->type, b->subtype) && b->hdr) {
     b->hdr->content = NULL;
-    mutt_free_header (&b->hdr);
+    header_delete(&b->hdr);
   }
 
-  if (fp && (is_multipart (b) || mutt_is_message_type (b->type, b->subtype)))
+  if (fp && (is_multipart(b) || mutt_is_message_type(b->type, b->subtype)))
     mutt_parse_part (fp, b);
 
   if (h) {