wibble.

[apps/madmutt.git] / commands.c

diff --git a/commands.c b/commands.c
index 00a8446..a14b471 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -274,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;
   }
 
@@ -295,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;
@@ -304,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."));
@@ -859,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);
     }
   }