Revert "we use glibc, and gconv. Don't need our own transcoding stuff, glibc does"

[apps/madmutt.git] / copy.c

diff --git a/copy.c b/copy.c
index f865d8a..a52a4eb 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -10,7 +10,7 @@
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-mx/mx.h>
 
 #include "mutt.h"
@@ -361,7 +361,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);
-    charset_canonicalize(chsbuf, sizeof (chsbuf), MCharset.charset);
+    charset_canonicalize(chsbuf, sizeof (chsbuf), mod_cset.charset);
     rfc822_strcpy(buffer, sizeof(buffer), chsbuf, MimeSpecials);
     fputs (buffer, out);
     fputc ('\n', out);
@@ -720,7 +720,7 @@ _mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src __attribute__ (
     return (-1);
   if ((msg = mx_open_new_message (dest, hdr, is_from (buf, NULL, 0, NULL) ? 0 : M_ADD_FROM)) == NULL)
     return (-1);
-  if (dest->magic == M_MBOX || dest->magic == M_MMDF)
+  if (dest->magic == M_MBOX)
     chflags |= CH_FROM | CH_FORCE_FROM;
   chflags |= (dest->magic == M_MAILDIR ? CH_NOSTATUS : CH_UPDATE);
   r = _mutt_copy_message (msg->fp, fpin, hdr, body, flags, chflags);