int i;
unsigned int n = 0;
+ if (list == NULL)
+ return 0;
+
for (i = 0; i < internet_address_list_length (list); i++) {
address = internet_address_list_get_address (list, i);
if (INTERNET_ADDRESS_IS_GROUP (address)) {
group = INTERNET_ADDRESS_GROUP (address);
group_list = internet_address_group_get_members (group);
- if (group_list == NULL)
- continue;
-
n += scan_address_list (group_list, config, message, type, user_from);
} else {
InternetAddressMailbox *mailbox;
return n;
}
-/* Scan addresses in 'recipients'.
- *
- * See the documentation of scan_address_list() above. This function
- * does exactly the same, but converts 'recipients' to an
- * InternetAddressList first.
- */
-static unsigned int
-scan_address_string (const char *recipients,
- notmuch_config_t *config,
- GMimeMessage *message,
- GMimeRecipientType type,
- const char **user_from)
-{
- InternetAddressList *list;
-
- if (recipients == NULL)
- return 0;
-
- list = internet_address_list_parse_string (recipients);
- if (list == NULL)
- return 0;
-
- return scan_address_list (list, config, message, type, user_from);
-}
-
/* 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 const char *get_sender(notmuch_message_t *message)
+static InternetAddressList *get_sender(GMimeMessage *message)
{
const char *reply_to;
- reply_to = notmuch_message_get_header (message, "reply-to");
+ 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
* 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 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 notmuch_message_get_header (message, "from");
+ return internet_address_list_parse_string (
+ g_mime_message_get_sender (message));
}
-static const char *get_to(notmuch_message_t *message)
+static InternetAddressList *get_to(GMimeMessage *message)
{
- return notmuch_message_get_header (message, "to");
+ return g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);
}
-static const char *get_cc(notmuch_message_t *message)
+static InternetAddressList *get_cc(GMimeMessage *message)
{
- return notmuch_message_get_header (message, "cc");
+ return g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);
}
-static const char *get_bcc(notmuch_message_t *message)
+static InternetAddressList *get_bcc(GMimeMessage *message)
{
- return notmuch_message_get_header (message, "bcc");
+ return g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_BCC);
}
/* Augment the recipients of 'reply' from the "Reply-to:", "From:",
static const char *
add_recipients_from_message (GMimeMessage *reply,
notmuch_config_t *config,
- notmuch_message_t *message,
+ GMimeMessage *message,
notmuch_bool_t reply_all)
{
struct {
- const char * (*get_header)(notmuch_message_t *message);
+ InternetAddressList * (*get_header)(GMimeMessage *message);
GMimeRecipientType recipient_type;
} reply_to_map[] = {
{ get_sender, GMIME_RECIPIENT_TYPE_TO },
unsigned int n = 0;
for (i = 0; i < ARRAY_SIZE (reply_to_map); i++) {
- const char *recipients;
+ InternetAddressList *recipients;
recipients = reply_to_map[i].get_header (message);
- n += scan_address_string (recipients, config, reply,
- reply_to_map[i].recipient_type, &from_addr);
+ n += scan_address_list (recipients, config, reply,
+ reply_to_map[i].recipient_type, &from_addr);
if (!reply_all && n) {
/* Stop adding new recipients in reply-to-sender mode if
create_reply_message(void *ctx,
notmuch_config_t *config,
notmuch_message_t *message,
+ GMimeMessage *mime_message,
notmuch_bool_t reply_all,
notmuch_bool_t limited)
{
g_mime_object_set_header (GMIME_OBJECT (reply), "References", references);
from_addr = add_recipients_from_message (reply, config,
- message, reply_all);
+ mime_message, reply_all);
/* The above is all that is needed for limited headers. */
if (limited)
if (mime_node_open (config, message, ¶ms->crypto, &node))
return 1;
- reply = create_reply_message (config, config, message, reply_all,
+ reply = create_reply_message (config, config, message,
+ GMIME_MESSAGE (node->part), reply_all,
format == FORMAT_HEADERS_ONLY);
if (!reply)
return 1;
projects / notmuch / blobdiff