X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-reply.c;h=79599358fa23c481e1e109735bb05627bc43bf70;hp=333e945f09d01abfe225bc589190dd8496506314;hb=757e06f74bb7b5f69c0a20c7a5432150e074055d;hpb=932e1c165cdb5dff769e4d290525f4f6b2f5ac81 diff --git a/notmuch-reply.c b/notmuch-reply.c index 333e945f..79599358 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -25,32 +25,17 @@ #include "gmime-filter-headers.h" static void -reply_part_content (GMimeObject *part) -{ - GMimeStream *stream_stdout = NULL, *stream_filter = NULL; - GMimeDataWrapper *wrapper; - const char *charset; - - charset = g_mime_object_get_content_type_parameter (part, "charset"); - 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); - if (charset) { - g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter), - g_mime_filter_charset_new(charset, "UTF-8")); - } - } - 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); -} +reply_part (GMimeObject *part, + unused (int *part_count)); + +static const notmuch_show_format_t format_reply = { + "", + "", NULL, + "", NULL, "", + "", reply_part, NULL, "", "", + "", "", + "" +}; static void show_reply_headers (GMimeMessage *message) @@ -72,44 +57,53 @@ show_reply_headers (GMimeMessage *message) } static void -reply_part (GMimeObject *part, int *part_count) +reply_part (GMimeObject *part, + unused (int *part_count)) { - GMimeContentDisposition *disposition; - GMimeContentType *content_type; + GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); + GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part); - (void) part_count; - disposition = g_mime_object_get_content_disposition (part); - if (disposition && - strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) + if (g_mime_content_type_is_type (content_type, "text", "*") && + !g_mime_content_type_is_type (content_type, "text", "html")) { - 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")) + GMimeStream *stream_stdout = NULL, *stream_filter = NULL; + GMimeDataWrapper *wrapper; + const char *charset; + + charset = g_mime_object_get_content_type_parameter (part, "charset"); + 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); + if (charset) { + g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter), + g_mime_filter_charset_new(charset, "UTF-8")); + } + } + 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 + { + if (disposition && + strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) { - reply_part_content (part); + const char *filename = g_mime_part_get_filename (GMIME_PART (part)); + printf ("Attachment: %s (%s)\n", filename, + g_mime_content_type_to_string (content_type)); } else { - printf ("Attachment: %s (%s)\n", filename, + printf ("Non-text part: %s\n", 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 - { - printf ("Non-text part: %s\n", - g_mime_content_type_to_string (content_type)); } } @@ -119,7 +113,7 @@ static int address_is_users (const char *address, notmuch_config_t *config) { const char *primary; - char **other; + const char **other; size_t i, other_len; primary = notmuch_config_get_user_primary_email (config); @@ -312,12 +306,13 @@ static const char * guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message) { const char *received,*primary,*by; - char **other,*tohdr; + const char **other; + char *tohdr; char *mta,*ptr,*token; char *domain=NULL; char *tld=NULL; const char *delim=". \t"; - size_t i,other_len; + size_t i,j,other_len; const char *to_headers[] = {"Envelope-to", "X-Original-To"}; @@ -348,10 +343,10 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message free(tohdr); return primary; } - for (i = 0; i < other_len; i++) - if (strcasestr (tohdr, other[i])) { + for (j = 0; j < other_len; j++) + if (strcasestr (tohdr, other[j])) { free(tohdr); - return other[i]; + return other[j]; } free(tohdr); } @@ -446,6 +441,9 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_ notmuch_message_t *message; const char *subject, *from_addr = NULL; const char *in_reply_to, *orig_references, *references; + const notmuch_show_format_t *format = &format_reply; + notmuch_show_params_t params; + params.part = -1; for (messages = notmuch_query_search_messages (query); notmuch_messages_valid (messages); @@ -481,9 +479,6 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_ g_mime_object_set_header (GMIME_OBJECT (reply), "From", from_addr); - g_mime_object_set_header (GMIME_OBJECT (reply), "Bcc", - notmuch_config_get_user_primary_email (config)); - in_reply_to = talloc_asprintf (ctx, "<%s>", notmuch_message_get_message_id (message)); @@ -507,7 +502,8 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_ notmuch_message_get_header (message, "date"), notmuch_message_get_header (message, "from")); - show_message_body (notmuch_message_get_filename (message), reply_part); + show_message_body (notmuch_message_get_filename (message), + format, ¶ms); notmuch_message_destroy (message); } @@ -558,9 +554,6 @@ notmuch_reply_format_headers_only(void *ctx, notmuch_config_t *config, notmuch_q (void)add_recipients_from_message (reply, config, message); - g_mime_object_set_header (GMIME_OBJECT (reply), "Bcc", - notmuch_config_get_user_primary_email (config)); - reply_headers = g_mime_object_to_string (GMIME_OBJECT (reply)); printf ("%s", reply_headers); free (reply_headers);