copyright statements

[apps/madmutt.git] / compose.c

diff --git a/compose.c b/compose.c
index 538d5ad..2e96e7d 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -15,20 +15,29 @@
 # 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-sys/unix.h>
+
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
 
 #include "mutt.h"
-#include "enter.h"
 #include "mutt_idna.h"
-#include "mutt_menu.h"
 #include "rfc1524.h"
 #include "attach.h"
 #include "recvattach.h"
@@ -46,14 +55,6 @@
 #include "nntp.h"
 #endif
 
-
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdlib.h>
-
 static const char *There_are_no_attachments = N_("There are no attachments.");
 
 #define CHECK_COUNT if (idxlen == 0) { mutt_error _(There_are_no_attachments); break; }
@@ -197,7 +198,7 @@ static void redraw_crypt_lines (HEADER * msg)
 
 #ifdef MIXMASTER
 
-static void redraw_mix_line (LIST * chain)
+static void redraw_mix_line (string_list_t * chain)
 {
   int c;
   const char *t;
@@ -317,7 +318,7 @@ static int edit_address_list (int line, address_t ** addr)
   mutt_addrlist_to_local (*addr);
   rfc822_write_address (buf, sizeof (buf), *addr, 0);
   if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0) {
-    address_delete (addr);
+    address_list_wipe(addr);
     *addr = mutt_parse_adrlist (*addr, buf);
     *addr = mutt_expand_aliases (*addr);
   }