[PATCH 2/4] Fix notmuch-reply to not output "Non-text part:" lines for non-leafnode parts.
Jameson Graef Rollins
jrollins at finestructure.net
Wed Jun 8 12:30:07 PDT 2011
These lines are just cruft in this case, and can be removed.
---
notmuch-reply.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/notmuch-reply.c b/notmuch-reply.c
index a19eb19..7a76ba3 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 &&
--
1.7.5.3
More information about the notmuch
mailing list