X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=00029bb8a9d1d0850f52f354e6341b7a7a8bf4a9;hp=9c6c844e554100551a1be46dad56601a14c79436;hb=a5b02206150dc653355cdc60286c27482b5a4f93;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b

diff --git a/recvcmd.c b/recvcmd.c
index 9c6c844..00029bb 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -12,11 +12,14 @@
 #endif
 
 #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 "mime.h"
-#include "mailbox.h"
 #include "attach.h"
 #include "mapping.h"
 #include "mx.h"
@@ -150,7 +153,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
 
   if (mutt_addrlist_to_idna (adr, &err) < 0) {
     mutt_error (_("Bad IDN: '%s'"), err);
-    FREE (&err);
+    mem_free (&err);
     rfc822_free_address (&adr);
     return;
   }
@@ -170,10 +173,10 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
     mutt_format_string (prompt, sizeof (prompt) - 4,
                         0, COLS - extra_space, 0, 0,
                         prompt, sizeof (prompt), 0);
-    safe_strcat (prompt, sizeof (prompt), "...?");
+    str_cat (prompt, sizeof (prompt), "...?");
   }
   else
-    safe_strcat (prompt, sizeof (prompt), "?");
+    str_cat (prompt, sizeof (prompt), "?");
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
     rfc822_free_address (&adr);
@@ -684,8 +687,8 @@ attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
   if ((flags & SENDNEWS)) {
     /* in case followup set Newsgroups: with Followup-To: if it present */
     if (!env->newsgroups && curenv &&
-        safe_strcasecmp (curenv->followup_to, "poster"))
-      env->newsgroups = safe_strdup (curenv->followup_to);
+        str_casecmp (curenv->followup_to, "poster"))
+      env->newsgroups = str_dup (curenv->followup_to);
   }
   else
 #endif