wibble

[apps/madmutt.git] / pattern.c

diff --git a/pattern.c b/pattern.c
index f40ea59..66d8290 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -17,15 +17,16 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 #include <lib-lib/buffer.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-mime/mime.h>
 
 #include "mutt.h"
 #include "handler.h"
 #include "enter.h"
 #include "mx.h"
-#include "mapping.h"
 #include "keymap.h"
 #include "copy.h"
-#include "mime.h"
 
 
 #ifdef USE_IMAP
@@ -876,11 +877,11 @@ static int match_adrlist (pattern_t* pat, int match_personal, int alladdr,
                           int n, ...)
 {
   va_list ap;
-  ADDRESS *a;
+  address_t *a;
 
   va_start (ap, n);
   for (; n; n--) {
-    for (a = va_arg (ap, ADDRESS *); a; a = a->next) {
+    for (a = va_arg (ap, address_t *); a; a = a->next) {
       if (pat->alladdr ^
           ((a->mailbox && patmatch (pat, a->mailbox) == 0) ||
            (match_personal && a->personal &&
@@ -902,7 +903,7 @@ static int match_reference (pattern_t* pat, LIST * refs)
   return 0;
 }
 
-int mutt_is_list_recipient (int alladdr, ADDRESS * a1, ADDRESS * a2)
+int mutt_is_list_recipient (int alladdr, address_t * a1, address_t * a2)
 {
   for (; a1; a1 = a1->next)
     if (alladdr ^ mutt_is_subscribed_list (a1))
@@ -913,7 +914,7 @@ int mutt_is_list_recipient (int alladdr, ADDRESS * a1, ADDRESS * a2)
   return alladdr;
 }
 
-int mutt_is_list_cc (int alladdr, ADDRESS * a1, ADDRESS * a2)
+int mutt_is_list_cc (int alladdr, address_t * a1, address_t * a2)
 {
   for (; a1; a1 = a1->next)
     if (alladdr ^ mutt_is_mail_list (a1))
@@ -924,7 +925,7 @@ int mutt_is_list_cc (int alladdr, ADDRESS * a1, ADDRESS * a2)
   return alladdr;
 }
 
-static int match_user (int alladdr, ADDRESS * a1, ADDRESS * a2)
+static int match_user (int alladdr, address_t * a1, address_t * a2)
 {
   for (; a1; a1 = a1->next)
     if (alladdr ^ mutt_addr_is_user (a1))