From ed81e224257b7828822ffdf96afc5f347882ee1a Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Thu, 19 Jul 2007 15:10:23 +0000 Subject: [PATCH] * src/modest-tny-msg.c: * Now we simplify the way we copy mime parts when the mime part is an attachment. This, with a pending patch in tinymail, should fix NB#61280. pmo-trunk-r2753 --- src/modest-tny-msg.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index 0a23c7d..ea22661 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -211,15 +211,15 @@ copy_mime_part (TnyMimePart *part) TnyStream *attachment_stream; if (TNY_IS_MSG (part)) { - result = TNY_MIME_PART (tny_platform_factory_new_msg (modest_runtime_get_platform_factory ())); - attachment_content_type = "message/rfc822"; - tny_mime_part_set_content_type (result, attachment_content_type); - } else { - result = tny_platform_factory_new_mime_part ( - modest_runtime_get_platform_factory()); - attachment_content_type = tny_mime_part_get_content_type (part); + g_object_ref (part); + return part; } + result = tny_platform_factory_new_mime_part ( + modest_runtime_get_platform_factory()); + + attachment_content_type = tny_mime_part_get_content_type (part); + /* get mime part headers */ attachment_filename = tny_mime_part_get_filename (part); attachment_cid = tny_mime_part_get_content_id (part); @@ -265,6 +265,7 @@ add_attachments (TnyMsg *msg, GList *attachments_list) old_attachment = pos->data; attachment_part = copy_mime_part (old_attachment); tny_mime_part_add_part (TNY_MIME_PART (msg), attachment_part); + g_object_unref (attachment_part); } } @@ -328,6 +329,11 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht gchar *content_type = NULL; do { part = TNY_MIME_PART(tny_iterator_get_current (iter)); + if (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... -- 1.7.9.5