X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=0152b4b4e40e602df55715c6fbffd260df913f0d;hp=857d06565fbc5c1b47caa6034ca5c2a1c0a146fc;hb=1b9054356e613aa2b629bf34fd21fb1fccb80956;hpb=b9b928dee5f5169c3317df86b153b4d069b814d0 diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index 857d065..0152b4b 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -40,6 +40,8 @@ #include #include #include +#include "modest-tny-mime-part.h" + #ifdef HAVE_CONFIG_H #include @@ -85,7 +87,14 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, tny_header_set_subject (TNY_HEADER (header), subject); content_type = get_content_type(body); - + + /* set modest as the X-Mailer + * we could this in the platform factory, but then the header + * would show up before all the others. + */ + tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "X-Mailer", "Modest " + VERSION); + /* 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); @@ -94,6 +103,8 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, /* Add attachments */ if (attachments) add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE); + if (header) + g_object_unref(header); return new_msg; } @@ -127,7 +138,14 @@ modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gch tny_header_set_subject (TNY_HEADER (header), subject); content_type = get_content_type(plain_body); - + + /* set modest as the X-Mailer + * we could this in the platform factory, but then the header + * would show up before all the others. + */ + tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "X-Mailer", "Modest " + VERSION); + /* Add the body of the new mail */ add_body_part (new_msg, plain_body, content_type); add_html_body_part (new_msg, html_body); @@ -136,6 +154,8 @@ modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gch /* Add attachments */ add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE); add_images (new_msg, images); + if (header) + g_object_unref(header); return new_msg; } @@ -159,9 +179,9 @@ add_body_part (TnyMsg *msg, /* Construct MIME part */ tny_stream_reset (text_body_stream); - tny_mime_part_construct_from_stream (text_body_part, - text_body_stream, - content_type); + tny_mime_part_construct (text_body_part, + text_body_stream, + content_type, "7bit"); tny_stream_reset (text_body_stream); g_object_unref (G_OBJECT(text_body_part)); @@ -189,9 +209,11 @@ add_html_body_part (TnyMsg *msg, /* Construct MIME part */ tny_stream_reset (html_body_stream); - tny_mime_part_construct_from_stream (html_body_part, - html_body_stream, - "text/html; charset=utf-8"); + tny_mime_part_construct (html_body_part, + html_body_stream, + "text/html; charset=utf-8", + "7bit"); /* Sometimes it might be needed + to make this one a 8bit! */ tny_stream_reset (html_body_stream); g_object_unref (G_OBJECT(html_body_part)); @@ -212,7 +234,8 @@ copy_mime_part (TnyMimePart *part) TnyList *parts; TnyIterator *iterator; TnyStream *attachment_stream; - + const gchar *enc; + if (TNY_IS_MSG (part)) { g_object_ref (part); return part; @@ -229,10 +252,12 @@ copy_mime_part (TnyMimePart *part) /* fill the stream */ attachment_stream = tny_mime_part_get_stream (part); + enc = tny_mime_part_get_transfer_encoding (part); tny_stream_reset (attachment_stream); - tny_mime_part_construct_from_stream (result, - attachment_stream, - attachment_content_type); + tny_mime_part_construct (result, + attachment_stream, + attachment_content_type, + enc); tny_stream_reset (attachment_stream); /* set other mime part fields */ @@ -246,9 +271,14 @@ copy_mime_part (TnyMimePart *part) while (!tny_iterator_is_done (iterator)) { TnyMimePart *subpart = TNY_MIME_PART (tny_iterator_get_current (iterator)); if (subpart) { + const gchar *subpart_cid; TnyMimePart *subpart_copy = copy_mime_part (subpart); + subpart_cid = tny_mime_part_get_content_id (subpart); tny_mime_part_add_part (result, subpart_copy); + if (subpart_cid) + tny_mime_part_set_content_id (result, subpart_cid); g_object_unref (subpart); + g_object_unref (subpart_copy); } tny_iterator_next (iterator); @@ -270,10 +300,14 @@ 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); attachment_part = copy_mime_part (old_attachment); - tny_mime_part_add_part (TNY_MIME_PART (part), attachment_part); tny_mime_part_set_header_pair (attachment_part, "Content-Disposition", add_inline?"inline":"attachment"); + tny_mime_part_add_part (TNY_MIME_PART (part), attachment_part); + if (old_cid) + tny_mime_part_set_content_id (attachment_part, old_cid); g_object_unref (attachment_part); } } @@ -312,6 +346,7 @@ add_images (TnyMsg *msg, GList *images_list) if (related_part != NULL) { /* TODO: attach images in their proper place */ add_attachments (related_part, images_list, TRUE); + g_object_unref (related_part); } } @@ -326,6 +361,8 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_html) gchar *to_quote; gboolean result_was_html = TRUE; + g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL); + body = modest_tny_msg_find_body_part(msg, want_html); if (!body) return NULL; @@ -333,7 +370,7 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_html) buf = gtk_text_buffer_new (NULL); stream = TNY_STREAM (tny_gtk_text_buffer_stream_new (buf)); tny_stream_reset (stream); - tny_mime_part_decode_to_stream (body, stream); + tny_mime_part_decode_to_stream (body, stream, NULL); tny_stream_reset (stream); gtk_text_buffer_get_bounds (buf, &start, &end); @@ -359,11 +396,11 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_html) TnyMimePart* modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_html) { - const gchar *mime_type = want_html ? "text/html" : "text/plain"; + const gchar *desired_mime_type = want_html ? "text/html" : "text/plain"; TnyMimePart *part = NULL; TnyList *parts = NULL; TnyIterator *iter = NULL; - + if (!msg) return NULL; @@ -377,45 +414,65 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht g_object_unref (G_OBJECT(iter)); return TNY_MIME_PART (g_object_ref(G_OBJECT(msg))); } else { - gchar *content_type = NULL; do { + gchar *tmp, *content_type = NULL; + gboolean has_content_disp_name = FALSE; + part = TNY_MIME_PART(tny_iterator_get_current (iter)); + + if (!part) { + g_warning ("%s: not a valid mime part", __FUNCTION__); + continue; + } + + /* it's a message --> ignore */ if (part && TNY_IS_MSG (part)) { g_object_unref (part); tny_iterator_next (iter); continue; - } + } /* we need to strdown the content type, because * tny_mime_part_has_content_type does not do it... */ - if (part) { - content_type = g_ascii_strdown - (tny_mime_part_get_content_type (part), -1); + content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1); + + /* mime-parts with a content-disposition header (either 'inline' or 'attachment') + * and a 'name=' thingy cannot be body parts + */ + + tmp = modest_tny_mime_part_get_header_value (part, "Content-Disposition"); + if (tmp) { + gchar *content_disp = g_ascii_strdown(tmp, -1); + g_free (tmp); + has_content_disp_name = g_strstr_len (content_disp, strlen(content_disp), "name=") != NULL; + g_free (content_disp); } - - if (g_str_has_prefix (content_type, mime_type) && - !tny_mime_part_is_attachment (part)) - break; - if (g_str_has_prefix(content_type, "multipart")) { + if (g_str_has_prefix (content_type, desired_mime_type) && !has_content_disp_name) { + /* we found the desired mime-type! */ + g_free (content_type); + break; + + } else if (g_str_has_prefix(content_type, "multipart")) { + + /* multipart? recurse! */ + g_object_unref (part); + g_free (content_type); part = modest_tny_msg_find_body_part_from_mime_part (part, want_html); if (part) break; - } - - if (part) + } else + g_free (content_type); + + if (part) { g_object_unref (G_OBJECT(part)); - - part = NULL; + part = NULL; + } - g_free (content_type); - content_type = NULL; - tny_iterator_next (iter); } while (!tny_iterator_is_done(iter)); - g_free (content_type); } g_object_unref (G_OBJECT(iter)); @@ -435,6 +492,8 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht TnyMimePart* modest_tny_msg_find_body_part (TnyMsg *msg, gboolean want_html) { + g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL); + return modest_tny_msg_find_body_part_from_mime_part (TNY_MIME_PART(msg), want_html); } @@ -470,7 +529,7 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, 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); @@ -516,7 +575,14 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, 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 + * would show up before all the others. + */ + tny_mime_part_set_header_pair (TNY_MIME_PART (msg), "X-Mailer", "Modest " + VERSION); + /* Clean */ g_object_unref (G_OBJECT (new_header)); g_object_unref (G_OBJECT (header)); @@ -528,7 +594,8 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, const gchar* modest_tny_msg_get_parent_uid (TnyMsg *msg) { - g_return_val_if_fail (msg, NULL); + g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL); + return g_object_get_data (G_OBJECT(msg), MODEST_TNY_MSG_PARENT_UID); } @@ -559,6 +626,8 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg, TnyList *parts = NULL; GList *attachments_list = NULL; + g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL); + /* Add attachments */ parts = TNY_LIST (tny_simple_list_new()); tny_mime_part_get_parts (TNY_MIME_PART (msg), parts); @@ -569,13 +638,126 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg, add_attachments (TNY_MIME_PART (new_msg), attachments_list, FALSE); /* Clean */ - if (attachments_list) + if (attachments_list) { + g_list_foreach (attachments_list, (GFunc) g_object_unref, NULL); g_list_free (attachments_list); + } g_object_unref (G_OBJECT (parts)); return new_msg; } + + +static gint +count_addresses (const gchar* addresses) +{ + gint count = 1; + + if (!addresses) + return 0; + + while (*addresses) { + if (*addresses == ',' || *addresses == ';') + ++count; + ++addresses; + } + + return count; +} + + +/* get the new To:, based on the old header, + * result is newly allocated or NULL in case of error + * */ +static gchar* +get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, + ModestTnyMsgReplyMode reply_mode) +{ + const gchar* old_reply_to; + const gchar* old_from; + gchar* new_to; + + /* according to RFC2369 (http://www.faqs.org/rfcs/rfc2369.html), we + * can identify Mailing-List posts by the List-Help header. + * for mailing lists, both the Reply-To: and From: should be included + * in the new To:; for now, we're ignoring List-Post + */ + gchar* list_help = modest_tny_mime_part_get_header_value (TNY_MIME_PART(msg), + "List-Help"); + gboolean is_mailing_list = (list_help != NULL); + g_free (list_help); + + + /* reply to sender, use ReplyTo or From */ + //old_reply_to = tny_header_get_replyto (header); + old_reply_to = modest_tny_mime_part_get_header_value (TNY_MIME_PART(msg), + "Reply-To"); + old_from = tny_header_get_from (header); + + if (!old_from && !old_reply_to) { + g_warning ("%s: failed to get either Reply-To: or From: from header", + __FUNCTION__); + return NULL; + } + + /* for mailing lists, use both Reply-To and From if we did a + * 'Reply All:' + * */ + if (is_mailing_list && reply_mode == MODEST_TNY_MSG_REPLY_MODE_ALL && + old_reply_to && old_from && strcmp (old_from, old_reply_to) != 0) + new_to = g_strjoin (",", old_reply_to, old_from, NULL); + else + /* otherwise use either Reply-To: (preferred) or From: */ + new_to = g_strdup (old_reply_to ? old_reply_to : old_from); + + /* in case of ReplyAll, we need to add the Recipients in the old To: */ + if (reply_mode == MODEST_TNY_MSG_REPLY_MODE_ALL) { + const gchar *old_to = tny_header_get_to (header); + if (!old_to) + g_warning ("%s: no To: address found in source mail", + __FUNCTION__); + else { + /* append the old To: */ + gchar *tmp = g_strjoin (",", new_to, old_to, NULL); + g_free (new_to); + new_to = tmp; + } + + /* remove duplicate entries */ + gchar *tmp = modest_text_utils_remove_duplicate_addresses (new_to); + g_free (new_to); + new_to = tmp; + + /* now, strip me (the new From:) from the new_to, but only if + * there are >1 addresses there */ + if (count_addresses (new_to) > 1) { + gchar *tmp = modest_text_utils_remove_address (new_to, from); + g_free (new_to); + new_to = tmp; + } + } + + return new_to; +} + + +/* 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) +{ + const gchar *old_cc; + + old_cc = tny_header_get_cc (header); + if (!old_cc) + return NULL; + + /* remove me (the new From:) from the Cc: list */ + return modest_text_utils_remove_address (old_cc, from); +} + + TnyMsg* modest_tny_msg_create_reply_msg (TnyMsg *msg, TnyHeader *header, @@ -586,13 +768,12 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg, { TnyMsg *new_msg = NULL; TnyHeader *new_header; - const gchar* reply_to; - gchar *new_cc = NULL; - const gchar *cc = NULL, *bcc = NULL; - GString *tmp = NULL; + gchar *new_to = NULL; TnyList *parts = NULL; GList *attachments_list = NULL; + g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL); + /* Add attachments */ if (msg != NULL) { parts = TNY_LIST (tny_simple_list_new()); @@ -614,45 +795,25 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg, g_object_ref (header); else header = tny_msg_get_header (msg); - new_header = tny_msg_get_header (new_msg); - reply_to = tny_header_get_replyto (header); - if (reply_to) - tny_header_set_to (new_header, reply_to); - else - tny_header_set_to (new_header, tny_header_get_from (header)); - - switch (reply_mode) { - case MODEST_TNY_MSG_REPLY_MODE_SENDER: - /* Do not fill neither cc nor bcc */ - break; - case MODEST_TNY_MSG_REPLY_MODE_LIST: - /* TODO */ - break; - case MODEST_TNY_MSG_REPLY_MODE_ALL: - /* Concatenate to, cc and bcc */ - cc = tny_header_get_cc (header); - bcc = tny_header_get_bcc (header); - - tmp = g_string_new (tny_header_get_to (header)); - if (cc) g_string_append_printf (tmp, ",%s",cc); - if (bcc) g_string_append_printf (tmp, ",%s",bcc); - - /* Remove my own address from the cc list. TODO: - remove also the To: of the new message, needed due - to the new reply_to feature */ - new_cc = (gchar *) - modest_text_utils_remove_address ((const gchar *) tmp->str, - from); - /* FIXME: remove also the mails from the new To: */ - tny_header_set_cc (new_header, new_cc); - - /* Clean */ - g_string_free (tmp, TRUE); - g_free (new_cc); - break; + + 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__); + 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) { + tny_header_set_cc (new_header, new_cc); + g_free (new_cc); + } } - + /* Clean */ g_object_unref (G_OBJECT (new_header)); g_object_unref (G_OBJECT (header));