X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=8608447e32ab691fb6e763b3658b2265dc220e78;hb=98936b16511d3ca4b7e0c09908eed8392c7d869e;hp=523f143775ac03e78f9cb1a8f94a563d63fe4675;hpb=b3189f988bc953765fd3cdb325c4dd883ac9f608;p=modest diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index 523f143..8608447 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 @@ -50,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); @@ -65,7 +67,7 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, 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)) { @@ -83,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); @@ -91,7 +100,9 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, /* Add attachments */ if (attachments) - add_attachments (new_msg, attachments); + add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE); + if (header) + g_object_unref(header); return new_msg; } @@ -100,14 +111,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, - GList *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)) { @@ -125,14 +136,24 @@ 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, attachments); + add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE); + add_images (new_msg, images); + if (header) + g_object_unref(header); return new_msg; } @@ -246,6 +267,7 @@ copy_mime_part (TnyMimePart *part) TnyMimePart *subpart_copy = copy_mime_part (subpart); tny_mime_part_add_part (result, subpart_copy); g_object_unref (subpart); + g_object_unref (subpart_copy); } tny_iterator_next (iterator); @@ -258,7 +280,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; @@ -266,9 +288,49 @@ 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); - g_object_unref (attachment_part); + if (!tny_mime_part_is_purged (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_add_part (TNY_MIME_PART (part), attachment_part); + 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); } } @@ -283,6 +345,8 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_html) 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; @@ -316,11 +380,11 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_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 = NULL; TnyIterator *iter = NULL; - + if (!msg) return NULL; @@ -334,45 +398,53 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht g_object_unref (G_OBJECT(iter)); return TNY_MIME_PART (g_object_ref(G_OBJECT(msg))); } else { - gchar *content_type = NULL; 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... */ - 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)) + 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)); @@ -392,14 +464,19 @@ 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, TnyHeader *header, 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; @@ -407,48 +484,42 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, co 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 */ + 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 */ if (msg != NULL) - body = modest_tny_msg_find_body_part (msg, !is_reply); - - /* TODO: select the formatter from account prefs */ - if (modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, 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: - if (strcmp (tny_mime_part_get_content_type (body), "text/html")==0) - new_msg = modest_formatter_attach (formatter, msg, header); - else - new_msg = modest_formatter_inline (formatter, body, header, attachments); - break; - case MODEST_TNY_MSG_FORWARD_TYPE_ATTACHMENT: + /* 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); - break; - } + else + new_msg = modest_formatter_inline (formatter, body, header, + attachments); } + g_object_unref (G_OBJECT(formatter)); if (body) g_object_unref (G_OBJECT(body)); @@ -469,14 +540,39 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, co 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) { @@ -502,13 +598,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, NULL, 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) @@ -535,6 +634,8 @@ 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 */ if (msg != NULL) { parts = TNY_LIST (tny_simple_list_new()); @@ -542,7 +643,8 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg, tny_list_foreach (parts, add_if_attachment, &attachments_list); } - new_msg = create_reply_forward_mail (msg, header, 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); @@ -555,6 +657,7 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg, 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); @@ -576,8 +679,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