X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hdrline.c;h=39ab459b159f1692b56f6e5e819f276f8a519075;hp=81abd4aaaeb067c587d3f85f14fee67be0148c5f;hb=fd958ee8a2c85e3cc5c2f45a426ef4b724191f57;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/hdrline.c b/hdrline.c
index 81abd4a..39ab459 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -14,9 +14,14 @@
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "sort.h"
+#include "thread.h"
 #include "charset.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
+#include "mime.h"
+
+#include "lib/str.h"
+#include "lib/rx.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -25,16 +30,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;
 }
 
@@ -584,7 +589,7 @@ static const char *hdr_format_str (char *dest,
     snprintf (dest, destlen, fmt,
               (Tochars
                && ((i = mutt_user_is_recipient (hdr))) <
-               mutt_strlen (Tochars)) ? Tochars[i] : ' ');
+               str_len (Tochars)) ? Tochars[i] : ' ');
     break;
 
   case 'u':
@@ -639,7 +644,7 @@ static const char *hdr_format_str (char *dest,
       ch = 'K';
 
     snprintf (buf2, sizeof (buf2),
-              "%c%c%c", (THREAD_NEW ? 'n' : (THREAD_OLD ? 'o' :
+              "%c%c%c%c", (THREAD_NEW ? 'n' : (THREAD_OLD ? 'o' :
                                              ((hdr->read
                                                && (ctx
                                                    && ctx->msgnotreadyet !=
@@ -656,8 +661,10 @@ static const char *hdr_format_str (char *dest,
                                                     ((i =
                                                       mutt_user_is_recipient
                                                       (hdr)) <
-                                                     mutt_strlen (Tochars)) ?
-                                                    Tochars[i] : ' ')));
+                                                     str_len (Tochars)) ?
+                                                    Tochars[i] : ' ')),
+              (hdr->content && hdr->content->type == TYPEMULTIPART) ?
+              'A' : ' ');
     mutt_format_s (dest, destlen, prefix, buf2);
     break;
 
@@ -680,7 +687,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 && str_casecmp (hdr->env->x_label,
                                    htmp->env->x_label) == 0)
         i = 0;
     }