X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=23990704c997940a3223617d8bf2831c8f5550cf;hp=b64155a029ffbc2268c091168a0ea04003612a1d;hb=a31e3b7e2d3779420c9e0b62fc0ffba214137f0e;hpb=28f0cd15d250984655429a840bf478910db032f1 diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index b64155a..2399070 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -61,18 +61,20 @@ static gboolean is_ascii(const gchar *s); TnyMsg* modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, - const gchar *bcc, const gchar* subject, const gchar *body, + const gchar *bcc, const gchar* subject, + const gchar *references, const gchar *in_reply_to, + const gchar *body, GList *attachments, gint *attached, GError **err) { TnyMsg *new_msg; TnyHeader *header; gchar *content_type; gint tmp_attached = 0; - + /* Create new msg */ new_msg = modest_formatter_create_message (NULL, TRUE, (attachments != NULL), FALSE); header = tny_msg_get_header (new_msg); - + if ((from != NULL) && (strlen(from) > 0)) { tny_header_set_from (TNY_HEADER (header), from); tny_header_set_replyto (TNY_HEADER (header), from); @@ -82,12 +84,12 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, tny_header_set_to (TNY_HEADER (header), removed_to); g_free (removed_to); } - if ((cc != NULL) && (strlen(cc) > 0)) + if ((cc != NULL) && (strlen(cc) > 0)) tny_header_set_cc (TNY_HEADER (header), cc); - if ((bcc != NULL) && (strlen(bcc) > 0)) + if ((bcc != NULL) && (strlen(bcc) > 0)) tny_header_set_bcc (TNY_HEADER (header), bcc); - - if ((subject != NULL) && (strlen(subject) > 0)) + + if ((subject != NULL) && (strlen(subject) > 0)) tny_header_set_subject (TNY_HEADER (header), subject); content_type = get_content_type(body); @@ -98,12 +100,18 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, */ tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "X-Mailer", "Modest " VERSION); - + + if (references) + tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "References", references); + + if (in_reply_to) + tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "In-Reply-To", in_reply_to); + /* Add the body of the new mail */ /* This is needed even if body is NULL or empty. */ add_body_part (new_msg, body, content_type); g_free (content_type); - + /* Add attachments */ if (attachments) tmp_attached = add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err); @@ -118,6 +126,7 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, TnyMsg* modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gchar *cc, const gchar *bcc, const gchar* subject, + const gchar *references, const gchar *in_reply_to, const gchar *html_body, const gchar *plain_body, GList *attachments, GList *images, gint *attached, GError **err) { @@ -153,6 +162,12 @@ modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gch tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "X-Mailer", "Modest " VERSION); + if (references) + tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "References", references); + + if (in_reply_to) + tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "In-Reply-To", in_reply_to); + /* Add the body of the new mail */ add_body_part (new_msg, plain_body, content_type); add_html_body_part (new_msg, html_body); @@ -319,8 +334,8 @@ add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline old_attachment = pos->data; if (!tny_mime_part_is_purged (old_attachment)) { - const gchar *old_cid; - old_cid = tny_mime_part_get_content_id (old_attachment); + gchar *old_cid; + old_cid = g_strdup (tny_mime_part_get_content_id (old_attachment)); attachment_part = copy_mime_part (old_attachment, err); if (attachment_part != NULL) { if (add_inline) { @@ -328,20 +343,30 @@ add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline "inline"); } else { const gchar *filename; + filename = tny_mime_part_get_filename (old_attachment); - if (filename) - tny_mime_part_set_filename (attachment_part, filename); - else + if (filename) { + /* If the mime part has a filename do not set it again + because Camel won't replace the old one. Instead it + will append the filename to the old one and that will + mislead email clients */ + if (!tny_mime_part_get_filename (attachment_part)) + tny_mime_part_set_filename (attachment_part, filename); + } else { tny_mime_part_set_header_pair (attachment_part, "Content-Disposition", "attachment"); + } + } + if (!TNY_IS_MSG (old_attachment)) { + tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64"); } - tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64"); ret = tny_mime_part_add_part (TNY_MIME_PART (part), attachment_part); attached++; if (old_cid) tny_mime_part_set_content_id (attachment_part, old_cid); g_object_unref (attachment_part); } + g_free (old_cid); } } return attached; @@ -365,7 +390,7 @@ add_images (TnyMsg *msg, GList *images_list, GError **err) while (!tny_iterator_is_done (iter)) { TnyMimePart *part = TNY_MIME_PART (tny_iterator_get_current (iter)); - if (part && !g_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) { + if (part && !g_ascii_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) { related_part = part; break; } @@ -427,10 +452,55 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_html) } +static TnyMimePart* +modest_tny_msg_find_body_part_in_alternative (TnyMimePart *msg, gboolean want_html) +{ + TnyList *parts; + TnyIterator *iter; + TnyMimePart *part = NULL; + TnyMimePart *first_part = NULL; + const gchar *desired_mime_type = want_html ? "text/html" : "text/plain"; + + parts = TNY_LIST (tny_simple_list_new()); + tny_mime_part_get_parts (TNY_MIME_PART (msg), parts); + + for (iter = tny_list_create_iterator(parts); + !tny_iterator_is_done (iter); + tny_iterator_next (iter)) { + gchar *content_type; + gboolean is_body; + + part = TNY_MIME_PART (tny_iterator_get_current (iter)); + + if (first_part == NULL) { + g_object_ref (part); + first_part = part; + } + + is_body = FALSE; + content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1); + is_body = g_str_has_prefix (content_type, desired_mime_type); + if (is_body) + break; + + g_object_unref (part); + part = NULL; + + } + g_object_unref (iter); + g_object_unref (parts); + + if (part == NULL) { + return first_part; + } else { + if (first_part) g_object_unref (first_part); + return part; + } +} + TnyMimePart* modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_html) { - const gchar *desired_mime_type = want_html ? "text/html" : "text/plain"; TnyMimePart *part = NULL; TnyList *parts = NULL; TnyIterator *iter = NULL; @@ -455,6 +525,12 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht g_free (header_content_type); return NULL; } + if (header_content_type_lower && + g_str_has_prefix (header_content_type_lower, "multipart/alternative")) { + g_free (header_content_type_lower); + g_free (header_content_type); + return modest_tny_msg_find_body_part_in_alternative (msg, want_html); + } g_free (header_content_type_lower); g_free (header_content_type); @@ -518,13 +594,23 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht g_free (content_disp); } - if (g_str_has_prefix (content_type, desired_mime_type) && + if (g_str_has_prefix (content_type, "text/") && !has_content_disp_name && !modest_tny_mime_part_is_attachment_for_modest (part)) { - /* we found the desired mime-type! */ + /* we found the body. Doesn't have to be the desired mime part, first + text/ part in a mixed is the body */ g_free (content_type); break; + } else if (g_str_has_prefix(content_type, "multipart/alternative")) { + + /* multipart? recurse! */ + g_object_unref (part); + g_free (content_type); + part = modest_tny_msg_find_body_part_in_alternative (part, want_html); + if (part) + break; + } else if (g_str_has_prefix(content_type, "multipart")) { /* multipart? recurse! */ @@ -549,14 +635,8 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht g_object_unref (G_OBJECT(iter)); g_object_unref (G_OBJECT(parts)); - /* if were trying to find an HTML part and couldn't find it, - * try to find a text/plain part instead - */ - if (!part && want_html) - return modest_tny_msg_find_body_part_from_mime_part (msg, FALSE); - else - return part; /* this maybe NULL, this is not an error; some message just don't have a body - * part */ + return part; /* this maybe NULL, this is not an error; some message just don't have a body + * part */ } @@ -582,10 +662,13 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, gchar *old_subject; gchar *new_subject; TnyMimePart *body = NULL; + TnyMimePart *html_body = NULL; ModestFormatter *formatter; gchar *subject_prefix; gboolean no_text_part; - + gchar *parent_uid; + gboolean forward_as_attach = FALSE; + if (header) g_object_ref (header); else @@ -593,8 +676,10 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, /* Get body from original msg. Always look for the text/plain part of the message to create the reply/forwarded mail */ - if (msg != NULL) + if (msg != NULL) { body = modest_tny_msg_find_body_part (msg, FALSE); + html_body = modest_tny_msg_find_body_part (msg, TRUE); + } if (modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL)) @@ -608,14 +693,14 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, /* when we're reply, include the text part if we have it, or nothing otherwise. */ if (is_reply) - new_msg = modest_formatter_quote (formatter, no_text_part ? NULL: body, header, + new_msg = modest_formatter_quote (formatter, body, header, attachments); else { - /* for attachements; inline if there is a text part, and include the - * full old mail if there was none */ - if (no_text_part) { + if (no_text_part || (html_body && (strcmp (tny_mime_part_get_content_type (html_body), "text/html")==0))) { + forward_as_attach = TRUE; new_msg = modest_formatter_attach (formatter, msg, header); - } else { + } else { + forward_as_attach = FALSE; new_msg = modest_formatter_inline (formatter, body, header, attachments); } @@ -624,9 +709,11 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, g_object_unref (G_OBJECT(formatter)); if (body) g_object_unref (G_OBJECT(body)); + if (html_body) + g_object_unref (G_OBJECT(html_body)); /* Fill the header */ - new_header = tny_msg_get_header (new_msg); + new_header = tny_msg_get_header (new_msg); tny_header_set_from (new_header, from); tny_header_set_replyto (new_header, from); @@ -643,13 +730,11 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, g_free (subject_prefix); tny_header_set_subject (new_header, (const gchar *) new_subject); g_free (new_subject); - + /* get the parent uid, and set it as a gobject property on the new msg */ - if (new_msg) { - gchar* parent_uid = modest_tny_folder_get_header_unique_id (header); - g_object_set_data_full (G_OBJECT(new_msg), MODEST_TNY_MSG_PARENT_UID, - parent_uid, g_free); - } + parent_uid = modest_tny_folder_get_header_unique_id (header); + g_object_set_data_full (G_OBJECT(new_msg), MODEST_TNY_MSG_PARENT_UID, + parent_uid, g_free); /* set modest as the X-Mailer * we could this in the platform factory, but then the header @@ -663,7 +748,7 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, g_object_unref (G_OBJECT (header)); /* ugly to unref it here instead of in the calling func */ - if (!is_reply & !no_text_part) { + if (!is_reply & !forward_as_attach) { add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, NULL); } @@ -678,6 +763,101 @@ modest_tny_msg_get_parent_uid (TnyMsg *msg) return g_object_get_data (G_OBJECT(msg), MODEST_TNY_MSG_PARENT_UID); } +static gchar *get_signed_protocol (TnyMimePart *part) +{ + TnyList *header_pairs; + TnyIterator *iterator; + gchar *result = NULL; + + header_pairs = TNY_LIST (tny_simple_list_new ()); + tny_mime_part_get_header_pairs (part, header_pairs); + iterator = tny_list_create_iterator (header_pairs); + + while (!result && !tny_iterator_is_done (iterator)) { + TnyPair *pair; + const gchar *name; + + pair = TNY_PAIR (tny_iterator_get_current (iterator)); + name = tny_pair_get_name (pair); + if (name && !g_ascii_strcasecmp (name, "Content-Type")) { + const gchar *s; + s = tny_pair_get_value (pair); + if (s) { + s = strstr (s, "protocol="); + if (s) { + const gchar *t; + s += 9; + if (*s == '\"') { + s++; + t = strstr (s, "\""); + } else { + t = strstr (s, ";"); + } + result = g_strndup (s, t - s); + } + } + } + + g_object_unref (pair); + tny_iterator_next (iterator); + } + + g_object_unref (iterator); + g_object_unref (header_pairs); + + return result; +} + +TnyMimePart * +modest_tny_msg_get_attachments_parent (TnyMsg *msg) +{ + TnyMimePart *result; + const gchar *content_type; + + result = NULL; + + content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg)); + if (content_type && !strcmp (content_type, "multipart/signed")) { + TnyList *msg_children; + TnyIterator *iterator; + gchar *signed_protocol; + + msg_children = TNY_LIST (tny_simple_list_new ()); + tny_mime_part_get_parts (TNY_MIME_PART (msg), msg_children); + + iterator = tny_list_create_iterator (msg_children); + signed_protocol = get_signed_protocol (TNY_MIME_PART (msg)); + + while (!result && !tny_iterator_is_done (iterator)) { + TnyMimePart *part; + + part = TNY_MIME_PART (tny_iterator_get_current (iterator)); + if (signed_protocol) { + const gchar *part_content_type; + + part_content_type = tny_mime_part_get_content_type (part); + if (part_content_type && g_ascii_strcasecmp (part_content_type, signed_protocol)) { + result = g_object_ref (part); + } + } else { + result = g_object_ref (part); + } + + g_object_unref (part); + tny_iterator_next (iterator); + } + + g_object_unref (iterator); + g_free (signed_protocol); + g_object_unref (msg_children); + } + if (result == NULL) { + result = g_object_ref (msg); + } + + return result; +} + static void @@ -704,12 +884,15 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg, TnyMsg *new_msg; TnyList *parts = NULL; GList *attachments_list = NULL; + TnyMimePart *part_to_check = NULL; g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL); + + part_to_check = modest_tny_msg_get_attachments_parent (TNY_MSG (msg)); /* Add attachments */ parts = TNY_LIST (tny_simple_list_new()); - tny_mime_part_get_parts (TNY_MIME_PART (msg), parts); + tny_mime_part_get_parts (TNY_MIME_PART (part_to_check), parts); tny_list_foreach (parts, add_if_attachment, &attachments_list); new_msg = create_reply_forward_mail (msg, NULL, from, signature, FALSE, forward_type, @@ -721,6 +904,7 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg, g_list_free (attachments_list); } g_object_unref (G_OBJECT (parts)); + g_object_unref (part_to_check); return new_msg; } @@ -744,6 +928,38 @@ count_addresses (const gchar* addresses) return count; } +static void +remove_undisclosed_recipients (gchar **recipients) +{ + GSList *addresses, *node; + gboolean is_first; + GString *result; + + g_return_if_fail (recipients); + addresses = modest_text_utils_split_addresses_list (*recipients); + + is_first = TRUE; + result = g_string_new (""); + for (node = addresses; node != NULL; node = g_slist_next (node)) { + const gchar *address = (const gchar *) node->data; + + if (address && strstr (address, "undisclosed-recipients")) + continue; + + if (is_first) + is_first = FALSE; + else + result = g_string_append (result, ", "); + + result = g_string_append (result, address); + } + g_slist_foreach (addresses, (GFunc)g_free, NULL); + g_slist_free (addresses); + + g_free (*recipients); + *recipients = g_string_free (result, FALSE); +} + /* get the new To:, based on the old header, * result is newly allocated or NULL in case of error @@ -752,9 +968,12 @@ static gchar* get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, ModestTnyMsgReplyMode reply_mode) { + const gchar *reply_header = "Reply-To:"; + const gchar *from_header = "From:"; gchar* old_reply_to; gchar* old_from; gchar* new_to; + gchar* tmp; /* according to RFC2369 (http://www.faqs.org/rfcs/rfc2369.html), we * can identify Mailing-List posts by the List-Help header. @@ -771,13 +990,25 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, old_reply_to = modest_tny_mime_part_get_header_value (TNY_MIME_PART(msg), "Reply-To"); old_from = tny_header_dup_from (header); - + if (!old_from && !old_reply_to) { - g_warning ("%s: failed to get either Reply-To: or From: from header", + g_debug ("%s: failed to get either Reply-To: or From: from header", __FUNCTION__); return NULL; } - + + /* Prevent DoS attacks caused by malformed emails */ + if (old_from) { + gchar *tmp = old_from; + old_from = modest_text_utils_get_secure_header ((const gchar *) tmp, from_header); + g_free (tmp); + } + if (old_reply_to) { + gchar *tmp = old_reply_to; + old_reply_to = modest_text_utils_get_secure_header ((const gchar *) tmp, reply_header); + g_free (tmp); + } + /* for mailing lists, use both Reply-To and From if we did a * 'Reply All:' * */ @@ -794,7 +1025,7 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, if (reply_mode == MODEST_TNY_MSG_REPLY_MODE_ALL) { gchar *old_to = tny_header_dup_to (header); if (!old_to) - g_warning ("%s: no To: address found in source mail", + g_debug ("%s: no To: address found in source mail", __FUNCTION__); else { /* append the old To: */ @@ -818,6 +1049,11 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, } } + tmp = modest_text_utils_simplify_recipients (new_to); + remove_undisclosed_recipients (&tmp); + g_free (new_to); + new_to = tmp; + return new_to; } @@ -825,7 +1061,7 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, /* get the new Cc:, based on the old header, * result is newly allocated or NULL in case of error */ static gchar* -get_new_cc (TnyHeader *header, const gchar* from) +get_new_cc (TnyHeader *header, const gchar* from, const gchar *new_to) { gchar *old_cc, *result, *dup; @@ -835,12 +1071,133 @@ get_new_cc (TnyHeader *header, const gchar* from) /* remove me (the new From:) from the Cc: list */ dup = modest_text_utils_remove_address (old_cc, from); + + if (new_to) { + gchar **to_parts, **current; + + to_parts = g_strsplit (new_to, ",", 0); + for (current = to_parts; current && *current != '\0'; current++) { + gchar *dup2; + + dup2 = modest_text_utils_remove_address (dup, g_strstrip (*current)); + g_free (dup); + dup = dup2; + } + g_strfreev (to_parts); + } + result = modest_text_utils_remove_duplicate_addresses (dup); g_free (dup); + dup = result; + result = modest_text_utils_simplify_recipients (dup); + remove_undisclosed_recipients (&result); + g_free (dup); g_free (old_cc); return result; } +void +modest_tny_msg_get_references (TnyMsg *msg, gchar **message_id, gchar **references, gchar **in_reply_to) +{ + TnyList *headers; + TnyIterator *iterator; + gchar *l_message_id; + gchar *l_references; + gchar *l_in_reply_to; + + g_return_if_fail (TNY_IS_MSG (msg)); + + l_message_id = NULL; + l_references = NULL; + l_in_reply_to = NULL; + + headers = TNY_LIST (tny_simple_list_new ()); + tny_mime_part_get_header_pairs (TNY_MIME_PART (msg), headers); + + iterator = tny_list_create_iterator (headers); + while (!tny_iterator_is_done (iterator)) { + TnyPair *pair; + const gchar *name; + + pair = TNY_PAIR (tny_iterator_get_current (iterator)); + name = tny_pair_get_name (pair); + if (!g_ascii_strcasecmp (name, "References")) { + if (l_references) g_free (l_references); + l_references = g_strdup (tny_pair_get_value (pair)); + } else if (!g_ascii_strcasecmp (name, "In-Reply-To")) { + if (l_in_reply_to) g_free (l_in_reply_to); + l_in_reply_to = g_strdup (tny_pair_get_value (pair)); + } else if (!g_ascii_strcasecmp (name, "Message-ID")) { + if (l_message_id) g_free (l_message_id); + l_message_id = g_strdup (tny_pair_get_value (pair)); + } + + g_object_unref (pair); + tny_iterator_next (iterator); + } + + g_object_unref (iterator); + g_object_unref (headers); + + if (message_id) { + *message_id = l_message_id; + } else { + g_free (l_message_id); + } + + if (in_reply_to) { + *in_reply_to = l_in_reply_to; + } else { + g_free (l_in_reply_to); + } + + if (references) { + *references = l_references; + } else { + g_free (l_references); + } +} + +static void +set_references (TnyMsg *reply_msg, TnyMsg *original_msg) +{ + gchar *orig_references, *orig_in_reply_to, *orig_message_id; + gchar *references, *in_reply_to; + + modest_tny_msg_get_references (original_msg, &orig_message_id, &orig_references, &orig_in_reply_to); + + references = NULL; + in_reply_to = NULL; + + if (orig_message_id) + in_reply_to = g_strdup (orig_message_id); + + if (orig_references) { + if (orig_message_id) + references = g_strconcat (orig_references, "\n ", orig_message_id, NULL); + else + references = g_strdup (orig_references); + + } else if (orig_in_reply_to) { + if (orig_message_id) + references = g_strconcat (orig_in_reply_to, "\n ", orig_message_id, NULL); + else + references = g_strdup (orig_in_reply_to); + } else if (orig_message_id) { + references = g_strdup (orig_message_id); + } + + g_free (orig_references); + g_free (orig_in_reply_to); + g_free (orig_message_id); + + if (in_reply_to) { + tny_mime_part_set_header_pair (TNY_MIME_PART (reply_msg), "In-Reply-To", in_reply_to); + } + if (references) { + tny_mime_part_set_header_pair (TNY_MIME_PART (reply_msg), "References", references); + } +} TnyMsg* modest_tny_msg_create_reply_msg (TnyMsg *msg, @@ -855,15 +1212,20 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg, gchar *new_to = NULL; TnyList *parts = NULL; GList *attachments_list = NULL; + TnyMimePart *part_to_check = NULL; g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL); - + + part_to_check = modest_tny_msg_get_attachments_parent (TNY_MSG (msg)); + parts = TNY_LIST (tny_simple_list_new()); - tny_mime_part_get_parts (TNY_MIME_PART (msg), parts); + tny_mime_part_get_parts (TNY_MIME_PART (part_to_check), parts); tny_list_foreach (parts, add_if_attachment, &attachments_list); new_msg = create_reply_forward_mail (msg, header, from, signature, TRUE, reply_type, attachments_list); + + set_references (new_msg, msg); if (attachments_list != NULL) { g_list_foreach (attachments_list, (GFunc) g_object_unref, NULL); g_list_free (attachments_list); @@ -880,23 +1242,26 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg, new_header = tny_msg_get_header(new_msg); new_to = get_new_to (msg, header, from, reply_mode); if (!new_to) - g_warning ("%s: failed to get new To:", __FUNCTION__); + g_debug ("%s: failed to get new To:", __FUNCTION__); else { tny_header_set_to (new_header, new_to); - g_free (new_to); } if (reply_mode == MODEST_TNY_MSG_REPLY_MODE_ALL) { - gchar *new_cc = get_new_cc (header, from); + gchar *new_cc = get_new_cc (header, from, new_to); if (new_cc) { tny_header_set_cc (new_header, new_cc); g_free (new_cc); } } + if (new_to) + g_free (new_to); + /* Clean */ g_object_unref (G_OBJECT (new_header)); g_object_unref (G_OBJECT (header)); + g_object_unref (G_OBJECT (part_to_check)); return new_msg; } @@ -926,7 +1291,7 @@ get_content_type(const gchar *s) g_string_append(type, "; charset=\"utf-8\""); } else { /* it should be impossible to reach this, but better safe than sorry */ - g_warning("invalid utf8 in message"); + g_debug("invalid utf8 in message"); g_string_append(type, "; charset=\"latin1\""); } } @@ -965,6 +1330,7 @@ modest_tny_msg_header_get_all_recipients_list (TnyHeader *header) { GSList *recipients = NULL; gchar *from = NULL, *to = NULL, *cc = NULL, *bcc = NULL; + gchar *after_remove, *joined; if (header == NULL) return NULL; @@ -974,20 +1340,21 @@ modest_tny_msg_header_get_all_recipients_list (TnyHeader *header) cc = tny_header_dup_cc (header); bcc = tny_header_dup_bcc (header); - recipients = NULL; + joined = modest_text_utils_join_addresses (from, to, cc, bcc); + after_remove = modest_text_utils_remove_duplicate_addresses (joined); + g_free (joined); + + recipients = modest_text_utils_split_addresses_list (after_remove); + g_free (after_remove); + if (from) - recipients = g_slist_concat (recipients, modest_text_utils_split_addresses_list (from)); + g_free (from); if (to) - recipients = g_slist_concat (recipients, modest_text_utils_split_addresses_list (to)); + g_free (to); if (cc) - recipients = g_slist_concat (recipients, modest_text_utils_split_addresses_list (cc)); + g_free (cc); if (bcc) - recipients = g_slist_concat (recipients, modest_text_utils_split_addresses_list (bcc)); - - g_free (from); - g_free (to); - g_free (cc); - g_free (bcc); + g_free (bcc); return recipients; }