X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=a14b47177ca340b7152b4044e40e482894bad732;hp=3a53ac7006f1e11947dbbddc343c713a4144bc26;hb=85832555b8d510499b13bc454e458382d36e195d;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/commands.c b/commands.c
index 3a53ac7..a14b471 100644
--- a/commands.c
+++ b/commands.c
@@ -17,12 +17,13 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/ascii.h>
 
+#include <lib-mime/mime.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "recvattach.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
-#include "mime.h"
 #include "sort.h"
 #include "copy.h"
 #include "mx.h"
@@ -53,8 +54,6 @@
 #include <sys/types.h>
 #include <utime.h>
 
-extern char *ReleaseDate;
-
 /* The folder the user last saved to.  Used by ci_save_message() */
 static char LastSaveFolder[_POSIX_PATH_MAX] = "";
 
@@ -245,7 +244,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
 {
   char prompt[SHORT_STRING];
   char buf[HUGE_STRING] = { 0 };
-  ADDRESS *adr = NULL;
+  address_t *adr = NULL;
   char *err = NULL;
   int rc;
 
@@ -275,7 +274,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
   if (mutt_addrlist_to_idna (adr, &err) < 0) {
     mutt_error (_("Bad IDN: '%s'"), err);
     p_delete(&err);
-    rfc822_free_address (&adr);
+    address_delete (&adr);
     return;
   }
 
@@ -296,7 +295,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
   }
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
-    rfc822_free_address (&adr);
+    address_delete (&adr);
     CLEARLINE (LINES - 1);
     mutt_message (h ? _("Message not bounced.") : _("Messages not bounced."));
     return;
@@ -305,7 +304,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
   CLEARLINE (LINES - 1);
 
   rc = mutt_bounce_message (NULL, h, adr);
-  rfc822_free_address (&adr);
+  address_delete (&adr);
   /* If no error, or background, display message. */
   if ((rc == 0) || (rc == S_BKG))
     mutt_message (h ? _("Message bounced.") : _("Messages bounced."));
@@ -597,7 +596,7 @@ void mutt_display_address (ENVELOPE * env)
 {
   const char *pfx = NULL;
   char buf[SHORT_STRING];
-  ADDRESS *adr = NULL;
+  address_t *adr = NULL;
 
   adr = mutt_get_address(env, &pfx);
 
@@ -860,7 +859,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
     for (p = b->parameter; p; p = p->next) {
       l = m_strlen(buf);
 
-      rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
+      rfc822_strcpy(tmp, sizeof(tmp), p->value, MimeSpecials);
       snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);
     }
   }