X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hdrline.c;h=b47e2bd9398bfe5181a4abe98beb7fb02be6c421;hp=91d469aa1a2efb94469e32c02abcf3391531e6a9;hb=efe9a0bac26a7dabf3953ea0597ce06b3dcb21fe;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/hdrline.c b/hdrline.c
index 91d469a..b47e2bd 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -18,9 +18,11 @@
 #include "charset.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
-#include "mime.h"
 
 #include <lib-lib/str.h>
+
+#include <lib-mime/mime.h>
+
 #include "lib/rx.h"
 
 #include <ctype.h>
@@ -28,14 +30,14 @@
 #include <string.h>
 #include <locale.h>
 
-int mutt_is_mail_list (ADDRESS * addr)
+int mutt_is_mail_list (address_t * addr)
 {
   if (!rx_list_match (UnMailLists, addr->mailbox))
     return rx_list_match (MailLists, addr->mailbox);
   return 0;
 }
 
-int mutt_is_subscribed_list (ADDRESS * addr)
+int mutt_is_subscribed_list (address_t * addr)
 {
   if (!rx_list_match (UnMailLists, addr->mailbox)
       && !rx_list_match (UnSubscribedLists, addr->mailbox))
@@ -48,7 +50,7 @@ int mutt_is_subscribed_list (ADDRESS * addr)
  * return 1.  Otherwise, simply return 0.
  */
 static int
-check_for_mailing_list (ADDRESS * adr, const char *pfx, char *buf, int buflen)
+check_for_mailing_list (address_t * adr, const char *pfx, char *buf, int buflen)
 {
   for (; adr; adr = adr->next) {
     if (mutt_is_subscribed_list (adr)) {
@@ -64,7 +66,7 @@ check_for_mailing_list (ADDRESS * adr, const char *pfx, char *buf, int buflen)
  * If one is found, print the address of the list into buf, then return 1.
  * Otherwise, simply return 0.
  */
-static int check_for_mailing_list_addr (ADDRESS * adr, char *buf, int buflen)
+static int check_for_mailing_list_addr (address_t * adr, char *buf, int buflen)
 {
   for (; adr; adr = adr->next) {
     if (mutt_is_subscribed_list (adr)) {
@@ -77,7 +79,7 @@ static int check_for_mailing_list_addr (ADDRESS * adr, char *buf, int buflen)
 }
 
 
-static int first_mailing_list (char *buf, size_t buflen, ADDRESS * a)
+static int first_mailing_list (char *buf, size_t buflen, address_t * a)
 {
   for (; a; a = a->next) {
     if (mutt_is_subscribed_list (a)) {
@@ -135,7 +137,7 @@ static void make_from_addr (ENVELOPE * hdr, char *buf, size_t len,
     *buf = 0;
 }
 
-static int user_in_addr (ADDRESS * a)
+static int user_in_addr (address_t * a)
 {
   for (; a; a = a->next)
     if (mutt_addr_is_user (a))