notmuch reply: Include text parts in reply, even with disposition attachment.

If it's text, (such as a patch), then I want it quoted in my reply,
(so that I can comment on it).
This commit is contained in:
Carl Worth 2009-11-21 01:14:01 +01:00
parent 268da2cf19
commit e94bd8506b

View file

@ -24,31 +24,11 @@
#include "gmime-filter-reply.h" #include "gmime-filter-reply.h"
static void static void
reply_part (GMimeObject *part, int *part_count) reply_part_content (GMimeObject *part)
{
GMimeContentDisposition *disposition;
GMimeContentType *content_type;
GMimeDataWrapper *wrapper;
(void) part_count;
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 ("Attachment: %s (%s)\n", filename,
g_mime_content_type_to_string (content_type));
return;
}
content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
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; GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
GMimeDataWrapper *wrapper;
stream_stdout = g_mime_stream_file_new (stdout); stream_stdout = g_mime_stream_file_new (stdout);
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);
@ -64,6 +44,42 @@ reply_part (GMimeObject *part, int *part_count)
if (stream_stdout) if (stream_stdout)
g_object_unref(stream_stdout); g_object_unref(stream_stdout);
} }
static void
reply_part (GMimeObject *part, int *part_count)
{
GMimeContentDisposition *disposition;
GMimeContentType *content_type;
(void) part_count;
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));
if (g_mime_content_type_is_type (content_type, "text", "*") &&
!g_mime_content_type_is_type (content_type, "text", "html"))
{
reply_part_content (part);
}
else
{
printf ("Attachment: %s (%s)\n", filename,
g_mime_content_type_to_string (content_type));
}
return;
}
content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
if (g_mime_content_type_is_type (content_type, "text", "*") &&
!g_mime_content_type_is_type (content_type, "text", "html"))
{
reply_part_content (part);
}
else else
{ {
printf ("Non-text part: %s\n", printf ("Non-text part: %s\n",