X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=627839991b8cb072f7e95e0ca14168f3ed65a3f8;hp=675fce396cdc9fbeb0d92ae60fc4f060ec57999b;hb=99e438caf4679a1daf2060f73fb5a97408fca388;hpb=b267362311d6c82f71987833ad14ddfaedc21390 diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index 675fce3..6278399 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -35,7 +35,10 @@ #include #include "modest-formatter.h" #include +#include +#include #include +#include #ifdef HAVE_CONFIG_H #include @@ -45,46 +48,50 @@ #include "modest-text-utils.h" static TnyMimePart * add_body_part (TnyMsg *msg, const gchar *body, - const gchar *content_type, gboolean has_attachments); + 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 char * get_content_type(const gchar *s); 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) { - TnyPlatformFactory *fact; TnyMsg *new_msg; TnyHeader *header; gchar *content_type; /* Create new msg */ - fact = modest_runtime_get_platform_factory (); - new_msg = tny_platform_factory_new_msg (fact); + new_msg = modest_formatter_create_message (NULL, TRUE, (attachments != NULL)); header = tny_msg_get_header (new_msg); - tny_header_set_from (TNY_HEADER (header), from); - tny_header_set_replyto (TNY_HEADER (header), from); - tny_header_set_to (TNY_HEADER (header), mailto); - tny_header_set_cc (TNY_HEADER (header), cc); - tny_header_set_bcc (TNY_HEADER (header), bcc); - - if (subject) + if ((from != NULL) && (strlen(from) > 0)) { + 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 ((cc != NULL) && (strlen(cc) > 0)) + tny_header_set_cc (TNY_HEADER (header), cc); + if ((bcc != NULL) && (strlen(bcc) > 0)) + tny_header_set_bcc (TNY_HEADER (header), bcc); + + if ((subject != NULL) && (strlen(subject) > 0)) tny_header_set_subject (TNY_HEADER (header), subject); content_type = get_content_type(body); /* 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, (attachments ? TRUE: FALSE)); + add_body_part (new_msg, body, content_type); g_free (content_type); /* Add attachments */ if (attachments) - add_attachments (new_msg, (GList*) attachments); + add_attachments (new_msg, attachments); return new_msg; } @@ -93,34 +100,39 @@ 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) { - TnyPlatformFactory *fact; TnyMsg *new_msg; TnyHeader *header; gchar *content_type; /* Create new msg */ - fact = modest_runtime_get_platform_factory (); - new_msg = tny_platform_factory_new_msg (fact); + new_msg = modest_formatter_create_message (NULL, FALSE, (attachments != NULL)); header = tny_msg_get_header (new_msg); - tny_header_set_from (TNY_HEADER (header), from); - tny_header_set_replyto (TNY_HEADER (header), from); - tny_header_set_to (TNY_HEADER (header), mailto); - tny_header_set_cc (TNY_HEADER (header), cc); - tny_header_set_bcc (TNY_HEADER (header), bcc); - tny_header_set_subject (TNY_HEADER (header), subject); + if ((from != NULL) && (strlen(from) > 0)) { + 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 ((cc != NULL) && (strlen(cc) > 0)) + tny_header_set_cc (TNY_HEADER (header), cc); + if ((bcc != NULL) && (strlen(bcc) > 0)) + tny_header_set_bcc (TNY_HEADER (header), bcc); + + if ((subject != NULL) && (strlen(subject) > 0)) + tny_header_set_subject (TNY_HEADER (header), subject); content_type = get_content_type(plain_body); /* Add the body of the new mail */ - add_body_part (new_msg, plain_body, content_type, TRUE); + 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 (new_msg, attachments); return new_msg; } @@ -130,8 +142,7 @@ modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gch static TnyMimePart * add_body_part (TnyMsg *msg, const gchar *body, - const gchar *content_type, - gboolean has_attachments) + const gchar *content_type) { TnyMimePart *text_body_part = NULL; TnyStream *text_body_stream; @@ -141,12 +152,7 @@ add_body_part (TnyMsg *msg, (camel_stream_mem_new_with_buffer (body, (body ? strlen(body) : 0)))); - /* Create body part if needed */ - if (has_attachments) - text_body_part = tny_platform_factory_new_mime_part - (modest_runtime_get_platform_factory ()); - else - text_body_part = TNY_MIME_PART(msg); + text_body_part = modest_formatter_create_body_part (NULL, msg); /* Construct MIME part */ tny_stream_reset (text_body_stream); @@ -155,11 +161,7 @@ add_body_part (TnyMsg *msg, content_type); tny_stream_reset (text_body_stream); - /* Add part if needed */ - if (has_attachments) { - tny_mime_part_add_part (TNY_MIME_PART (msg), text_body_part); - g_object_unref (G_OBJECT(text_body_part)); - } + g_object_unref (G_OBJECT(text_body_part)); /* Clean */ g_object_unref (text_body_stream); @@ -180,8 +182,7 @@ add_html_body_part (TnyMsg *msg, (body, strlen(body)))); /* Create body part if needed */ - html_body_part = tny_platform_factory_new_mime_part - (modest_runtime_get_platform_factory ()); + html_body_part = modest_formatter_create_body_part (NULL, msg); /* Construct MIME part */ tny_stream_reset (html_body_stream); @@ -190,8 +191,6 @@ add_html_body_part (TnyMsg *msg, "text/html; charset=utf-8"); tny_stream_reset (html_body_stream); - /* Add part if needed */ - tny_mime_part_add_part (TNY_MIME_PART (msg), html_body_part); g_object_unref (G_OBJECT(html_body_part)); /* Clean */ @@ -200,49 +199,89 @@ add_html_body_part (TnyMsg *msg, return html_body_part; } -static void -add_attachments (TnyMsg *msg, GList *attachments_list) +static TnyMimePart * +copy_mime_part (TnyMimePart *part) { - GList *pos; - TnyMimePart *attachment_part, *old_attachment; + TnyMimePart *result = NULL; const gchar *attachment_content_type; const gchar *attachment_filename; const gchar *attachment_cid; + TnyList *parts; + TnyIterator *iterator; TnyStream *attachment_stream; + if (TNY_IS_MSG (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); + tny_stream_reset (attachment_stream); + tny_mime_part_construct_from_stream (result, + attachment_stream, + attachment_content_type); + tny_stream_reset (attachment_stream); + + /* set other mime part fields */ + tny_mime_part_set_filename (result, attachment_filename); + tny_mime_part_set_content_id (result, attachment_cid); + + /* copy subparts */ + parts = tny_simple_list_new (); + tny_mime_part_get_parts (part, parts); + iterator = tny_list_create_iterator (parts); + while (!tny_iterator_is_done (iterator)) { + TnyMimePart *subpart = TNY_MIME_PART (tny_iterator_get_current (iterator)); + 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); + g_object_unref (parts); + g_object_unref (attachment_stream); + + return result; +} + +static void +add_attachments (TnyMsg *msg, GList *attachments_list) +{ + GList *pos; + TnyMimePart *attachment_part, *old_attachment; + for (pos = (GList *)attachments_list; pos; pos = pos->next) { old_attachment = pos->data; - attachment_filename = tny_mime_part_get_filename (old_attachment); - attachment_stream = tny_mime_part_get_stream (old_attachment); - attachment_part = tny_platform_factory_new_mime_part ( - modest_runtime_get_platform_factory()); - - attachment_content_type = tny_mime_part_get_content_type (old_attachment); - attachment_cid = tny_mime_part_get_content_id (old_attachment); - - tny_mime_part_construct_from_stream (attachment_part, - attachment_stream, - attachment_content_type); - tny_stream_reset (attachment_stream); - - tny_mime_part_set_filename (attachment_part, attachment_filename); - tny_mime_part_set_content_id (attachment_part, attachment_cid); - + attachment_part = copy_mime_part (old_attachment); tny_mime_part_add_part (TNY_MIME_PART (msg), attachment_part); -/* g_object_unref (attachment_part); */ + g_object_unref (attachment_part); } } 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; body = modest_tny_msg_find_body_part(msg, want_html); if (!body) @@ -260,12 +299,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; } @@ -275,8 +318,8 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht { const gchar *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; @@ -287,18 +330,26 @@ 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 { + } else { gchar *content_type = NULL; do { part = TNY_MIME_PART(tny_iterator_get_current (iter)); + 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 (part) { + 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)) @@ -309,6 +360,7 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht if (part) break; } + if (part) g_object_unref (G_OBJECT(part)); @@ -346,19 +398,25 @@ modest_tny_msg_find_body_part (TnyMsg *msg, gboolean want_html) static TnyMsg * -create_reply_forward_mail (TnyMsg *msg, const gchar *from, const gchar *signature, gboolean is_reply, guint type) +create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, const gchar *signature, + gboolean is_reply, guint type, 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; /* 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); + if (header) + g_object_ref (header); + else + header = tny_msg_get_header (msg); + + if (msg != NULL) + 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)) @@ -374,14 +432,14 @@ create_reply_forward_mail (TnyMsg *msg, const gchar *from, const gchar *signatur new_msg = modest_formatter_cite (formatter, body, header); break; case MODEST_TNY_MSG_REPLY_TYPE_QUOTE: - new_msg = modest_formatter_quote (formatter, body, header); + 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); + 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); @@ -389,7 +447,8 @@ create_reply_forward_mail (TnyMsg *msg, const gchar *from, const gchar *signatur } } 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); @@ -419,13 +478,15 @@ static void add_if_attachment (gpointer data, gpointer user_data) { TnyMimePart *part; - GList *attachments_list; + GList **attachments_list; part = TNY_MIME_PART (data); - attachments_list = (GList *) user_data; + attachments_list = ((GList **) user_data); - if (tny_mime_part_is_attachment (part)) - attachments_list = g_list_prepend (attachments_list, 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* @@ -438,12 +499,12 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg, TnyList *parts = NULL; GList *attachments_list = NULL; - new_msg = create_reply_forward_mail (msg, from, signature, FALSE, forward_type); - /* 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); + tny_list_foreach (parts, add_if_attachment, &attachments_list); + + new_msg = create_reply_forward_mail (msg, NULL, from, signature, FALSE, forward_type, attachments_list); add_attachments (new_msg, attachments_list); /* Clean */ @@ -455,23 +516,42 @@ 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; GString *tmp = NULL; + TnyList *parts = NULL; + GList *attachments_list = NULL; - new_msg = create_reply_forward_mail (msg, from, signature, TRUE, reply_type); + /* 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); + } + + 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); + } + 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);