X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=b64155a029ffbc2268c091168a0ea04003612a1d;hp=489697a713c441d7784d460a1803cb227fba5fff;hb=28f0cd15d250984655429a840bf478910db032f1;hpb=91526797480db76525e1295ec4a65f29f4bdc9cf diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index 489697a..b64155a 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -33,14 +33,14 @@ #include #include #include +#include #include "modest-formatter.h" -#include +#include #include -#include -#include #include #include #include "modest-tny-mime-part.h" +#include #ifdef HAVE_CONFIG_H @@ -53,8 +53,8 @@ static TnyMimePart * add_body_part (TnyMsg *msg, const gchar *body, const gchar *content_type); static TnyMimePart * add_html_body_part (TnyMsg *msg, const gchar *body); -static void add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline); -static void add_images (TnyMsg *msg, GList *attachments_list); +static gint add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline, GError **err); +static void add_images (TnyMsg *msg, GList *attachments_list, GError **err); static char * get_content_type(const gchar *s); static gboolean is_ascii(const gchar *s); @@ -62,11 +62,12 @@ 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, - GList *attachments) + 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); @@ -76,8 +77,11 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, tny_header_set_from (TNY_HEADER (header), from); tny_header_set_replyto (TNY_HEADER (header), from); } - if ((mailto != NULL) && (strlen(mailto) > 0)) - tny_header_set_to (TNY_HEADER (header), mailto); + if ((mailto != NULL) && (strlen(mailto) > 0)) { + gchar *removed_to = modest_text_utils_remove_duplicate_addresses (mailto); + tny_header_set_to (TNY_HEADER (header), removed_to); + g_free (removed_to); + } if ((cc != NULL) && (strlen(cc) > 0)) tny_header_set_cc (TNY_HEADER (header), cc); if ((bcc != NULL) && (strlen(bcc) > 0)) @@ -102,7 +106,9 @@ 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); + tmp_attached = add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err); + if (attached) + *attached = tmp_attached; if (header) g_object_unref(header); @@ -113,11 +119,12 @@ TnyMsg* modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gchar *cc, const gchar *bcc, const gchar* subject, const gchar *html_body, const gchar *plain_body, - GList *attachments, GList *images) + GList *attachments, GList *images, gint *attached, GError **err) { TnyMsg *new_msg; TnyHeader *header; gchar *content_type; + gint tmp_attached; /* Create new msg */ new_msg = modest_formatter_create_message (NULL, FALSE, (attachments != NULL), (images != NULL)); @@ -152,8 +159,10 @@ modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gch g_free (content_type); /* Add attachments */ - add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE); - add_images (new_msg, images); + tmp_attached = add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err); + if (attached) + *attached = tmp_attached; + add_images (new_msg, images, err); if (header) g_object_unref(header); @@ -171,17 +180,16 @@ add_body_part (TnyMsg *msg, TnyStream *text_body_stream; /* Create the stream */ - text_body_stream = TNY_STREAM (tny_camel_stream_new - (camel_stream_mem_new_with_buffer - (body, (body ? strlen(body) : 0)))); + text_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer + (body, (body ? strlen(body) : 0))); text_body_part = modest_formatter_create_body_part (NULL, 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)); @@ -200,18 +208,19 @@ add_html_body_part (TnyMsg *msg, TnyStream *html_body_stream; /* Create the stream */ - html_body_stream = TNY_STREAM (tny_camel_stream_new - (camel_stream_mem_new_with_buffer - (body, strlen(body)))); + html_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer + (body, strlen(body))); /* Create body part if needed */ html_body_part = modest_formatter_create_body_part (NULL, 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)); @@ -223,7 +232,7 @@ add_html_body_part (TnyMsg *msg, } static TnyMimePart * -copy_mime_part (TnyMimePart *part) +copy_mime_part (TnyMimePart *part, GError **err) { TnyMimePart *result = NULL; const gchar *attachment_content_type; @@ -232,7 +241,9 @@ copy_mime_part (TnyMimePart *part) TnyList *parts; TnyIterator *iterator; TnyStream *attachment_stream; - + const gchar *enc; + gint ret; + if (TNY_IS_MSG (part)) { g_object_ref (part); return part; @@ -248,12 +259,21 @@ copy_mime_part (TnyMimePart *part) attachment_cid = tny_mime_part_get_content_id (part); /* fill the stream */ - attachment_stream = tny_mime_part_get_stream (part); - tny_stream_reset (attachment_stream); - tny_mime_part_construct_from_stream (result, - attachment_stream, - attachment_content_type); - tny_stream_reset (attachment_stream); + attachment_stream = tny_mime_part_get_decoded_stream (part); + enc = tny_mime_part_get_transfer_encoding (part); + if (attachment_stream == NULL) { + if (err != NULL && *err == NULL) + g_set_error (err, MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_FILE_IO, _("TODO: couldn't retrieve attachment")); + g_object_unref (result); + return NULL; + } else { + ret = tny_stream_reset (attachment_stream); + ret = tny_mime_part_construct (result, + attachment_stream, + attachment_content_type, + enc); + ret = tny_stream_reset (attachment_stream); + } /* set other mime part fields */ tny_mime_part_set_filename (result, attachment_filename); @@ -267,13 +287,15 @@ copy_mime_part (TnyMimePart *part) 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); + TnyMimePart *subpart_copy = copy_mime_part (subpart, err); + if (subpart_copy != NULL) { + 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_copy); + } g_object_unref (subpart); - g_object_unref (subpart_copy); } tny_iterator_next (iterator); @@ -285,11 +307,13 @@ copy_mime_part (TnyMimePart *part) return result; } -static void -add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline) +static gint +add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline, GError **err) { GList *pos; TnyMimePart *attachment_part, *old_attachment; + gint ret; + gint attached = 0; for (pos = (GList *)attachments_list; pos; pos = pos->next) { @@ -297,19 +321,34 @@ add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline 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_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); + attachment_part = copy_mime_part (old_attachment, err); + if (attachment_part != NULL) { + if (add_inline) { + tny_mime_part_set_header_pair (attachment_part, "Content-Disposition", + "inline"); + } else { + const gchar *filename; + filename = tny_mime_part_get_filename (old_attachment); + if (filename) + tny_mime_part_set_filename (attachment_part, filename); + else + tny_mime_part_set_header_pair (attachment_part, "Content-Disposition", + "attachment"); + } + 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); + } } } + return attached; } static void -add_images (TnyMsg *msg, GList *images_list) +add_images (TnyMsg *msg, GList *images_list, GError **err) { TnyMimePart *related_part = NULL; const gchar *content_type; @@ -329,9 +368,9 @@ add_images (TnyMsg *msg, GList *images_list) 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); @@ -340,7 +379,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); + add_attachments (related_part, images_list, TRUE, err); g_object_unref (related_part); } } @@ -395,10 +434,30 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht TnyMimePart *part = NULL; TnyList *parts = NULL; TnyIterator *iter = NULL; + gchar *header_content_type; + gchar *header_content_type_lower = NULL; if (!msg) return NULL; + /* If it's an application multipart, then we don't get into as we don't + * support them (for example application/sml or wap messages */ + header_content_type = modest_tny_mime_part_get_header_value (msg, "Content-Type"); + if (header_content_type) { + header_content_type = g_strstrip (header_content_type); + header_content_type_lower = g_ascii_strdown (header_content_type, -1); + } + if (header_content_type_lower && + g_str_has_prefix (header_content_type_lower, "multipart/") && + !g_str_has_prefix (header_content_type_lower, "multipart/signed") && + strstr (header_content_type_lower, "application/")) { + g_free (header_content_type_lower); + g_free (header_content_type); + return NULL; + } + g_free (header_content_type_lower); + g_free (header_content_type); + parts = TNY_LIST (tny_simple_list_new()); tny_mime_part_get_parts (TNY_MIME_PART (msg), parts); @@ -406,8 +465,21 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht /* no parts? assume it's single-part message */ if (tny_iterator_is_done(iter)) { + gchar *content_type; + gboolean is_text_part; g_object_unref (G_OBJECT(iter)); - return TNY_MIME_PART (g_object_ref(G_OBJECT(msg))); + content_type = modest_tny_mime_part_get_content_type (msg); + if (content_type == NULL) + return NULL; + is_text_part = + g_str_has_prefix (content_type, "text/"); + g_free (content_type); + /* if this part cannot be a supported body return NULL */ + if (!is_text_part) { + return NULL; + } else { + return TNY_MIME_PART (g_object_ref(G_OBJECT(msg))); + } } else { do { gchar *tmp, *content_type = NULL; @@ -417,12 +489,14 @@ 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; } /* it's a message --> ignore */ if (part && TNY_IS_MSG (part)) { g_object_unref (part); + part = NULL; tny_iterator_next (iter); continue; } @@ -444,7 +518,9 @@ 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) && !has_content_disp_name) { + if (g_str_has_prefix (content_type, desired_mime_type) && + !has_content_disp_name && + !modest_tny_mime_part_is_attachment_for_modest (part)) { /* we found the desired mime-type! */ g_free (content_type); break; @@ -503,6 +579,7 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, { TnyMsg *new_msg; TnyHeader *new_header; + gchar *old_subject; gchar *new_subject; TnyMimePart *body = NULL; ModestFormatter *formatter; @@ -518,17 +595,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, @@ -536,17 +613,18 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, 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) { new_msg = modest_formatter_attach (formatter, msg, header); - else + } else { new_msg = modest_formatter_inline (formatter, body, header, 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); tny_header_set_from (new_header, from); @@ -557,9 +635,11 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, subject_prefix = g_strconcat (_("mail_va_re"), ":", NULL); else subject_prefix = g_strconcat (_("mail_va_fw"), ":", NULL); + old_subject = tny_header_dup_subject (header); new_subject = - (gchar *) modest_text_utils_derived_subject (tny_header_get_subject(header), + (gchar *) modest_text_utils_derived_subject (old_subject, subject_prefix); + g_free (old_subject); g_free (subject_prefix); tny_header_set_subject (new_header, (const gchar *) new_subject); g_free (new_subject); @@ -583,6 +663,10 @@ 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) { + add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, NULL); + } + return new_msg; } @@ -630,7 +714,6 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg, new_msg = create_reply_forward_mail (msg, NULL, from, signature, FALSE, forward_type, attachments_list); - add_attachments (TNY_MIME_PART (new_msg), attachments_list, FALSE); /* Clean */ if (attachments_list) { @@ -669,8 +752,8 @@ 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* old_reply_to; + gchar* old_from; gchar* new_to; /* according to RFC2369 (http://www.faqs.org/rfcs/rfc2369.html), we @@ -685,12 +768,11 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, /* 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); + old_from = tny_header_dup_from (header); - if (!old_from && !old_reply_to) { + if (!old_from && !old_reply_to) { g_warning ("%s: failed to get either Reply-To: or From: from header", __FUNCTION__); return NULL; @@ -705,10 +787,12 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, else /* otherwise use either Reply-To: (preferred) or From: */ new_to = g_strdup (old_reply_to ? old_reply_to : old_from); + g_free (old_from); + g_free (old_reply_to); /* 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); + gchar *old_to = tny_header_dup_to (header); if (!old_to) g_warning ("%s: no To: address found in source mail", __FUNCTION__); @@ -717,6 +801,7 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, gchar *tmp = g_strjoin (",", new_to, old_to, NULL); g_free (new_to); new_to = tmp; + g_free (old_to); } /* remove duplicate entries */ @@ -742,14 +827,18 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, static gchar* get_new_cc (TnyHeader *header, const gchar* from) { - const gchar *old_cc; + gchar *old_cc, *result, *dup; - old_cc = tny_header_get_cc (header); + old_cc = tny_header_dup_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); + 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; } @@ -769,21 +858,17 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg, g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL); - /* Add attachments */ - if (msg != NULL) { - parts = TNY_LIST (tny_simple_list_new()); - tny_mime_part_get_parts (TNY_MIME_PART (msg), parts); - tny_list_foreach (parts, add_if_attachment, &attachments_list); - } + parts = TNY_LIST (tny_simple_list_new()); + tny_mime_part_get_parts (TNY_MIME_PART (msg), 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); - if (attachments_list) { + 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) @@ -799,8 +884,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) { @@ -808,7 +893,7 @@ 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)); @@ -847,3 +932,82 @@ get_content_type(const gchar *s) } return g_string_free(type, FALSE); } + +guint64 +modest_tny_msg_estimate_size (const gchar *plain_body, const gchar *html_body, + guint64 parts_count, + guint64 parts_size) +{ + guint64 result; + + /* estimation of headers size */ + result = 1024; + + /* We add a 20% of size due to the increase in 7bit encoding */ + if (plain_body) { + result += strlen (plain_body) * 120 / 100; + } + if (html_body) { + result += strlen (html_body) * 120 / 100; + } + + /* 256 bytes per additional part because of their headers */ + result += parts_count * 256; + + /* 150% of increase per encoding */ + result += parts_size * 3 / 2; + + return result; +} + +GSList * +modest_tny_msg_header_get_all_recipients_list (TnyHeader *header) +{ + GSList *recipients = NULL; + gchar *from = NULL, *to = NULL, *cc = NULL, *bcc = NULL; + + if (header == NULL) + return NULL; + + from = tny_header_dup_from (header); + to = tny_header_dup_to (header); + cc = tny_header_dup_cc (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); + + return recipients; +} + +GSList * +modest_tny_msg_get_all_recipients_list (TnyMsg *msg) +{ + TnyHeader *header = NULL; + GSList *recipients = NULL; + + if (msg == NULL) + return NULL; + + header = tny_msg_get_header (msg); + if (header == NULL) + return NULL; + + recipients = modest_tny_msg_header_get_all_recipients_list (header); + g_object_unref (header); + + return recipients; +} +