cli/reply: only pass gmime message to add recipients to reply message

[notmuch] / notmuch-reply.c

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 98034485c546080f48a8c1a9161a584d65fb7412..8c894974485d4f4ae32997388425904640d941da 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -230,45 +230,56 @@ scan_address_list (InternetAddressList *list,
 /* Does the address in the Reply-To header of 'message' already appear
  * in either the 'To' or 'Cc' header of the message?
  */
-static int
-reply_to_header_is_redundant (notmuch_message_t *message, const char *reply_to)
+static notmuch_bool_t
+reply_to_header_is_redundant (GMimeMessage *message,
+                             InternetAddressList *reply_to_list)
 {
-    const char *to, *cc, *addr;
-    InternetAddressList *list;
+    const char *addr, *reply_to;
     InternetAddress *address;
     InternetAddressMailbox *mailbox;
+    InternetAddressList *recipients;
+    notmuch_bool_t ret = FALSE;
+    int i;
 
-    list = internet_address_list_parse_string (reply_to);
-
-    if (internet_address_list_length (list) != 1)
+    if (reply_to_list == NULL ||
+       internet_address_list_length (reply_to_list) != 1)
        return 0;
 
-    address = internet_address_list_get_address (list, 0);
+    address = internet_address_list_get_address (reply_to_list, 0);
     if (INTERNET_ADDRESS_IS_GROUP (address))
        return 0;
 
     mailbox = INTERNET_ADDRESS_MAILBOX (address);
-    addr = internet_address_mailbox_get_addr (mailbox);
+    reply_to = internet_address_mailbox_get_addr (mailbox);
 
-    to = notmuch_message_get_header (message, "to");
-    cc = notmuch_message_get_header (message, "cc");
+    recipients = g_mime_message_get_all_recipients (message);
 
-    if ((to && strstr (to, addr) != 0) ||
-       (cc && strstr (cc, addr) != 0))
-    {
-       return 1;
+    for (i = 0; i < internet_address_list_length (recipients); i++) {
+       address = internet_address_list_get_address (recipients, i);
+       if (INTERNET_ADDRESS_IS_GROUP (address))
+           continue;
+
+       mailbox = INTERNET_ADDRESS_MAILBOX (address);
+       addr = internet_address_mailbox_get_addr (mailbox);
+       if (strcmp (addr, reply_to) == 0) {
+           ret = TRUE;
+           break;
+       }
     }
 
-    return 0;
+    g_object_unref (G_OBJECT (recipients));
+
+    return ret;
 }
 
-static InternetAddressList *get_sender(notmuch_message_t *message,
-                                      GMimeMessage *mime_message)
+static InternetAddressList *get_sender(GMimeMessage *message)
 {
     const char *reply_to;
 
-    reply_to = g_mime_message_get_reply_to (mime_message);
+    reply_to = g_mime_message_get_reply_to (message);
     if (reply_to && *reply_to) {
+       InternetAddressList *reply_to_list;
+
         /*
         * Some mailing lists munge the Reply-To header despite it
         * being A Bad Thing, see
@@ -282,33 +293,30 @@ static InternetAddressList *get_sender(notmuch_message_t *message,
         * to the list. Note that the address in the Reply-To header
         * will always appear in the reply if reply_all is true.
         */
-       if (! reply_to_header_is_redundant (message, reply_to))
-           return internet_address_list_parse_string (reply_to);
+       reply_to_list = internet_address_list_parse_string (reply_to);
+       if (! reply_to_header_is_redundant (message, reply_to_list))
+           return reply_to_list;
+
+       g_object_unref (G_OBJECT (reply_to_list));
     }
 
     return internet_address_list_parse_string (
-       g_mime_message_get_sender (mime_message));
+       g_mime_message_get_sender (message));
 }
 
-static InternetAddressList *get_to(unused(notmuch_message_t *message),
-                                  GMimeMessage *mime_message)
+static InternetAddressList *get_to(GMimeMessage *message)
 {
-    return g_mime_message_get_recipients (mime_message,
-                                         GMIME_RECIPIENT_TYPE_TO);
+    return g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);
 }
 
-static InternetAddressList *get_cc(unused(notmuch_message_t *message),
-                                  GMimeMessage *mime_message)
+static InternetAddressList *get_cc(GMimeMessage *message)
 {
-    return g_mime_message_get_recipients (mime_message,
-                                         GMIME_RECIPIENT_TYPE_CC);
+    return g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);
 }
 
-static InternetAddressList *get_bcc(unused(notmuch_message_t *message),
-                                   GMimeMessage *mime_message)
+static InternetAddressList *get_bcc(GMimeMessage *message)
 {
-    return g_mime_message_get_recipients (mime_message,
-                                         GMIME_RECIPIENT_TYPE_BCC);
+    return g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_BCC);
 }
 
 /* Augment the recipients of 'reply' from the "Reply-to:", "From:",
@@ -326,13 +334,11 @@ static InternetAddressList *get_bcc(unused(notmuch_message_t *message),
 static const char *
 add_recipients_from_message (GMimeMessage *reply,
                             notmuch_config_t *config,
-                            notmuch_message_t *message,
-                            GMimeMessage *mime_message,
+                            GMimeMessage *message,
                             notmuch_bool_t reply_all)
 {
     struct {
-       InternetAddressList * (*get_header)(notmuch_message_t *message,
-                                           GMimeMessage *mime_message);
+       InternetAddressList * (*get_header)(GMimeMessage *message);
        GMimeRecipientType recipient_type;
     } reply_to_map[] = {
        { get_sender,   GMIME_RECIPIENT_TYPE_TO },
@@ -347,7 +353,7 @@ add_recipients_from_message (GMimeMessage *reply,
     for (i = 0; i < ARRAY_SIZE (reply_to_map); i++) {
        InternetAddressList *recipients;
 
-       recipients = reply_to_map[i].get_header (message, mime_message);
+       recipients = reply_to_map[i].get_header (message);
 
        n += scan_address_list (recipients, config, reply,
                                reply_to_map[i].recipient_type, &from_addr);
@@ -552,7 +558,7 @@ create_reply_message(void *ctx,
 
     g_mime_object_set_header (GMIME_OBJECT (reply), "References", references);
 
-    from_addr = add_recipients_from_message (reply, config, message,
+    from_addr = add_recipients_from_message (reply, config,
                                             mime_message, reply_all);
 
     /* The above is all that is needed for limited headers. */