X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=f98e32ba93fb6e47f656696d5b3af8736fd5db11;hp=ef1ef49bb725421e0c0b0be8d8d2abf1b6adad62;hb=871a94fc21c9d349bb0fe8851e0f2e3a07527ed5;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/send.c b/send.c
index ef1ef49..f98e32b 100644
--- a/send.c
+++ b/send.c
@@ -111,13 +111,13 @@ static address_t *mutt_remove_xrefs (address_t * a, address_t * b)
       if (prev) {
         prev->next = b->next;
         b->next = NULL;
-        rfc822_free_address (&b);
+        address_delete (&b);
         b = prev;
       }
       else {
         top = top->next;
         b->next = NULL;
-        rfc822_free_address (&b);
+        address_delete (&b);
         b = top;
       }
     }
@@ -153,7 +153,7 @@ static address_t *remove_user (address_t * a, int leave_only)
       a = a->next;
       if (!leave_only || a || last) {
         tmp->next = NULL;
-        rfc822_free_address (&tmp);
+        address_delete (&tmp);
       }
       else
         last = top = tmp;
@@ -193,7 +193,7 @@ static int edit_address (address_t ** a, const char *field)
     rfc822_write_address (buf, sizeof (buf), *a, 0);
     if (mutt_get_field (field, buf, sizeof (buf), M_ALIAS) != 0)
       return (-1);
-    rfc822_free_address (a);
+    address_delete (a);
     *a = mutt_expand_aliases (mutt_parse_adrlist (NULL, buf));
     if ((idna_ok = mutt_addrlist_to_idna (*a, &err)) != 0) {
       mutt_error (_("Error: '%s' is a bad IDN."), err);
@@ -343,11 +343,11 @@ static void process_user_header (ENVELOPE * env)
   for (; uh; uh = uh->next) {
     if (ascii_strncasecmp ("from:", uh->data, 5) == 0) {
       /* User has specified a default From: address.  Remove default address */
-      rfc822_free_address (&env->from);
+      address_delete (&env->from);
       env->from = rfc822_parse_adrlist (env->from, uh->data + 5);
     }
     else if (ascii_strncasecmp ("reply-to:", uh->data, 9) == 0) {
-      rfc822_free_address (&env->reply_to);
+      address_delete (&env->reply_to);
       env->reply_to = rfc822_parse_adrlist (env->reply_to, uh->data + 9);
     }
     else if (ascii_strncasecmp ("message-id:", uh->data, 11) == 0)
@@ -496,7 +496,7 @@ static int default_to (address_t ** to, ENVELOPE * env, int flags, int hmfupto)
     case M_YES:
       tmp = find_mailing_lists (env->to, env->cc);
       rfc822_append (to, tmp);
-      rfc822_free_address (&tmp);
+      address_delete (&tmp);
       return 0;
     case -1:
       return -1;                /* abort */
@@ -572,7 +572,7 @@ int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags)
   if (flags & SENDLISTREPLY) {
     tmp = find_mailing_lists (in->to, in->cc);
     rfc822_append (&out->to, tmp);
-    rfc822_free_address (&tmp);
+    address_delete (&tmp);
 
     if (in->mail_followup_to && hmfupto == M_YES &&
         default_to (&out->cc, in, flags & SENDLISTREPLY, hmfupto) == -1)
@@ -985,12 +985,12 @@ address_t *mutt_default_from (void)
   if (From)
     adr = rfc822_cpy_adr_real (From);
   else if (option (OPTUSEDOMAIN)) {
-    adr = rfc822_new_address ();
+    adr = address_new ();
     adr->mailbox = p_new(char, m_strlen(Username) + m_strlen(fqdn) + 2);
     sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn));  /* __SPRINTF_CHECKED__ */
   }
   else {
-    adr = rfc822_new_address ();
+    adr = address_new ();
     adr->mailbox = m_strdup(NONULL (Username));
   }
 
@@ -1186,7 +1186,7 @@ int ci_send_message (int flags, /* send mode */
     /* Use any list-post header as a template */
     url_parse_mailto (msg->env, NULL, cur->env->list_post);
     /* We don't let them set the sender's address. */
-    rfc822_free_address (&msg->env->from);
+    address_delete (&msg->env->from);
   }
 
   if (!(flags & (SENDKEY | SENDPOSTPONED | SENDRESEND))) {
@@ -1315,7 +1315,7 @@ int ci_send_message (int flags, /* send mode */
     msg->replied = 0;
 
     if (killfrom) {
-      rfc822_free_address (&msg->env->from);
+      address_delete (&msg->env->from);
       killfrom = 0;
     }
 
@@ -1502,7 +1502,7 @@ int ci_send_message (int flags, /* send mode */
     }
     mutt_select_fcc (fcc, sizeof (fcc), msg);
     if (killfrom) {
-      rfc822_free_address (&msg->env->from);
+      address_delete (&msg->env->from);
       killfrom = 0;
     }
   }