X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=muttlib.c;h=2b0c41fe5b7b097118abda6225573179f5b471bb;hb=d0dc8fb657cff90709c15d4b106415b868857f6a;hp=f82560a0627e903e1e334944e8d47b1da4ca9485;hpb=2a06362a155582cd59ae2ef6f0df71694a7eede3;p=apps%2Fmadmutt.git

diff --git a/muttlib.c b/muttlib.c
index f82560a..2b0c41f 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -357,7 +357,7 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
     case '@':
       {
         HEADER *h;
-        ADDRESS *alias;
+        address_t *alias;
 
         if ((alias = mutt_lookup_alias (s + 1))) {
           h = mutt_new_header ();
@@ -584,14 +584,14 @@ void mutt_free_envelope (ENVELOPE ** p)
 {
   if (!*p)
     return;
-  rfc822_free_address (&(*p)->return_path);
-  rfc822_free_address (&(*p)->from);
-  rfc822_free_address (&(*p)->to);
-  rfc822_free_address (&(*p)->cc);
-  rfc822_free_address (&(*p)->bcc);
-  rfc822_free_address (&(*p)->sender);
-  rfc822_free_address (&(*p)->reply_to);
-  rfc822_free_address (&(*p)->mail_followup_to);
+  address_delete (&(*p)->return_path);
+  address_delete (&(*p)->from);
+  address_delete (&(*p)->to);
+  address_delete (&(*p)->cc);
+  address_delete (&(*p)->bcc);
+  address_delete (&(*p)->sender);
+  address_delete (&(*p)->reply_to);
+  address_delete (&(*p)->mail_followup_to);
 
   p_delete(&(*p)->list_post);
   p_delete(&(*p)->subject);
@@ -677,7 +677,7 @@ void mutt_free_alias (ALIAS ** p)
     t = *p;
     *p = (*p)->next;
     p_delete(&t->name);
-    rfc822_free_address (&t->addr);
+    address_delete (&t->addr);
     p_delete(&t);
   }
 }
@@ -879,7 +879,7 @@ int mutt_check_overwrite (const char *attname, const char *path,
   return 0;
 }
 
-void mutt_save_path (char *d, size_t dsize, ADDRESS * a)
+void mutt_save_path (char *d, size_t dsize, address_t * a)
 {
   if (a && a->mailbox) {
     m_strcpy(d, dsize, a->mailbox);
@@ -895,7 +895,7 @@ void mutt_save_path (char *d, size_t dsize, ADDRESS * a)
     *d = 0;
 }
 
-void mutt_safe_path (char *s, size_t l, ADDRESS * a)
+void mutt_safe_path (char *s, size_t l, address_t * a)
 {
   char *p;
 
@@ -1392,7 +1392,7 @@ int mutt_cmp_header (const HEADER * h1, const HEADER * h2) {
 }
 
 /* return 1 if address lists are strictly identical */
-int mutt_cmp_addr (const ADDRESS * a, const ADDRESS * b)
+int mutt_cmp_addr (const address_t * a, const address_t * b)
 {
   while (a && b) {
     if (m_strcmp(a->mailbox, b->mailbox) ||