From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Wed, 8 Jun 2011 19:30:07 +0000 (-0700)
Subject: Fix notmuch-reply to not output "Non-text part:" lines for non-leafnode parts.
X-Git-Tag: 0.9~12
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=c75410fd81878ccb9f3fa3878507e5650de5fa3f

Fix notmuch-reply to not output "Non-text part:" lines for non-leafnode parts.

These lines are just cruft in this case, and can be removed.
---

diff --git a/notmuch-reply.c b/notmuch-reply.c
index f4b1a61b..c500862d 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -93,7 +93,12 @@ reply_part_content (GMimeObject *part)
     GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
     GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
 
-    if (g_mime_content_type_is_type (content_type, "text", "*") &&
+    if (g_mime_content_type_is_type (content_type, "multipart", "*") ||
+	g_mime_content_type_is_type (content_type, "message", "rfc822"))
+    {
+	/* Output nothing, since multipart subparts will be handled individually. */
+    }
+    else if (g_mime_content_type_is_type (content_type, "text", "*") &&
 	!g_mime_content_type_is_type (content_type, "text", "html"))
     {
 	GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
@@ -120,10 +125,6 @@ reply_part_content (GMimeObject *part)
 	if (stream_stdout)
 	    g_object_unref(stream_stdout);
     }
-    else if (g_mime_content_type_is_type (content_type, "message", "rfc822"))
-    {
-	/* Output nothing, since rfc822 subparts will be handled individually. */
-    }
     else
     {
 	if (disposition &&