Rocco Rutte:

[apps/madmutt.git] / commands.c

diff --git a/commands.c b/commands.c
index 9475e38..2a4c7be 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -13,6 +13,9 @@
 #endif
 
 #include "mutt.h"
+#include "enter.h"
+#include "recvattach.h"
+#include "ascii.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mime.h"
@@ -262,7 +265,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
 
   if (mutt_addrlist_to_idna (adr, &err) < 0) {
     mutt_error (_("Bad IDN: '%s'"), err);
-    FREE (&err);
+    mem_free (&err);
     rfc822_free_address (&adr);
     return;
   }
@@ -570,7 +573,7 @@ void mutt_enter_command (void)
   err.dsize = sizeof (errbuf);
   memset (&token, 0, sizeof (token));
   r = mutt_parse_rc_line (buffer, &token, &err);
-  FREE (&token.data);
+  mem_free (&token.data);
   if (errbuf[0]) {
     /* since errbuf could potentially contain printf() sequences in it,
        we must call mutt_error() in this fashion so that vsprintf()
@@ -942,7 +945,7 @@ int mutt_update_list_file (char *filename, char *section, char *key,
 
 void mutt_version (void)
 {
-  mutt_message ("Mutt-ng %s (%s) based on Mutt 1.5.9", MUTT_VERSION, ReleaseDate);
+  mutt_message (mutt_make_version ());
 }
 
 void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
@@ -980,7 +983,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
 
   /* clean up previous junk */
   mutt_free_parameter (&b->parameter);
-  FREE (&b->subtype);
+  mem_free (&b->subtype);
 
   mutt_parse_content_type (buf, b);