debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
These lines are just cruft in this case, and can be removed.
This commit is contained in:
Jameson Graef Rollins 2011-06-08 12:30:07 -07:00 committed by David Bremner
parent a53422fedc
commit c75410fd81
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
notmuch-reply.c
View file

@ -93,7 +93,12 @@ reply_part_content (GMimeObject *part)
GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (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")) !g_mime_content_type_is_type (content_type, "text", "html"))
{ {
GMimeStream *stream_stdout = NULL, *stream_filter = NULL; GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
@ -120,10 +125,6 @@ reply_part_content (GMimeObject *part)
if (stream_stdout) if (stream_stdout)
g_object_unref(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 else
{ {
if (disposition && if (disposition &&