X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hdrline.c;h=f6ad7f7d0786d309e22977d6d1ddbd6de426f5d3;hp=5d84cb4ca1809cd30a45a9b2738e8112069da128;hb=e39e529e5df06cd4148de4614073b66a23be0b26;hpb=74a2265af51ce89bca845adc1d68f273c9933c13

diff --git a/hdrline.c b/hdrline.c
index 5d84cb4..f6ad7f7 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -19,6 +19,7 @@
 #include "mutt_idna.h"
 
 #include "lib/str.h"
+#include "lib/rx.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -27,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;
 }
 
@@ -682,7 +683,7 @@ static const char *hdr_format_str (char *dest,
                && (hdr->thread->parent && hdr->thread->parent->message
                    && hdr->thread->parent->message->env->x_label))
         htmp = hdr->thread->parent->message;
-      if (htmp && mutt_strcasecmp (hdr->env->x_label,
+      if (htmp && safe_strcasecmp (hdr->env->x_label,
                                    htmp->env->x_label) == 0)
         i = 0;
     }