Fix linking with gcc to use g++ to link in C++ libs.

[notmuch] / notmuch-reply.c

diff --git a/notmuch-reply.c b/notmuch-reply.c
index d2fc6d9213c32b6cb6711c32795b12534a7d62fb..4a4a782b1636a269aa505f8b560f06eaa2cd337c 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -24,7 +24,7 @@
 #include "gmime-filter-reply.h"
 
 static void
-reply_part(GMimeObject *part, int *part_count)
+reply_part (GMimeObject *part, int *part_count)
 {
     GMimeContentDisposition *disposition;
     GMimeContentType *content_type;
@@ -182,12 +182,13 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
     char *reply_headers;
     struct {
        const char *header;
+       const char *fallback;
        GMimeRecipientType recipient_type;
     } reply_to_map[] = {
-       { "from", GMIME_RECIPIENT_TYPE_TO  },
-       { "to",   GMIME_RECIPIENT_TYPE_TO  },
-       { "cc",   GMIME_RECIPIENT_TYPE_CC  },
-       { "bcc",  GMIME_RECIPIENT_TYPE_BCC }
+       { "reply-to", "from", GMIME_RECIPIENT_TYPE_TO  },
+       { "to",         NULL, GMIME_RECIPIENT_TYPE_TO  },
+       { "cc",         NULL, GMIME_RECIPIENT_TYPE_CC  },
+       { "bcc",        NULL, GMIME_RECIPIENT_TYPE_BCC }
     };
     unsigned int i;
 
@@ -211,7 +212,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
        return 1;
     }
 
-    for (messages = notmuch_query_search_messages (query);
+    for (messages = notmuch_query_search_messages (query, 0, -1);
         notmuch_messages_has_more (messages);
         notmuch_messages_advance (messages))
     {
@@ -235,6 +236,10 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
 
            recipients = notmuch_message_get_header (message,
                                                     reply_to_map[i].header);
+           if ((recipients == NULL || recipients[0] == '\0') && reply_to_map[i].fallback)
+               recipients = notmuch_message_get_header (message,
+                                                        reply_to_map[i].fallback);
+
            addr = add_recipients_for_string (reply, config,
                                              reply_to_map[i].recipient_type,
                                              recipients);
@@ -251,6 +256,9 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
        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));