X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=a21776e98b4aa137cec3b91d61e096d418df6471;hp=de3e38b960d886c077c9aef0465d197d237c44e2;hb=6c9a7df6f0a909d987634888cbb7ccd9b17ecc09;hpb=0dbe922d4298aed78dcba64b7c770f315a64505e

diff --git a/compose.c b/compose.c
index de3e38b..a21776e 100644
--- a/compose.c
+++ b/compose.c
@@ -11,22 +11,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-sys/unix.h>
 
@@ -35,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"
@@ -43,16 +29,11 @@
 #include "recvattach.h"
 #include "sort.h"
 #include "charset.h"
-#include "mx.h"
 #include "buffy.h"
-#include "compose.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.");
@@ -69,10 +50,7 @@ enum {
   HDR_SUBJECT,
   HDR_REPLYTO,
   HDR_FCC,
-
-#ifdef MIXMASTER
   HDR_MIX,
-#endif
 
   HDR_CRYPT,
   HDR_CRYPTINFO,
@@ -102,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
 };
 
@@ -195,9 +171,6 @@ static void redraw_crypt_lines (HEADER * msg)
   }
 }
 
-
-#ifdef MIXMASTER
-
 static void redraw_mix_line (string_list_t * chain)
 {
   int c;
@@ -226,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)
 {
@@ -296,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"));
@@ -313,7 +282,7 @@ static void draw_envelope (HEADER * msg, char *fcc)
 static int edit_address_list (int line, address_t ** addr)
 {
   char buf[HUGE_STRING] = "";   /* needs to be large for alias expansion */
-  const char *err = NULL;
+  char *err = NULL;
 
   mutt_addrlist_to_local (*addr);
   rfc822_write_address (buf, sizeof (buf), *addr, 0);
@@ -442,6 +411,9 @@ static unsigned long cum_attachs_size (MUTTMENU * menu)
  * help when modifying this function.
  */
 
+static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
+                                 const char *p);
+
 static const char *compose_format_str (char *buf, ssize_t buflen, char op,
                                        const char *src, const char *prefix,
                                        const char *ifstring,
@@ -701,7 +673,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       if ((op == OP_COMPOSE_EDIT_HEADERS ||
            (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
         const char *tag = NULL;
-        const char *err = NULL;
+        char *err = NULL;
 
         mutt_env_to_local (msg->env);
         mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,
@@ -1051,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,
@@ -1082,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;
@@ -1178,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
@@ -1360,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 */