X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=4e37015f833fa65fd9a512a31d8dace836d6b61e;hp=6d0a4ea0b2b6e85195d74b59f4cadb45a6c1c393;hb=74697a5c38af6a85ce3b0062d781c35814a9f536;hpb=65734c98c7ff56a0258bc9052667a0cb9c2f1d0b

diff --git a/recvcmd.c b/recvcmd.c
index 6d0a4ea..4e37015 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -7,26 +7,19 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#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-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 "alias.h"
 #include "state.h"
 #include "handler.h"
 #include "recvattach.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
-#include "rfc1524.h"
 #include "attach.h"
 #include "mx.h"
 #include "copy.h"
@@ -114,9 +107,7 @@ static short count_tagged_children (ATTACHPTR ** idx, short idxlen, short i)
 
 
 /**
- **
  ** The bounce function, from the attachment menu
- **
  **/
 
 void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
@@ -125,7 +116,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
   short i;
   char prompt[STRING];
   char buf[HUGE_STRING];
-  const char *err = NULL;
+  char *err = NULL;
   address_t *adr = NULL;
   int ret = 0;
   int p = 0;
@@ -157,7 +148,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
   if (mutt_addrlist_to_idna (adr, &err) < 0) {
     mutt_error (_("Bad IDN: '%s'"), err);
     p_delete(&err);
-    address_delete (&adr);
+    address_list_wipe(&adr);
     return;
   }
 
@@ -182,7 +173,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
   }
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
-    address_delete (&adr);
+    address_list_wipe(&adr);
     CLEARLINE (LINES - 1);
     mutt_message (p ? _("Message not bounced.") : _("Messages not bounced."));
     return;
@@ -210,10 +201,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
 
 
 /**
- **
  ** resend-message, from the attachment menu 
- **
- **
  **/
 
 void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTACHPTR ** idx,
@@ -235,9 +223,7 @@ void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTAC
 
 
 /**
- **
  ** forward-message, from the attachment menu 
- **
  **/
 
 /* try to find a common parent message for the tagged attachments. */
@@ -639,10 +625,7 @@ void mutt_attach_forward (FILE * fp, HEADER * hdr,
 
 
 /**
- ** 
  ** the various reply functions, from the attachment menu
- **
- **
  **/
 
 /* Create the envelope defaults for a reply.
@@ -722,7 +705,7 @@ attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
   if (parent)
     mutt_add_to_reference_headers (env, curenv, NULL, NULL);
   else {
-    LIST **p = NULL, **q = NULL;
+    string_list_t **p = NULL, **q = NULL;
 
     for (i = 0; i < idxlen; i++) {
       if (idx[i]->content->tagged)