X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=263b8596153d7f2f026c7136abbbf617a66b9e9c;hp=59468835802e79ec57252ce68e0243023a09fb99;hb=b683e0368d4e89bf1a233b59b907d90af027d529;hpb=edc519ae28b5934b62922563fd57407e678d8ff3 diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index 5946883..263b859 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -35,8 +35,11 @@ #include #include "modest-formatter.h" #include +#include +#include #include #include +#include #ifdef HAVE_CONFIG_H #include @@ -48,7 +51,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 (TnyMsg *msg, GList *attachments_list); +static void add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline); +static void add_images (TnyMsg *msg, GList *attachments_list); static char * get_content_type(const gchar *s); static gboolean is_ascii(const gchar *s); @@ -56,14 +60,14 @@ 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, - GSList *attachments) + GList *attachments) { TnyMsg *new_msg; TnyHeader *header; gchar *content_type; /* Create new msg */ - new_msg = modest_formatter_create_message (NULL, TRUE, (attachments != NULL)); + new_msg = modest_formatter_create_message (NULL, TRUE, (attachments != NULL), FALSE); header = tny_msg_get_header (new_msg); if ((from != NULL) && (strlen(from) > 0)) { @@ -81,7 +85,14 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, tny_header_set_subject (TNY_HEADER (header), subject); content_type = get_content_type(body); - + + /* set modest as the X-Mailer + * we could this in the platform factory, but then the header + * would show up before all the others. + */ + tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "X-Mailer", "Modest " + VERSION); + /* Add the body of the new mail */ /* This is needed even if body is NULL or empty. */ add_body_part (new_msg, body, content_type); @@ -89,7 +100,7 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, /* Add attachments */ if (attachments) - add_attachments (new_msg, (GList*) attachments); + add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE); return new_msg; } @@ -98,14 +109,14 @@ 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, - GSList *attachments) + GList *attachments, GList *images) { TnyMsg *new_msg; TnyHeader *header; gchar *content_type; /* Create new msg */ - new_msg = modest_formatter_create_message (NULL, FALSE, (attachments != NULL)); + new_msg = modest_formatter_create_message (NULL, FALSE, (attachments != NULL), (images != NULL)); header = tny_msg_get_header (new_msg); if ((from != NULL) && (strlen(from) > 0)) { @@ -123,14 +134,22 @@ modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gch tny_header_set_subject (TNY_HEADER (header), subject); content_type = get_content_type(plain_body); - + + /* set modest as the X-Mailer + * we could this in the platform factory, but then the header + * would show up before all the others. + */ + tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "X-Mailer", "Modest " + VERSION); + /* Add the body of the new mail */ add_body_part (new_msg, plain_body, content_type); add_html_body_part (new_msg, html_body); g_free (content_type); /* Add attachments */ - add_attachments (new_msg, (GList*) attachments); + add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE); + add_images (new_msg, images); return new_msg; } @@ -209,21 +228,21 @@ 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); /* fill the stream */ - attachment_stream = tny_mime_part_get_stream (part); + attachment_stream = tny_mime_part_get_stream (part); tny_stream_reset (attachment_stream); tny_mime_part_construct_from_stream (result, attachment_stream, @@ -240,9 +259,12 @@ copy_mime_part (TnyMimePart *part) iterator = tny_list_create_iterator (parts); while (!tny_iterator_is_done (iterator)) { TnyMimePart *subpart = TNY_MIME_PART (tny_iterator_get_current (iterator)); - TnyMimePart *subpart_copy = copy_mime_part (subpart); - tny_mime_part_add_part (result, subpart_copy); - g_object_unref (subpart); + if (subpart) { + TnyMimePart *subpart_copy = copy_mime_part (subpart); + tny_mime_part_add_part (result, subpart_copy); + g_object_unref (subpart); + } + tny_iterator_next (iterator); } g_object_unref (iterator); @@ -253,7 +275,7 @@ copy_mime_part (TnyMimePart *part) } static void -add_attachments (TnyMsg *msg, GList *attachments_list) +add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline) { GList *pos; TnyMimePart *attachment_part, *old_attachment; @@ -261,21 +283,65 @@ add_attachments (TnyMsg *msg, GList *attachments_list) for (pos = (GList *)attachments_list; pos; pos = pos->next) { old_attachment = pos->data; - attachment_part = copy_mime_part (old_attachment); - tny_mime_part_add_part (TNY_MIME_PART (msg), attachment_part); + if (!tny_mime_part_is_purged (old_attachment)) { + attachment_part = copy_mime_part (old_attachment); + tny_mime_part_add_part (TNY_MIME_PART (part), attachment_part); + tny_mime_part_set_header_pair (attachment_part, "Content-Disposition", + add_inline?"inline":"attachment"); + g_object_unref (attachment_part); + } + } +} + +static void +add_images (TnyMsg *msg, GList *images_list) +{ + TnyMimePart *related_part = NULL; + const gchar *content_type; + + content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg)); + + if ((content_type != NULL) && !strcasecmp (content_type, "multipart/related")) { + related_part = g_object_ref (msg); + } else if ((content_type != NULL) && !strcasecmp (content_type, "multipart/mixed")) { + TnyList *parts = TNY_LIST (tny_simple_list_new ()); + TnyIterator *iter = NULL; + tny_mime_part_get_parts (TNY_MIME_PART (msg), parts); + iter = tny_list_create_iterator (parts); + + while (!tny_iterator_is_done (iter)) { + TnyMimePart *part = TNY_MIME_PART (tny_iterator_get_current (iter)); + if (part && !g_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) { + related_part = part; + break; + } else { + g_object_unref (part); + } + tny_iterator_next (iter); + } + g_object_unref (iter); + g_object_unref (parts); + } + + if (related_part != NULL) { + /* TODO: attach images in their proper place */ + add_attachments (related_part, images_list, TRUE); } } gchar * -modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html) +modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_html) { TnyStream *stream; TnyMimePart *body; GtkTextBuffer *buf; GtkTextIter start, end; gchar *to_quote; + gboolean result_was_html = TRUE; + g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL); + body = modest_tny_msg_find_body_part(msg, want_html); if (!body) return NULL; @@ -292,12 +358,16 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html) gchar *to_quote_converted = modest_text_utils_convert_to_html (to_quote); g_free (to_quote); to_quote = to_quote_converted; + result_was_html = FALSE; } g_object_unref (buf); g_object_unref (G_OBJECT(stream)); g_object_unref (G_OBJECT(body)); + if (is_html != NULL) + *is_html = result_was_html; + return to_quote; } @@ -305,11 +375,11 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html) TnyMimePart* modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_html) { - const gchar *mime_type = want_html ? "text/html" : "text/plain"; + const gchar *desired_mime_type = want_html ? "text/html" : "text/plain"; TnyMimePart *part = NULL; - TnyList *parts; - TnyIterator *iter; - + TnyList *parts = NULL; + TnyIterator *iter = NULL; + if (!msg) return NULL; @@ -319,40 +389,57 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht iter = tny_list_create_iterator(parts); /* no parts? assume it's single-part message */ - if (tny_iterator_is_done(iter)) + if (tny_iterator_is_done(iter)) { + g_object_unref (G_OBJECT(iter)); return TNY_MIME_PART (g_object_ref(G_OBJECT(msg))); - else { - gchar *content_type = NULL; + } else { do { + gchar *content_type = NULL; + part = TNY_MIME_PART(tny_iterator_get_current (iter)); + if (!part) { + g_warning ("%s: not a valid mime part", __FUNCTION__); + continue; + } + + /* it's a message --> ignore */ + if (part && 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... */ - content_type = g_ascii_strdown - (tny_mime_part_get_content_type (part), -1); - - if (g_str_has_prefix (content_type, mime_type) && - !tny_mime_part_is_attachment (part)) + 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)) { + /* we found the desired mime-type! */ + g_free (content_type); break; - - if (g_str_has_prefix(content_type, "multipart")) { + + } else if (g_str_has_prefix(content_type, "multipart")) { + + /* multipart? recurse! */ + g_object_unref (part); + g_free (content_type); part = modest_tny_msg_find_body_part_from_mime_part (part, want_html); if (part) break; - } - if (part) + } else + g_free (content_type); + + if (part) { g_object_unref (G_OBJECT(part)); - - part = NULL; + part = NULL; + } - g_free (content_type); - content_type = NULL; - tny_iterator_next (iter); } while (!tny_iterator_is_done(iter)); - g_free (content_type); } g_object_unref (G_OBJECT(iter)); @@ -372,57 +459,65 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht TnyMimePart* modest_tny_msg_find_body_part (TnyMsg *msg, gboolean want_html) { + g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL); + return modest_tny_msg_find_body_part_from_mime_part (TNY_MIME_PART(msg), want_html); } +#define MODEST_TNY_MSG_PARENT_UID "parent-uid" + static TnyMsg * -create_reply_forward_mail (TnyMsg *msg, const gchar *from, const gchar *signature, - gboolean is_reply, guint type, GList *attachments) +create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, + const gchar *signature, gboolean is_reply, + guint type /*ignored*/, GList *attachments) { TnyMsg *new_msg; - TnyHeader *new_header, *header; + TnyHeader *new_header; gchar *new_subject; - TnyMimePart *body; + TnyMimePart *body = NULL; ModestFormatter *formatter; gchar *subject_prefix; + gboolean no_text_part; + + if (header) + g_object_ref (header); + else + header = tny_msg_get_header (msg); /* Get body from original msg. Always look for the text/plain part of the message to create the reply/forwarded mail */ - header = tny_msg_get_header (msg); - body = modest_tny_msg_find_body_part (msg, FALSE); - - /* TODO: select the formatter from account prefs */ - if (modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL)) + 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); + - /* Format message body */ - if (is_reply) { - switch (type) { - case MODEST_TNY_MSG_REPLY_TYPE_CITE: - default: - new_msg = modest_formatter_cite (formatter, body, header); - break; - case MODEST_TNY_MSG_REPLY_TYPE_QUOTE: - new_msg = modest_formatter_quote (formatter, body, header, attachments); - break; - } - } else { - switch (type) { - case MODEST_TNY_MSG_FORWARD_TYPE_INLINE: - default: - new_msg = modest_formatter_inline (formatter, body, header, attachments); - break; - case MODEST_TNY_MSG_FORWARD_TYPE_ATTACHMENT: - new_msg = modest_formatter_attach (formatter, body, header); - break; - } + /* 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, + attachments); + else { + /* for attachements; inline if there is a text part, and include the + * full old mail if there was none */ + if (no_text_part) + new_msg = modest_formatter_attach (formatter, msg, header); + else + new_msg = modest_formatter_inline (formatter, body, header, + attachments); } + g_object_unref (G_OBJECT(formatter)); - g_object_unref (G_OBJECT(body)); + if (body) + g_object_unref (G_OBJECT(body)); /* Fill the header */ new_header = tny_msg_get_header (new_msg); @@ -440,14 +535,39 @@ create_reply_forward_mail (TnyMsg *msg, const gchar *from, const gchar *signatur g_free (subject_prefix); tny_header_set_subject (new_header, (const gchar *) new_subject); g_free (new_subject); + + /* get the parent uid, and set it as a gobject property on the new msg */ + if (new_msg) { + gchar* parent_uid = modest_tny_folder_get_header_unique_id (header); + g_object_set_data_full (G_OBJECT(new_msg), MODEST_TNY_MSG_PARENT_UID, + parent_uid, g_free); + } + + /* set modest as the X-Mailer + * we could this in the platform factory, but then the header + * would show up before all the others. + */ + tny_mime_part_set_header_pair (TNY_MIME_PART (msg), "X-Mailer", "Modest " + VERSION); /* Clean */ g_object_unref (G_OBJECT (new_header)); g_object_unref (G_OBJECT (header)); + /* ugly to unref it here instead of in the calling func */ return new_msg; } +const gchar* +modest_tny_msg_get_parent_uid (TnyMsg *msg) +{ + g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL); + + return g_object_get_data (G_OBJECT(msg), MODEST_TNY_MSG_PARENT_UID); +} + + + static void add_if_attachment (gpointer data, gpointer user_data) { @@ -457,8 +577,10 @@ add_if_attachment (gpointer data, gpointer user_data) part = TNY_MIME_PART (data); attachments_list = ((GList **) user_data); - if ((tny_mime_part_is_attachment (part))||(TNY_IS_MSG (part))) + if ((tny_mime_part_is_attachment (part))||(TNY_IS_MSG (part))) { *attachments_list = g_list_prepend (*attachments_list, part); + g_object_ref (part); + } } TnyMsg* @@ -471,13 +593,16 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg, TnyList *parts = NULL; GList *attachments_list = NULL; + g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL); + /* Add attachments */ 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, from, signature, FALSE, forward_type, attachments_list); - add_attachments (new_msg, attachments_list); + 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) @@ -488,14 +613,15 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg, } TnyMsg* -modest_tny_msg_create_reply_msg (TnyMsg *msg, +modest_tny_msg_create_reply_msg (TnyMsg *msg, + TnyHeader *header, const gchar *from, const gchar *signature, ModestTnyMsgReplyType reply_type, ModestTnyMsgReplyMode reply_mode) { TnyMsg *new_msg = NULL; - TnyHeader *new_header, *header; + TnyHeader *new_header; const gchar* reply_to; gchar *new_cc = NULL; const gchar *cc = NULL, *bcc = NULL; @@ -503,20 +629,30 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg, TnyList *parts = NULL; GList *attachments_list = NULL; + g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL); + /* Add attachments */ - 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); + 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); + } - new_msg = create_reply_forward_mail (msg, from, signature, TRUE, reply_type, attachments_list); + new_msg = create_reply_forward_mail (msg, header, from, signature, TRUE, reply_type, + 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)); + if (parts) + g_object_unref (G_OBJECT (parts)); /* Fill the header */ - header = tny_msg_get_header (msg); + if (header) + g_object_ref (header); + else + header = tny_msg_get_header (msg); + new_header = tny_msg_get_header (new_msg); reply_to = tny_header_get_replyto (header); @@ -538,8 +674,10 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg, bcc = tny_header_get_bcc (header); tmp = g_string_new (tny_header_get_to (header)); - if (cc) g_string_append_printf (tmp, ",%s",cc); - if (bcc) g_string_append_printf (tmp, ",%s",bcc); + if (cc) + g_string_append_printf (tmp, ",%s",cc); + if (bcc) + g_string_append_printf (tmp, ",%s",bcc); /* Remove my own address from the cc list. TODO: remove also the To: of the new message, needed due