X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=a21776e98b4aa137cec3b91d61e096d418df6471;hp=c06f2fd5d88254e7ecdcbab80c93b96e10d61e4d;hb=26a1babec6628dff14e428def9cff4e92a4ef7c8;hpb=f779db722043d8c6767149a9afef8c10159516f5

diff --git a/compose.c b/compose.c
index c06f2fd..a21776e 100644
--- a/compose.c
+++ b/compose.c
@@ -20,6 +20,7 @@
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
 #include "alias.h"
@@ -28,15 +29,11 @@
 #include "recvattach.h"
 #include "sort.h"
 #include "charset.h"
-#include "mx.h"
 #include "buffy.h"
-
-#ifdef MIXMASTER
 #include "remailer.h"
-#endif
 
 #ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
 #endif
 
 static const char *There_are_no_attachments = N_("There are no attachments.");
@@ -53,10 +50,7 @@ enum {
   HDR_SUBJECT,
   HDR_REPLYTO,
   HDR_FCC,
-
-#ifdef MIXMASTER
   HDR_MIX,
-#endif
 
   HDR_CRYPT,
   HDR_CRYPTINFO,
@@ -86,12 +80,10 @@ static const char *Prompts[] = {
   "Bcc: ",
   "Subject: ",
   "Reply-To: ",
-  "Fcc: "
+  "Fcc: ",
 #ifdef USE_NNTP
-#ifdef MIXMASTER
-    , ""
-#endif
-    , "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: "
+    "",
+    "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: "
 #endif
 };
 
@@ -179,9 +171,6 @@ static void redraw_crypt_lines (HEADER * msg)
   }
 }
 
-
-#ifdef MIXMASTER
-
 static void redraw_mix_line (string_list_t * chain)
 {
   int c;
@@ -210,7 +199,6 @@ static void redraw_mix_line (string_list_t * chain)
     c += m_strlen(t) + 2;
   }
 }
-#endif /* MIXMASTER */
 
 static int check_attachments (ATTACHPTR ** idx, short idxlen)
 {
@@ -280,10 +268,7 @@ static void draw_envelope (HEADER * msg, char *fcc)
   mutt_paddstr (W, fcc);
 
   redraw_crypt_lines (msg);
-
-#ifdef MIXMASTER
   redraw_mix_line (msg->chain);
-#endif
 
   SETCOLOR (MT_COLOR_STATUS);
   mvaddstr (HDR_ATTACH - 1, SW, _("-- Attachments"));
@@ -1038,11 +1023,8 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         break;
       }
 
-
-#ifdef MIXMASTER
       if (msg->chain && mix_check_message (msg) != 0)
         break;
-#endif
 
       if (!fccSet && *fcc) {
         if ((i = query_quadoption (OPT_COPY,
@@ -1069,14 +1051,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       idx[menu->current]->content->unlink =
         !idx[menu->current]->content->unlink;
 
-#if 0
-      /* OPTRESOLVE is otherwise ignored on this menu.
-       * Where's the bug?
-       */
-
-      if (option (OPTRESOLVE) && menu->current + 1 < menu->max)
-        menu->current++;
-# endif
       menu->redraw = REDRAW_INDEX;
       /* No send2hook since this doesn't change the message. */
       break;
@@ -1165,7 +1139,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           p_delete(&idx[idxlen]);
           continue;
         }
-        fclose (fp);
+        m_fclose(&fp);
 
         if ((idx[idxlen]->content = mutt_make_file_attach (fname)) == NULL) {
           mutt_error
@@ -1347,15 +1321,10 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break;
 
-
-#ifdef MIXMASTER
     case OP_COMPOSE_MIX:
-
       mix_make_chain (&msg->chain, &menu->redraw);
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break;
-#endif
-
     }
 
     /* Draw formated compose status line */