X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.c;h=f092a8caa04eea7cce8693324982b89d30c0906b;hp=a37387754442bc38015a72621f09222a00551ced;hb=fa7f733a61a6fe3143198791ab470ddf4d08fdbe;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/alias.c b/alias.c
index a373877..f092a8c 100644
--- a/alias.c
+++ b/alias.c
@@ -12,10 +12,14 @@
 #endif
 
 #include "mutt.h"
-#include "mutt_regex.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/rx.h"
+
 #include <string.h>
 #include <ctype.h>
 
@@ -523,11 +527,11 @@ int mutt_addr_is_user (ADDRESS * addr)
     return 1;
   }
 
-  if (mutt_match_rx_list (addr->mailbox, Alternates)) {
+  if (rx_list_match (Alternates, addr->mailbox)) {
     dprint (5,
             (debugfile, "mail_addr_is_user: yes, %s matched by alternates.\n",
              addr->mailbox));
-    if (mutt_match_rx_list (addr->mailbox, UnAlternates))
+    if (rx_list_match (UnAlternates, addr->mailbox))
       dprint (5,
               (debugfile,
                "mail_addr_is_user: but, %s matched by unalternates.\n",