X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=4595afa846d81c0f537272e68e5ace9a46b8bb7b;hp=ea226614be737b427a6b6e232755e0475b8a05bd;hb=8df610f0be41b018033b2143018f54ff732736eb;hpb=ed81e224257b7828822ffdf96afc5f347882ee1a diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index ea22661..4595afa 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -39,6 +39,7 @@ #include #include #include +#include #ifdef HAVE_CONFIG_H #include @@ -242,9 +243,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); @@ -271,13 +275,14 @@ add_attachments (TnyMsg *msg, GList *attachments_list) 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) @@ -295,12 +300,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; } @@ -310,8 +319,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; @@ -329,7 +338,7 @@ 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)) { + if (part && TNY_IS_MSG (part)) { g_object_unref (part); tny_iterator_next (iter); continue; @@ -338,8 +347,10 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht /* 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)) @@ -350,6 +361,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)); @@ -386,52 +398,58 @@ modest_tny_msg_find_body_part (TnyMsg *msg, gboolean 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 = (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_inline (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); @@ -449,14 +467,31 @@ 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); + } + /* 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, NULL); + return g_object_get_data (G_OBJECT(msg), MODEST_TNY_MSG_PARENT_UID); +} + + + static void add_if_attachment (gpointer data, gpointer user_data) { @@ -487,7 +522,8 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg, 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); + new_msg = create_reply_forward_mail (msg, NULL, from, signature, FALSE, forward_type, + attachments_list); add_attachments (new_msg, attachments_list); /* Clean */ @@ -499,14 +535,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; @@ -515,19 +552,26 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg, GList *attachments_list = 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);