X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hdrline.c;h=bd83a437daa3decd3a4775f16762884e2c5003b3;hp=39ab459b159f1692b56f6e5e819f276f8a519075;hb=9ed6c0f86855d82f8b95b3f623bf2639f0f19d0b;hpb=08b24cfbdc0c35af65891f5b2478dc0ee33feb7e

diff --git a/hdrline.c b/hdrline.c
index 39ab459..bd83a43 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -207,6 +207,7 @@ int mutt_user_is_recipient (HEADER * h)
  * %u = user (login) name of author
  * %v = first name of author, unless from self
  * %W = where user is (organization)
+ * %X = number of MIME attachments
  * %y = `x-label:' field (if present)
  * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
  * %Z = status flags	*/
@@ -630,6 +631,25 @@ static const char *hdr_format_str (char *dest,
       optional = 0;
     break;
 
+  case 'X':
+    {
+      int count = 0;
+
+      if (option (OPTCOUNTATTACH)) {
+        if (!hdr->content->parts)
+          mutt_parse_mime_message(ctx, hdr);
+        count = mutt_count_body_parts(hdr, 0);
+      }
+
+      /* 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);
+    }
+    break;
+
   case 'Z':
 
     ch = ' ';
@@ -644,7 +664,7 @@ static const char *hdr_format_str (char *dest,
       ch = 'K';
 
     snprintf (buf2, sizeof (buf2),
-              "%c%c%c%c", (THREAD_NEW ? 'n' : (THREAD_OLD ? 'o' :
+              "%c%c%c", (THREAD_NEW ? 'n' : (THREAD_OLD ? 'o' :
                                              ((hdr->read
                                                && (ctx
                                                    && ctx->msgnotreadyet !=
@@ -662,9 +682,7 @@ static const char *hdr_format_str (char *dest,
                                                       mutt_user_is_recipient
                                                       (hdr)) <
                                                      str_len (Tochars)) ?
-                                                    Tochars[i] : ' ')),
-              (hdr->content && hdr->content->type == TYPEMULTIPART) ?
-              'A' : ' ');
+                                                    Tochars[i] : ' ')));
     mutt_format_s (dest, destlen, prefix, buf2);
     break;