X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=489697a713c441d7784d460a1803cb227fba5fff;hp=8a7c0b6f7e158434724a634da259e713f76dac4d;hb=f409f0b767f36788ce88995246dfeb087797acaa;hpb=41a049ba9a8e3510e0010359ccd126d3e69e4791 diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index 8a7c0b6..489697a 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 @@ -363,7 +365,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); @@ -408,8 +410,9 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht return TNY_MIME_PART (g_object_ref(G_OBJECT(msg))); } else { do { - gchar *content_type = NULL; - + gchar *tmp, *content_type = NULL; + gboolean has_content_disp_name = FALSE; + part = TNY_MIME_PART(tny_iterator_get_current (iter)); if (!part) { @@ -422,15 +425,26 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht 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... */ content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1); - - if (g_str_has_prefix (content_type, desired_mime_type) && !tny_mime_part_is_attachment (part)) { + + /* 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, desired_mime_type) && !has_content_disp_name) { /* we found the desired mime-type! */ g_free (content_type); break; @@ -619,47 +633,35 @@ 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; } -gchar* -modest_tny_msg_get_header (TnyMsg *msg, const gchar *header) -{ - TnyList *pairs; - TnyIterator *iter; - gchar *val; - - g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL); - g_return_val_if_fail (header, NULL); - - pairs = tny_simple_list_new (); - tny_mime_part_get_header_pairs (TNY_MIME_PART(msg), pairs); - iter = tny_list_create_iterator (pairs); - - val = NULL; - while (!tny_iterator_is_done(iter) && !val) { +static gint +count_addresses (const gchar* addresses) +{ + gint count = 1; - 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)); - - tny_iterator_next (iter); + if (!addresses) + return 0; + + while (*addresses) { + if (*addresses == ',' || *addresses == ';') + ++count; + ++addresses; } - - g_object_unref (pairs); - g_object_unref (iter); - - return val; + + return count; } - /* get the new To:, based on the old header, * result is newly allocated or NULL in case of error * */ @@ -676,14 +678,16 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, * 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_msg_get_header (msg, "List-Help"); + 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_msg_get_header (msg, "Reply-To"); + 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) { @@ -714,17 +718,20 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, g_free (new_to); new_to = tmp; } - } - - /* now, strip me (the new From:) from the new_to */ - gchar *tmp = modest_text_utils_remove_address (new_to, from); - g_free (new_to); - new_to = tmp; - /* remove duplicate entries */ - tmp = modest_text_utils_remove_duplicate_addresses (new_to); - 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; } @@ -756,7 +763,7 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg, { TnyMsg *new_msg = NULL; TnyHeader *new_header; - gchar *new_to, *new_cc = NULL; + gchar *new_to = NULL; TnyList *parts = NULL; GList *attachments_list = NULL; @@ -793,10 +800,13 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg, tny_header_set_to (new_header, new_to); g_free (new_to); } - new_cc = get_new_cc (header, from); - if (new_cc) { - tny_header_set_cc (new_header, new_cc); - g_free (new_cc); + + 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 */