X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=79f42d06ebdc74ac4abebe974a9f2cd542c79a77;hp=39af5fa11df2b346bf0882de8c33b514249cd4d9;hb=fdb93a08e305b8755260144807e4d45106a9cb9f;hpb=ecfcc6df70230ba136c2fb3843700ecb749c41b7

diff --git a/recvcmd.c b/recvcmd.c
index 39af5fa..79f42d0 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -21,13 +21,13 @@
 
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
 
 #include "mutt.h"
+#include "alias.h"
 #include "state.h"
 #include "handler.h"
 #include "recvattach.h"
-#include "mutt_menu.h"
-#include "rfc1524.h"
 #include "attach.h"
 #include "mx.h"
 #include "copy.h"
@@ -158,7 +158,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;
   }
 
@@ -183,7 +183,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;
@@ -723,7 +723,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)