X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=f27c5eac2559b0983fedcc9ed16ec6f9e3b62fd0;hb=3bdc64c81733aabfe8af0b1b1e4119623d078f03;hp=ba5c456c088466e9e43808888cabf39c9efbbd3a;hpb=0e8cdb35a6a51ed7fc1ac3444317724ad1a24bf8;p=modest diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index ba5c456..f27c5ea 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -61,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; @@ -98,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. */ @@ -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); @@ -427,10 +442,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 +515,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 +584,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 +625,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 */ } @@ -677,6 +747,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 @@ -703,12 +868,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, @@ -720,6 +888,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; } @@ -754,6 +923,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. @@ -772,7 +942,7 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, 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; } @@ -793,7 +963,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: */ @@ -817,6 +987,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; } @@ -840,6 +1014,108 @@ get_new_cc (TnyHeader *header, const gchar* from) 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, @@ -854,15 +1130,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); @@ -879,7 +1160,7 @@ 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); @@ -896,6 +1177,7 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg, /* 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; } @@ -925,7 +1207,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\""); } } @@ -964,6 +1246,7 @@ modest_tny_msg_header_get_all_recipients_list (TnyHeader *header) { GSList *recipients = NULL; gchar *from = NULL, *to = NULL, *cc = NULL, *bcc = NULL; + gchar *tmp = NULL, *old_tmp = NULL; if (header == NULL) return NULL; @@ -974,19 +1257,33 @@ modest_tny_msg_header_get_all_recipients_list (TnyHeader *header) bcc = tny_header_dup_bcc (header); recipients = NULL; - if (from) - recipients = g_slist_concat (recipients, modest_text_utils_split_addresses_list (from)); - if (to) - recipients = g_slist_concat (recipients, modest_text_utils_split_addresses_list (to)); - if (cc) - recipients = g_slist_concat (recipients, modest_text_utils_split_addresses_list (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); + if (from) { + tmp = g_strdup (from); + old_tmp = tmp; + g_free (from); + } + if (to) { + tmp = g_strjoin ("; ", old_tmp, to, NULL); + g_free (old_tmp); + old_tmp = tmp; + g_free (to); + } + if (cc) { + tmp = g_strjoin ("; ", old_tmp, cc, NULL); + g_free (old_tmp); + old_tmp = tmp; + g_free (cc); + } + if (bcc) { + tmp = g_strjoin ("; ", old_tmp, bcc, NULL); + g_free (old_tmp); + old_tmp = tmp; + g_free (bcc); + } + + old_tmp = modest_text_utils_remove_duplicate_addresses (tmp); + recipients = modest_text_utils_split_addresses_list (old_tmp); + g_free (tmp); return recipients; }