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

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

View file

@ -67,40 +67,11 @@ _get_one_line_summary (void *ctx, notmuch_message_t *message)
} }
static void static void
show_part (GMimeObject *part, int *part_count) show_part_content (GMimeObject *part)
{
GMimeContentDisposition *disposition;
GMimeContentType *content_type;
GMimeDataWrapper *wrapper;
disposition = g_mime_object_get_content_disposition (part);
if (disposition &&
strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
{
const char *filename = g_mime_part_get_filename (GMIME_PART (part));
content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
printf ("\fattachment{ ID: %d, Content-type: %s\n",
*part_count,
g_mime_content_type_to_string (content_type));
printf ("Attachment: %s (%s)\n", filename,
g_mime_content_type_to_string (content_type));
printf ("\fattachment}\n");
return;
}
content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
printf ("\fpart{ ID: %d, Content-type: %s\n",
*part_count,
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"))
{ {
GMimeStream *stream_stdout = g_mime_stream_file_new (stdout); GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
GMimeStream *stream_filter = NULL; GMimeStream *stream_filter = NULL;
GMimeDataWrapper *wrapper;
if (stream_stdout) { if (stream_stdout) {
g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE); g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
@ -117,6 +88,48 @@ show_part (GMimeObject *part, int *part_count)
if (stream_stdout) if (stream_stdout)
g_object_unref(stream_stdout); g_object_unref(stream_stdout);
} }
static void
show_part (GMimeObject *part, int *part_count)
{
GMimeContentDisposition *disposition;
GMimeContentType *content_type;
disposition = g_mime_object_get_content_disposition (part);
if (disposition &&
strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
{
const char *filename = g_mime_part_get_filename (GMIME_PART (part));
content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
printf ("\fattachment{ ID: %d, Content-type: %s\n",
*part_count,
g_mime_content_type_to_string (content_type));
printf ("Attachment: %s (%s)\n", filename,
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");
return;
}
content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
printf ("\fpart{ ID: %d, Content-type: %s\n",
*part_count,
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);
}
else else
{ {
printf ("Non-text part: %s\n", printf ("Non-text part: %s\n",