X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=a0d072c6111ec71763d3501c170edaa8e70358fe;hp=e481d9f54c39087eb388c96f23c6c1686d8c0f1c;hb=fbe3368c6b62a1f5582f69576b77807d504e9612;hpb=23f65bd71f61807691eabec97055714ba085caed diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index e481d9f..a0d072c 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -33,6 +33,7 @@ #include #include #include +#include #include "modest-formatter.h" #include #include @@ -60,7 +61,9 @@ 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; @@ -97,6 +100,12 @@ 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. */ @@ -117,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) { @@ -152,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); @@ -367,9 +383,9 @@ add_images (TnyMsg *msg, GList *images_list, GError **err) if (part && !g_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) { related_part = part; break; - } else { - g_object_unref (part); } + if (part) + g_object_unref (part); tny_iterator_next (iter); } g_object_unref (iter); @@ -488,6 +504,7 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht if (!part) { g_warning ("%s: not a valid mime part", __FUNCTION__); + tny_iterator_next (iter); continue; } @@ -583,7 +600,8 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, ModestFormatter *formatter; gchar *subject_prefix; gboolean no_text_part; - + gchar *parent_uid; + if (header) g_object_ref (header); else @@ -593,17 +611,17 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, part of the message to create the reply/forwarded mail */ if (msg != NULL) body = modest_tny_msg_find_body_part (msg, FALSE); - + if (modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL)) formatter = modest_formatter_new ("text/html", signature); else formatter = modest_formatter_new ("text/plain", signature); - + /* if we don't have a text-part */ no_text_part = (!body) || (strcmp (tny_mime_part_get_content_type (body), "text/html")==0); - + /* 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, @@ -618,13 +636,13 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, attachments); } } - + g_object_unref (G_OBJECT(formatter)); if (body) g_object_unref (G_OBJECT(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); @@ -641,13 +659,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 @@ -676,6 +692,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 @@ -702,12 +813,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, @@ -719,6 +833,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; } @@ -753,6 +868,7 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* 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. @@ -816,6 +932,10 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, } } + tmp = modest_text_utils_simplify_recipients (new_to); + g_free (new_to); + new_to = tmp; + return new_to; } @@ -825,19 +945,122 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, static gchar* get_new_cc (TnyHeader *header, const gchar* from) { - gchar *old_cc; - gchar *result; + gchar *old_cc, *result, *dup; old_cc = tny_header_dup_cc (header); if (!old_cc) return NULL; /* remove me (the new From:) from the Cc: list */ - result = modest_text_utils_remove_address (old_cc, from); + dup = modest_text_utils_remove_address (old_cc, from); + result = modest_text_utils_remove_duplicate_addresses (dup); + 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_strcasecmp (name, "References")) { + if (l_references) g_free (l_references); + l_references = g_strdup (tny_pair_get_value (pair)); + } else if (!g_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_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, @@ -852,21 +1075,25 @@ 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); } - if (parts) - g_object_unref (G_OBJECT (parts)); + g_object_unref (parts); /* Fill the header */ if (header) @@ -882,8 +1109,8 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg, 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); if (new_cc) { @@ -891,10 +1118,11 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg, g_free (new_cc); } } - + /* 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; }