X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=d0ee5116c1250bd0d71df0e9aff2877f689413f4;hp=2d79deac53e187c861f8210e74d2be9c78429d12;hb=3a65c0163dc7290de04ecf59d6863eca4991ec3b;hpb=bc13df76e4593a1510f50d68cb8e7ea0fdecb63d diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index 2d79dea..d0ee511 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -61,7 +61,7 @@ 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 *bcc, const gchar* subject, const gchar *references, const gchar *in_reply_to, const gchar *body, GList *attachments, gint *attached, GError **err) @@ -70,11 +70,11 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, 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); @@ -84,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); @@ -106,12 +106,12 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, 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); @@ -442,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; @@ -470,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); @@ -533,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! */ @@ -564,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 */ } @@ -868,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. @@ -886,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; } @@ -907,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: */ @@ -931,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; } @@ -1100,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); @@ -1147,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\""); } } @@ -1186,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; @@ -1196,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; }