X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=f504547359cf555cd77775d3ed8ed632fd0c4890;hp=c051b8a74261859c7f7c50cef53e4bb11b7c0788;hb=d40d2e47d8033cbf917d09c3865179870897e773;hpb=cfc49a0d8c3ac2c0bd4b217026d0740c55f2e5db

diff --git a/recvcmd.c b/recvcmd.c
index c051b8a..f504547 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -19,13 +19,14 @@
 
 #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 "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"
@@ -119,13 +120,13 @@ static short count_tagged_children (ATTACHPTR ** idx, short idxlen, short i)
  **
  **/
 
-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;
   char prompt[STRING];
   char buf[HUGE_STRING];
-  char *err = NULL;
+  const char *err = NULL;
   address_t *adr = NULL;
   int ret = 0;
   int p = 0;
@@ -216,7 +217,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
  **
  **/
 
-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;
@@ -388,8 +389,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 +508,7 @@ bail:
     mutt_unlink (tmpbody);
   }
 
-  mutt_free_header (&tmphdr);
+  header_delete(&tmphdr);
 }
 
 
@@ -522,7 +523,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 +549,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 +564,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 +616,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);
 
@@ -738,7 +739,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 +801,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 +873,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;
     }