X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=8680c821530a5c5ccc445c874724889a888083c3;hp=fb7e5a1bbadc095e95dc675a0db694fe07d5b79f;hb=b978d07da0770b94bb6c49c25a8f528022af94e8;hpb=b37aa623dad9200d8db98571a59f1418e4699aa9 diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index fb7e5a1..8680c82 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -34,12 +34,12 @@ #include #include #include "modest-formatter.h" -#include +#include #include -#include -#include #include #include +#include "modest-tny-mime-part.h" + #ifdef HAVE_CONFIG_H #include @@ -169,17 +169,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)); @@ -198,18 +197,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)); @@ -230,7 +230,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; @@ -246,11 +247,13 @@ 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); + attachment_stream = tny_mime_part_get_decoded_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 */ @@ -298,6 +301,7 @@ add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline attachment_part = copy_mime_part (old_attachment); tny_mime_part_set_header_pair (attachment_part, "Content-Disposition", add_inline?"inline":"attachment"); + tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64"); tny_mime_part_add_part (TNY_MIME_PART (part), attachment_part); if (old_cid) tny_mime_part_set_content_id (attachment_part, old_cid); @@ -393,10 +397,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); @@ -404,13 +428,19 @@ 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)) { + const gchar *content_type; g_object_unref (G_OBJECT(iter)); - return TNY_MIME_PART (g_object_ref(G_OBJECT(msg))); + content_type = tny_mime_part_get_content_type (msg); + /* if this part cannot be a supported body return NULL */ + if (!g_str_has_prefix (content_type, "text/")) { + return NULL; + } else { + return TNY_MIME_PART (g_object_ref(G_OBJECT(msg))); + } } else { do { - gchar *content_type = NULL; - gchar *content_disp; - gboolean has_content_disp; + gchar *tmp, *content_type = NULL; + gboolean has_content_disp_name = FALSE; part = TNY_MIME_PART(tny_iterator_get_current (iter)); @@ -432,13 +462,18 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1); /* mime-parts with a content-disposition header (either 'inline' or 'attachment') - * cannot be body parts + * and a 'name=' thingy cannot be body parts */ - content_disp = modest_tny_mime_part_get_header_value (part, "Content-Disposition"); - has_content_disp = content_disp && strlen (content_disp) != 0; - g_free (content_disp); + + 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, desired_mime_type) && !has_content_disp) { + 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; @@ -530,11 +565,12 @@ 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)); @@ -577,6 +613,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); + } + return new_msg; } @@ -624,100 +664,18 @@ 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) + 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; } -gchar* -modest_tny_mime_part_get_header_value (TnyMimePart *part, const gchar *header) -{ - TnyList *pairs; - TnyIterator *iter; - gchar *val; - - g_return_val_if_fail (part && TNY_IS_MIME_PART(part), NULL); - g_return_val_if_fail (header, NULL); - - pairs = tny_simple_list_new (); - - tny_mime_part_get_header_pairs (part, pairs); - iter = tny_list_create_iterator (pairs); - - val = NULL; - while (!tny_iterator_is_done(iter) && !val) { - - TnyPair *pair = (TnyPair*)tny_iterator_get_current(iter); - if (strcasecmp (header, tny_pair_get_name(pair)) == 0) - val = g_strdup (tny_pair_get_value(pair)); - g_object_unref (pair); - - tny_iterator_next (iter); - } - - g_object_unref (pairs); - g_object_unref (iter); - - return val; -} - - -/* we consider more things attachments than tinymail does... - */ -gboolean -modest_tny_mime_part_is_attachment_for_modest (TnyMimePart *part) -{ - gchar *content_disp; - gchar *content_type; - gboolean has_content_disp; - - g_return_val_if_fail (part && TNY_IS_MIME_PART(part), FALSE); - - /* if tinymail thinks it's an attachment, it definitely is */ - if (tny_mime_part_is_attachment (part)) - return TRUE; - - /* if the mime part is a message itself (ie. embedded), it's an attachment */ - if (TNY_IS_MSG (part)) - return TRUE; - - content_disp = modest_tny_mime_part_get_header_value (part, "Content-Disposition"); - has_content_disp = content_disp && strlen (content_disp) != 0; - g_free (content_disp); - - /* if it doesn't have a content deposition, it's not an attachment */ - if (!content_disp) - return FALSE; - - /* ok, it must be content-disposition "inline" then, because "attachment" - * is already handle above "...is_attachment". modest consider these "inline" things - * attachments as well, unless they are embedded images for html mail - */ - content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1); - if (!g_str_has_prefix (content_type, "image/")) { - g_free (content_type); - return TRUE; /* it's not an image, so it must be an attachment */ - } - g_free (content_type); - - - /* now, if it's an inline-image, and it has a content-id or location, we - * we guess it's an inline image, and not an attachment */ - if (tny_mime_part_get_content_id (part) || tny_mime_part_get_content_location(part)) - return FALSE; - - /* in other cases... */ - return TRUE; -} - - - static gint count_addresses (const gchar* addresses) @@ -844,16 +802,13 @@ 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); } @@ -922,3 +877,30 @@ 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; +}