X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=94e1707e2031260d4edbd6d83bd1972a8ec72e9a;hp=c96e35095b7b9971aee7202e21d69e60051099f8;hb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235;hpb=ab12fea9d01b3b9bc53081ae4ccc046243f1cb9f

diff --git a/init.c b/init.c
index c96e350..94e1707 100644
--- a/init.c
+++ b/init.c
@@ -517,7 +517,7 @@ static void addr_to_string (char* dst, size_t dstlen,
                             struct option_t* option) {
   char s[HUGE_STRING];
   s[0] = '\0';
-  rfc822_write_address (s, sizeof(s), *((ADDRESS**) option->data), 0);
+  rfc822_write_address (s, sizeof(s), *((address_t**) option->data), 0);
   snprintf (dst, dstlen, "%s=\"%s\"", option->option, NONULL (s));
 }
 
@@ -525,9 +525,9 @@ static int addr_from_string (struct option_t* dst, const char* val,
                              char* errbuf, size_t errlen) {
   if (!dst)
     return (0);
-  rfc822_free_address ((ADDRESS**) dst->data);
+  rfc822_free_address ((address_t**) dst->data);
   if (val && *val)
-    *((ADDRESS**) dst->data) = rfc822_parse_adrlist (NULL, val);
+    *((address_t**) dst->data) = rfc822_parse_adrlist (NULL, val);
   return (1);
 }
 
@@ -1460,7 +1460,7 @@ static int parse_alias (BUFFER * buf, BUFFER * s, unsigned long data,
   }
 #ifdef DEBUG
   if (DebugLevel >= 2) {
-    ADDRESS *a;
+    address_t *a;
 
     /* A group is terminated with an empty address, so check a->mailbox */
     for (a = tmp->addr; a && a->mailbox; a = a->next) {
@@ -1972,7 +1972,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
             r = -1;
             break;
           } else if (DTYPE (option->type) == DT_ADDR)
-            rfc822_free_address ((ADDRESS **) option->data);
+            rfc822_free_address ((address_t **) option->data);
           else if (DTYPE (option->type) == DT_USER)
             /* to unset $user_ means remove */
             hash_delete (ConfigOptions, option->option,
@@ -2424,7 +2424,7 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
       }
       else if (DTYPE (option->type) == DT_ADDR) {
         rfc822_write_address (tmp, sizeof(tmp),
-                              *((ADDRESS **) option->data), 0);
+                              *((address_t **) option->data), 0);
       }
       else if (DTYPE (option->type) == DT_QUAD)
         m_strcpy(tmp, sizeof(tmp), vals[quadoption(option->data)]);