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

[apps/madmutt.git] / editmsg.c

diff --git a/editmsg.c b/editmsg.c
index c66f5ee..09f358f 100644 (file)
--- a/editmsg.c
+++ b/editmsg.c
@@ -10,7 +10,7 @@
 /* simple, editor-based message editing */
 
 #include <lib-lib/lib-lib.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-mx/mx.h>
 
 #include "mutt.h"
@@ -61,8 +61,7 @@ static int edit_one_message (CONTEXT * ctx, HEADER * cur)
   }
 
   rc = mutt_append_message (&tmpctx, ctx, cur, 0, CH_NOLEN |
-                            ((ctx->magic == M_MBOX
-                              || ctx->magic == M_MMDF) ? 0 : CH_NOSTATUS));
+                            (ctx->magic == M_MBOX ? 0 : CH_NOSTATUS));
   oerrno = errno;
 
   mx_close_mailbox (&tmpctx, NULL);
@@ -124,14 +123,14 @@ static int edit_one_message (CONTEXT * ctx, HEADER * cur)
   }
 
   of = 0;
-  cf = ((tmpctx.magic == M_MBOX || tmpctx.magic == M_MMDF) ? 0 : CH_NOSTATUS);
+  cf = (tmpctx.magic == M_MBOX ? 0 : CH_NOSTATUS);
 
   if (fgets (buff, sizeof (buff), fp) && is_from (buff, NULL, 0, NULL)) {
-    if (tmpctx.magic == M_MBOX || tmpctx.magic == M_MMDF)
+    if (tmpctx.magic == M_MBOX)
       cf = CH_FROM | CH_FORCE_FROM;
-  }
-  else
+  } else {
     of = M_ADD_FROM;
+  }
 
   /* 
    * XXX - we have to play games with the message flags to avoid