X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hdrline.c;h=72a1674066d8d9c79a6c805e732b27a03065323e;hp=a568c9a90be57dbe0d04df74e1fac833379bd419;hb=1bf100814942c455dfd1d99fdd6fce80970a9999;hpb=2a06362a155582cd59ae2ef6f0df71694a7eede3

diff --git a/hdrline.c b/hdrline.c
index a568c9a..72a1674 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -16,7 +16,7 @@
 #include "sort.h"
 #include "thread.h"
 #include "charset.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 
 #include <lib-lib/str.h>
@@ -30,14 +30,14 @@
 #include <string.h>
 #include <locale.h>
 
-int mutt_is_mail_list (ADDRESS * addr)
+int mutt_is_mail_list (address_t * addr)
 {
   if (!rx_list_match (UnMailLists, addr->mailbox))
     return rx_list_match (MailLists, addr->mailbox);
   return 0;
 }
 
-int mutt_is_subscribed_list (ADDRESS * addr)
+int mutt_is_subscribed_list (address_t * addr)
 {
   if (!rx_list_match (UnMailLists, addr->mailbox)
       && !rx_list_match (UnSubscribedLists, addr->mailbox))
@@ -50,7 +50,7 @@ int mutt_is_subscribed_list (ADDRESS * addr)
  * return 1.  Otherwise, simply return 0.
  */
 static int
-check_for_mailing_list (ADDRESS * adr, const char *pfx, char *buf, int buflen)
+check_for_mailing_list (address_t * adr, const char *pfx, char *buf, int buflen)
 {
   for (; adr; adr = adr->next) {
     if (mutt_is_subscribed_list (adr)) {
@@ -66,7 +66,7 @@ check_for_mailing_list (ADDRESS * adr, const char *pfx, char *buf, int buflen)
  * If one is found, print the address of the list into buf, then return 1.
  * Otherwise, simply return 0.
  */
-static int check_for_mailing_list_addr (ADDRESS * adr, char *buf, int buflen)
+static int check_for_mailing_list_addr (address_t * adr, char *buf, int buflen)
 {
   for (; adr; adr = adr->next) {
     if (mutt_is_subscribed_list (adr)) {
@@ -79,7 +79,7 @@ static int check_for_mailing_list_addr (ADDRESS * adr, char *buf, int buflen)
 }
 
 
-static int first_mailing_list (char *buf, size_t buflen, ADDRESS * a)
+static int first_mailing_list (char *buf, size_t buflen, address_t * a)
 {
   for (; a; a = a->next) {
     if (mutt_is_subscribed_list (a)) {
@@ -137,7 +137,7 @@ static void make_from_addr (ENVELOPE * hdr, char *buf, size_t len,
     *buf = 0;
 }
 
-static int user_in_addr (ADDRESS * a)
+static int user_in_addr (address_t * a)
 {
   for (; a; a = a->next)
     if (mutt_addr_is_user (a))
@@ -646,7 +646,7 @@ static const char *hdr_format_str (char *dest,
       /* The recursion allows messages without depth to return 0. */
       if (optional)
         optional = count != 0;
-      
+
       snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
       snprintf (dest, destlen, fmt, count);
     }
@@ -656,35 +656,27 @@ static const char *hdr_format_str (char *dest,
 
     ch = ' ';
 
-    if (WithCrypto && hdr->security & GOODSIGN)
+    if (hdr->security & GOODSIGN)
       ch = 'S';
-    else if (WithCrypto && hdr->security & ENCRYPT)
+    else if (hdr->security & ENCRYPT)
       ch = 'P';
-    else if (WithCrypto && hdr->security & SIGN)
+    else if (hdr->security & SIGN)
       ch = 's';
-    else if ((WithCrypto & APPLICATION_PGP) && hdr->security & PGPKEY)
+    else if (hdr->security & PGPKEY)
       ch = 'K';
 
-    snprintf (buf2, sizeof (buf2),
-              "%c%c%c", (THREAD_NEW ? 'n' : (THREAD_OLD ? 'o' :
-                                             ((hdr->read
-                                               && (ctx
-                                                   && ctx->msgnotreadyet !=
-                                                   hdr->msgno))
-                                              ? (hdr->
-                                                 replied ? 'r' : ' ') : (hdr->
-                                                                         old ?
-                                                                         'O' :
-                                                                         'N')))),
+    snprintf(buf2, sizeof (buf2), "%c%c%c",
+             (THREAD_NEW ? 'n'
+              : (THREAD_OLD
+                 ?  'o'
+                 : ((hdr->read && (ctx && ctx->msgnotreadyet != hdr->msgno))
+                    ? (hdr->replied ? 'r' : ' ')
+                    : (hdr->old ?  'O' : 'N')))),
               hdr->deleted ? 'D' : (hdr->attach_del ? 'd' : ch),
-              hdr->tagged ? '*' : (hdr->
-                                   flagged ? '!' : (Tochars
-                                                    &&
-                                                    ((i =
-                                                      mutt_user_is_recipient
-                                                      (hdr)) <
-                                                     m_strlen(Tochars)) ?
-                                                    Tochars[i] : ' ')));
+              hdr->tagged ? '*'
+              : (hdr->flagged ? '!'
+                 : (Tochars && ((i = mutt_user_is_recipient(hdr)) < m_strlen(Tochars))
+                    ?  Tochars[i] : ' ')));
     mutt_format_s (dest, destlen, prefix, buf2);
     break;