X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=2790914914d79b274e13e5b5d1a318ca2bb03d47;hp=a5be76f986e2fceb1287a8f7c31472f830d86195;hb=d2ea95049c43f1fc3089109866757e45139d0d9a;hpb=9a9ecea6b1a504e538117aa5a7b573c32fe259ed diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index a5be76f..2790914 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -34,13 +34,12 @@ #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 +52,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 +61,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 +76,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 +105,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 +118,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 +158,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,9 +179,8 @@ 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); @@ -200,9 +207,8 @@ 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); @@ -225,7 +231,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; @@ -235,6 +241,7 @@ copy_mime_part (TnyMimePart *part) TnyIterator *iterator; TnyStream *attachment_stream; const gchar *enc; + gint ret; if (TNY_IS_MSG (part)) { g_object_ref (part); @@ -253,12 +260,19 @@ copy_mime_part (TnyMimePart *part) /* fill the stream */ 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 (result, - attachment_stream, - attachment_content_type, - enc); - tny_stream_reset (attachment_stream); + 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); @@ -272,13 +286,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); @@ -290,11 +306,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) { @@ -302,20 +320,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_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); - 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; @@ -346,7 +378,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); } } @@ -402,7 +434,7 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht TnyList *parts = NULL; TnyIterator *iter = NULL; gchar *header_content_type; - gchar *header_content_type_lower; + gchar *header_content_type_lower = NULL; if (!msg) return NULL; @@ -410,15 +442,18 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht /* 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"); - header_content_type = g_strstrip (header_content_type); - header_content_type_lower = header_content_type?g_ascii_strdown (header_content_type, -1):NULL; + 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); @@ -429,11 +464,17 @@ 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; + gchar *content_type; + gboolean is_text_part; g_object_unref (G_OBJECT(iter)); - content_type = tny_mime_part_get_content_type (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 (!g_str_has_prefix (content_type, "text/")) { + if (!is_text_part) { return NULL; } else { return TNY_MIME_PART (g_object_ref(G_OBJECT(msg))); @@ -453,6 +494,7 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht /* it's a message --> ignore */ if (part && TNY_IS_MSG (part)) { g_object_unref (part); + part = NULL; tny_iterator_next (iter); continue; } @@ -474,7 +516,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; @@ -533,6 +577,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; @@ -588,9 +633,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); @@ -615,7 +662,7 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, /* 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); + add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, NULL); } return new_msg; @@ -703,8 +750,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 @@ -719,12 +766,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; @@ -739,10 +785,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__); @@ -751,6 +799,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 */ @@ -776,14 +825,17 @@ 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; + gchar *result; - 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); + result = modest_text_utils_remove_address (old_cc, from); + g_free (old_cc); + return result; }