Integrate notmuch-fcc mechansim

[notmuch] / notmuch-reply.c

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 39377e1842fb101b8935790bd1ef6f35806dd44f..7c4314678d79fc3baec32b49b9fbbdca5631a3b6 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -22,6 +22,7 @@
 
 #include "notmuch-client.h"
 #include "gmime-filter-reply.h"
+#include "gmime-filter-headers.h"
 
 static void
 reply_part_content (GMimeObject *part)
@@ -51,6 +52,25 @@ reply_part_content (GMimeObject *part)
        g_object_unref(stream_stdout);
 }
 
+static void
+show_reply_headers (GMimeMessage *message)
+{
+    GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
+
+    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 (stream_filter) {
+               g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
+                                        g_mime_filter_headers_new());
+               g_mime_object_write_to_stream(GMIME_OBJECT(message), stream_filter);
+               g_object_unref(stream_filter);
+       }
+       g_object_unref(stream_stdout);
+    }
+}
+
 static void
 reply_part (GMimeObject *part, int *part_count)
 {
@@ -181,6 +201,9 @@ add_recipients_for_string (GMimeMessage *message,
 {
     InternetAddressList *list;
 
+    if (recipients == NULL)
+       return NULL;
+
     list = internet_address_list_parse_string (recipients);
     if (list == NULL)
        return NULL;
@@ -194,16 +217,16 @@ add_recipients_for_string (GMimeMessage *message,
 static int
 reply_to_header_is_redundant (notmuch_message_t *message)
 {
-    const char *header, *addr;
+    const char *reply_to, *to, *cc, *addr;
     InternetAddressList *list;
     InternetAddress *address;
     InternetAddressMailbox *mailbox;
 
-    header = notmuch_message_get_header (message, "reply-to");
-    if (*header == '\0')
+    reply_to = notmuch_message_get_header (message, "reply-to");
+    if (reply_to == NULL || *reply_to == '\0')
        return 0;
 
-    list = internet_address_list_parse_string (header);
+    list = internet_address_list_parse_string (reply_to);
 
     if (internet_address_list_length (list) != 1)
        return 0;
@@ -215,8 +238,11 @@ reply_to_header_is_redundant (notmuch_message_t *message)
     mailbox = INTERNET_ADDRESS_MAILBOX (address);
     addr = internet_address_mailbox_get_addr (mailbox);
 
-    if (strstr (notmuch_message_get_header (message, "to"), addr) != 0 ||
-       strstr (notmuch_message_get_header (message, "cc"), addr) != 0)
+    to = notmuch_message_get_header (message, "to");
+    cc = notmuch_message_get_header (message, "cc");
+
+    if ((to && strstr (to, addr) != 0) ||
+       (cc && strstr (cc, addr) != 0))
     {
        return 1;
     }
@@ -294,6 +320,9 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message
     size_t i,other_len;
 
     received = notmuch_message_get_header (message, "received");
+    if (received == NULL)
+       return NULL;
+
     by = strstr (received, " by ");
     if (by && *(by+4)) {
        /* sadly, the format of Received: headers is a bit inconsistent,
@@ -352,7 +381,6 @@ 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;
-    char *reply_headers;
 
     for (messages = notmuch_query_search_messages (query);
         notmuch_messages_valid (messages);
@@ -368,10 +396,11 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_
        }
 
        subject = notmuch_message_get_header (message, "subject");
-
-       if (strncasecmp (subject, "Re:", 3))
-           subject = talloc_asprintf (ctx, "Re: %s", subject);
-       g_mime_message_set_subject (reply, subject);
+       if (subject) {
+           if (strncasecmp (subject, "Re:", 3))
+               subject = talloc_asprintf (ctx, "Re: %s", subject);
+           g_mime_message_set_subject (reply, subject);
+       }
 
        from_addr = add_recipients_from_message (reply, config, message);
 
@@ -404,9 +433,7 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_
        g_mime_object_set_header (GMIME_OBJECT (reply),
                                  "References", references);
 
-       reply_headers = g_mime_object_to_string (GMIME_OBJECT (reply));
-       printf ("%s", reply_headers);
-       free (reply_headers);
+       show_reply_headers (reply);
 
        g_object_unref (G_OBJECT (reply));
        reply = NULL;