X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=4e37015f833fa65fd9a512a31d8dace836d6b61e;hp=0ecc70b5eb0e9dfb86aba2ecc111cf6a0ad026d2;hb=f65ae399906906f734398432691dbacf2c7bda9f;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/recvcmd.c b/recvcmd.c
index 0ecc70b..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,12 +107,10 @@ 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,
+void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
                          ATTACHPTR ** idx, short idxlen, BODY * cur)
 {
   short i;
@@ -157,7 +148,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
   if (mutt_addrlist_to_idna (adr, &err) < 0) {
     mutt_error (_("Bad IDN: '%s'"), err);
     p_delete(&err);
-    rfc822_free_address (&adr);
+    address_list_wipe(&adr);
     return;
   }
 
@@ -182,7 +173,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
   }
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
-    rfc822_free_address (&adr);
+    address_list_wipe(&adr);
     CLEARLINE (LINES - 1);
     mutt_message (p ? _("Message not bounced.") : _("Messages not bounced."));
     return;
@@ -210,13 +201,10 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
 
 
 /**
- **
  ** resend-message, from the attachment menu 
- **
- **
  **/
 
-void mutt_attach_resend (FILE * fp, HEADER * hdr, ATTACHPTR ** idx,
+void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTACHPTR ** idx,
                          short idxlen, BODY * cur)
 {
   short i;
@@ -235,9 +223,7 @@ void mutt_attach_resend (FILE * fp, HEADER * hdr, ATTACHPTR ** idx,
 
 
 /**
- **
  ** forward-message, from the attachment menu 
- **
  **/
 
 /* try to find a common parent message for the tagged attachments. */
@@ -388,8 +374,8 @@ static void attach_forward_bodies (FILE * fp, HEADER * hdr,
     parent = hdr;
 
 
-  tmphdr = mutt_new_header ();
-  tmphdr->env = mutt_new_envelope ();
+  tmphdr = header_new();
+  tmphdr->env = envelope_new();
   mutt_make_forward_subject (tmphdr->env, Context, parent);
 
   mutt_mktemp (tmpbody);
@@ -507,7 +493,7 @@ bail:
     mutt_unlink (tmpbody);
   }
 
-  mutt_free_header (&tmphdr);
+  header_delete(&tmphdr);
 }
 
 
@@ -522,7 +508,7 @@ bail:
  * the attachment index. 
  */
 
-static void attach_forward_msgs (FILE * fp, HEADER * hdr,
+static void attach_forward_msgs (FILE * fp, HEADER * hdr __attribute__ ((unused)),
                                  ATTACHPTR ** idx, short idxlen, BODY * cur,
                                  int flags)
 {
@@ -548,8 +534,8 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr,
       }
   }
 
-  tmphdr = mutt_new_header ();
-  tmphdr->env = mutt_new_envelope ();
+  tmphdr = header_new();
+  tmphdr->env = envelope_new();
   mutt_make_forward_subject (tmphdr->env, Context, curhdr);
 
 
@@ -563,7 +549,7 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr,
     mutt_mktemp (tmpbody);
     if (!(tmpfp = safe_fopen (tmpbody, "w"))) {
       mutt_error (_("Can't create %s."), tmpbody);
-      mutt_free_header (&tmphdr);
+      header_delete(&tmphdr);
       return;
     }
 
@@ -615,7 +601,7 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr,
     }
   }
   else
-    mutt_free_header (&tmphdr);
+    header_delete(&tmphdr);
 
   ci_send_message (flags, tmphdr, *tmpbody ? tmpbody : NULL, NULL, curhdr);
 
@@ -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)
@@ -738,7 +721,7 @@ attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
 /*  This is _very_ similar to send.c's include_reply(). */
 
 static void attach_include_reply (FILE * fp, FILE * tmpfp, HEADER * cur,
-                                  int flags)
+                                  int flags __attribute__ ((unused)))
 {
   int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV;
   int chflags = CH_DECODE;
@@ -800,21 +783,21 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
   else if (nattach == 1)
     mime_reply_any = 1;
 
-  tmphdr = mutt_new_header ();
-  tmphdr->env = mutt_new_envelope ();
+  tmphdr = header_new();
+  tmphdr->env = envelope_new();
 
   if (attach_reply_envelope_defaults (tmphdr->env, idx, idxlen,
                                       parent ? parent : (cur ? cur->
                                                          hdr : NULL),
                                       flags) == -1) {
-    mutt_free_header (&tmphdr);
+    header_delete(&tmphdr);
     return;
   }
 
   mutt_mktemp (tmpbody);
   if ((tmpfp = safe_fopen (tmpbody, "w")) == NULL) {
     mutt_error (_("Can't create %s."), tmpbody);
-    mutt_free_header (&tmphdr);
+    header_delete(&tmphdr);
     return;
   }
 
@@ -872,7 +855,7 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
     if (mime_reply_any && !cur &&
         copy_problematic_attachments (fp, &tmphdr->content, idx, idxlen,
                                       0) == NULL) {
-      mutt_free_header (&tmphdr);
+      header_delete(&tmphdr);
       fclose (tmpfp);
       return;
     }