debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch show: Don't hide text parts, even with disposition attachment.

Browse source 
If it's text, (such as a patch), then I want to see it.
This commit is contained in:
Carl Worth 2009-11-21 01:09:36 +01:00
parent 67bad3483f
commit 268da2cf19
1 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
notmuch-show.c
View file

@ -66,12 +66,34 @@ _get_one_line_summary (void *ctx, notmuch_message_t *message)
from, relative_date, tags); from, relative_date, tags);
} }
static void
show_part_content (GMimeObject *part)
{
GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
GMimeStream *stream_filter = NULL;
GMimeDataWrapper *wrapper;
if (stream_stdout) {
g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
stream_filter = g_mime_stream_filter_new(stream_stdout);
g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
g_mime_filter_crlf_new(FALSE, FALSE));
}
wrapper = g_mime_part_get_content_object (GMIME_PART (part));
if (wrapper && stream_filter)
g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
if (stream_filter)
g_object_unref(stream_filter);
if (stream_stdout)
g_object_unref(stream_stdout);
}
static void static void
show_part (GMimeObject *part, int *part_count) show_part (GMimeObject *part, int *part_count)
{ {
GMimeContentDisposition *disposition; GMimeContentDisposition *disposition;
GMimeContentType *content_type; GMimeContentType *content_type;
GMimeDataWrapper *wrapper;
disposition = g_mime_object_get_content_disposition (part); disposition = g_mime_object_get_content_disposition (part);
if (disposition && if (disposition &&
@ -85,6 +107,13 @@ show_part (GMimeObject *part, int *part_count)
g_mime_content_type_to_string (content_type)); g_mime_content_type_to_string (content_type));
printf ("Attachment: %s (%s)\n", filename, printf ("Attachment: %s (%s)\n", filename,
g_mime_content_type_to_string (content_type)); g_mime_content_type_to_string (content_type));
if (g_mime_content_type_is_type (content_type, "text", "*") &&
!g_mime_content_type_is_type (content_type, "text", "html"))
{
show_part_content (part);
}
printf ("\fattachment}\n"); printf ("\fattachment}\n");
return; return;
@ -99,23 +128,7 @@ show_part (GMimeObject *part, int *part_count)
if (g_mime_content_type_is_type (content_type, "text", "*") && 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 = g_mime_stream_file_new (stdout); show_part_content (part);
GMimeStream *stream_filter = NULL;
if (stream_stdout) {
g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
stream_filter = g_mime_stream_filter_new(stream_stdout);
g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
g_mime_filter_crlf_new(FALSE, FALSE));
}
wrapper = g_mime_part_get_content_object (GMIME_PART (part));
if (wrapper && stream_filter)
g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
if (stream_filter)
g_object_unref(stream_filter);
if (stream_stdout)
g_object_unref(stream_stdout);
} }
else else
{ {