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

diff --git a/hdrline.c b/hdrline.c
index b47e2bd..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>
@@ -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;