X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=send.c;h=613be7630efd04a805d917f848c67ce1ee5cea54;hb=201fd8633cc86ccda413c919ae6e2ae04e89b4a9;hp=82fd71abffe812ed7ee68b0ccbcc5556226f80f5;hpb=a8808601c98c76ec8344c8e4ba5a607d72c2805e;p=apps%2Fmadmutt.git

diff --git a/send.c b/send.c
index 82fd71a..613be76 100644
--- a/send.c
+++ b/send.c
@@ -19,9 +19,10 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+
 #include "mutt.h"
-#include "enter.h"
-#include "mutt_curses.h"
 #include "rfc3676.h"
 #include "keymap.h"
 #include "copy.h"
@@ -1072,7 +1073,7 @@ static void fix_end_of_file (const char *data)
 
 int mutt_resend_message (FILE * fp, CONTEXT * ctx, HEADER * cur)
 {
-  HEADER *msg = mutt_new_header ();
+  HEADER *msg = header_new();
 
   if (mutt_prepare_template (fp, ctx, msg, cur, 1) < 0)
     return -1;
@@ -1135,7 +1136,7 @@ int ci_send_message (int flags, /* send mode */
    */
 
   if (!msg) {
-    msg = mutt_new_header ();
+    msg = header_new();
 
     if (flags == SENDPOSTPONED) {
       if ((flags =
@@ -1165,7 +1166,7 @@ int ci_send_message (int flags, /* send mode */
     }
 
     if (!msg->env)
-      msg->env = mutt_new_envelope ();
+      msg->env = envelope_new();
   }
 
   /* Parse and use an eventual list-post header */
@@ -1811,7 +1812,7 @@ cleanup:
   }
 
   safe_fclose (&tempfp);
-  mutt_free_header (&msg);
+  header_delete(&msg);
 
   return rv;
 }