X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=aca2845fa64086aec36d5713cd2e62697f8e25f1;hp=58eaaa54395691f7220a8fd0e6085ee74d2d2acb;hb=b98a7ae42f4b22221cf6ba32bf6f29431a07b604;hpb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1

diff --git a/commands.c b/commands.c
index 58eaaa5..aca2845 100644
--- a/commands.c
+++ b/commands.c
@@ -28,16 +28,14 @@
 #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>
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
+#include <imap/imap.h>
 
 #ifdef BUFFY_SIZE
 #include "buffy.h"
@@ -754,7 +752,6 @@ int mutt_save_message (HEADER * h, int delete,
 
   mutt_message (_("Copying to %s..."), buf);
 
-#ifdef USE_IMAP
   if (Context->magic == M_IMAP && !(decode || decrypt) && mx_get_magic (buf) == M_IMAP) {
     switch (imap_copy_messages (Context, h, buf, delete)) {
       /* success */
@@ -769,7 +766,6 @@ int mutt_save_message (HEADER * h, int delete,
       return -1;
     }
   }
-#endif
 
   if (mx_open_mailbox (buf, M_APPEND, &ctx) != NULL) {
     if (h) {
@@ -858,7 +854,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);
@@ -895,14 +891,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) {