X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=hdrline.c;h=2ac88f1ef09df06cbd96a257a277bce3c2bd1ddc;hb=e6737dc67953504df4a3f1e82849ef092a337b99;hp=81abd4aaaeb067c587d3f85f14fee67be0148c5f;hpb=c3e57678c8be193fc137854020f3a90887be97c9;p=apps%2Fmadmutt.git diff --git a/hdrline.c b/hdrline.c index 81abd4a..2ac88f1 100644 --- a/hdrline.c +++ b/hdrline.c @@ -18,6 +18,9 @@ #include "mutt_crypt.h" #include "mutt_idna.h" +#include "lib/str.h" +#include "lib/rx.h" + #include #include #include @@ -25,16 +28,16 @@ int mutt_is_mail_list (ADDRESS * addr) { - if (!mutt_match_rx_list (addr->mailbox, UnMailLists)) - return mutt_match_rx_list (addr->mailbox, MailLists); + if (!rx_list_match (UnMailLists, addr->mailbox)) + return rx_list_match (MailLists, addr->mailbox); return 0; } int mutt_is_subscribed_list (ADDRESS * addr) { - if (!mutt_match_rx_list (addr->mailbox, UnMailLists) - && !mutt_match_rx_list (addr->mailbox, UnSubscribedLists)) - return mutt_match_rx_list (addr->mailbox, SubscribedLists); + if (!rx_list_match (UnMailLists, addr->mailbox) + && !rx_list_match (UnSubscribedLists, addr->mailbox)) + return rx_list_match (SubscribedLists, addr->mailbox); return 0; }