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

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

Browse source 
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
1 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
notmuch-reply.c
View file

@ -23,12 +23,33 @@
#include "notmuch-client.h" #include "notmuch-client.h"
#include "gmime-filter-reply.h" #include "gmime-filter-reply.h"
static void
reply_part_content (GMimeObject *part)
{
GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
GMimeDataWrapper *wrapper;
stream_stdout = g_mime_stream_file_new (stdout);
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_reply_new(TRUE));
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
reply_part (GMimeObject *part, int *part_count) reply_part (GMimeObject *part, int *part_count)
{ {
GMimeContentDisposition *disposition; GMimeContentDisposition *disposition;
GMimeContentType *content_type; GMimeContentType *content_type;
GMimeDataWrapper *wrapper;
(void) part_count; (void) part_count;
disposition = g_mime_object_get_content_disposition (part); disposition = g_mime_object_get_content_disposition (part);
@ -38,8 +59,17 @@ reply_part (GMimeObject *part, int *part_count)
const char *filename = g_mime_part_get_filename (GMIME_PART (part)); const char *filename = g_mime_part_get_filename (GMIME_PART (part));
content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
printf ("Attachment: %s (%s)\n", filename, if (g_mime_content_type_is_type (content_type, "text", "*") &&
g_mime_content_type_to_string (content_type)); !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; return;
} }
@ -48,21 +78,7 @@ reply_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 = NULL, *stream_filter = NULL; reply_part_content (part);
stream_stdout = g_mime_stream_file_new (stdout);
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_reply_new(TRUE));
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
{ {