X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=d168d40633e359a1dbe838986765fea0f4b60766;hb=13c1ac80f5a889a436562a771cf1615aa2454686;hp=4c5b67dc1fc922b58b111886952231eff5a4f270;hpb=409da221f48571a4c86a3d692e60f90b2c8473ad;p=modest diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index 4c5b67d..d168d40 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -32,11 +32,11 @@ #include #include #include -#include +#include +#include "modest-formatter.h" #include #include - #ifdef HAVE_CONFIG_H #include #endif /*HAVE_CONFIG_H */ @@ -46,6 +46,7 @@ static TnyMimePart * add_body_part (TnyMsg *msg, const gchar *body, const gchar *content_type, gboolean has_attachments); +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); @@ -63,10 +64,8 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, /* Create new msg */ fact = modest_runtime_get_platform_factory (); new_msg = tny_platform_factory_new_msg (fact); - header = tny_platform_factory_new_header (fact); + header = tny_msg_get_header (new_msg); - /* WARNING: set the header before assign values to it */ - tny_msg_set_header (new_msg, header); tny_header_set_from (TNY_HEADER (header), from); tny_header_set_replyto (TNY_HEADER (header), from); tny_header_set_to (TNY_HEADER (header), mailto); @@ -78,6 +77,43 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc, /* Add the body of the new mail */ add_body_part (new_msg, body, content_type, (attachments ? TRUE: FALSE)); + g_free (content_type); + + /* Add attachments */ + add_attachments (new_msg, (GList*) attachments); + + return new_msg; +} + +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) +{ + 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); + 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); + + content_type = get_content_type(plain_body); + + /* Add the body of the new mail */ + add_html_body_part (new_msg, html_body); + add_body_part (new_msg, plain_body, content_type, TRUE); + g_free (content_type); /* Add attachments */ add_attachments (new_msg, (GList*) attachments); @@ -127,6 +163,39 @@ add_body_part (TnyMsg *msg, return text_body_part; } +static TnyMimePart * +add_html_body_part (TnyMsg *msg, + const gchar *body) +{ + TnyMimePart *html_body_part = NULL; + 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)))); + + /* Create body part if needed */ + html_body_part = tny_platform_factory_new_mime_part + (modest_runtime_get_platform_factory ()); + + /* Construct MIME part */ + tny_stream_reset (html_body_stream); + tny_mime_part_construct_from_stream (html_body_part, + html_body_stream, + "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 */ + g_object_unref (html_body_stream); + + return html_body_part; +} + static void add_attachments (TnyMsg *msg, GList *attachments_list) { @@ -134,6 +203,7 @@ add_attachments (TnyMsg *msg, GList *attachments_list) TnyMimePart *attachment_part, *old_attachment; const gchar *attachment_content_type; const gchar *attachment_filename; + const gchar *attachment_cid; TnyStream *attachment_stream; for (pos = (GList *)attachments_list; pos; pos = pos->next) { @@ -145,6 +215,7 @@ add_attachments (TnyMsg *msg, GList *attachments_list) 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, @@ -152,6 +223,7 @@ add_attachments (TnyMsg *msg, GList *attachments_list) tny_stream_reset (attachment_stream); tny_mime_part_set_filename (attachment_part, attachment_filename); + tny_mime_part_set_content_id (attachment_part, attachment_cid); tny_mime_part_add_part (TNY_MIME_PART (msg), attachment_part); /* g_object_unref (attachment_part); */ @@ -264,6 +336,168 @@ modest_tny_msg_find_body_part (TnyMsg *msg, gboolean want_html) } +static TnyMsg * +create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, guint type) +{ + TnyMsg *new_msg; + TnyHeader *new_header, *header; + gchar *new_subject; + TnyMimePart *body; + ModestFormatter *formatter; + + /* 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 */ + formatter = modest_formatter_new ("text/plain"); + + /* 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); + break; + } + } else { + switch (type) { + case MODEST_TNY_MSG_FORWARD_TYPE_INLINE: + default: + new_msg = modest_formatter_inline (formatter, body, header); + break; + case MODEST_TNY_MSG_FORWARD_TYPE_ATTACHMENT: + new_msg = modest_formatter_attach (formatter, body, header); + break; + } + } + g_object_unref (G_OBJECT(formatter)); + g_object_unref (G_OBJECT(body)); + + /* Fill the header */ + new_header = tny_msg_get_header (new_msg); + tny_header_set_from (new_header, from); + tny_header_set_replyto (new_header, from); + + /* Change the subject */ + new_subject = + (gchar *) modest_text_utils_derived_subject (tny_header_get_subject(header), + (is_reply) ? _("Re:") : _("Fwd:")); + tny_header_set_subject (new_header, (const gchar *) new_subject); + g_free (new_subject); + + /* Clean */ + g_object_unref (G_OBJECT (new_header)); + g_object_unref (G_OBJECT (header)); + + return new_msg; +} + +static void +add_if_attachment (gpointer data, gpointer user_data) +{ + TnyMimePart *part; + GList *attachments_list; + + part = TNY_MIME_PART (data); + attachments_list = (GList *) user_data; + + if (tny_mime_part_is_attachment (part)) + attachments_list = g_list_prepend (attachments_list, part); +} + +TnyMsg* +modest_tny_msg_create_forward_msg (TnyMsg *msg, + const gchar *from, + ModestTnyMsgForwardType forward_type) +{ + TnyMsg *new_msg; + TnyList *parts = NULL; + GList *attachments_list = NULL; + + new_msg = create_reply_forward_mail (msg, from, 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); + add_attachments (new_msg, attachments_list); + + /* Clean */ + if (attachments_list) + g_list_free (attachments_list); + g_object_unref (G_OBJECT (parts)); + + return new_msg; +} + +TnyMsg* +modest_tny_msg_create_reply_msg (TnyMsg *msg, + const gchar *from, + ModestTnyMsgReplyType reply_type, + ModestTnyMsgReplyMode reply_mode) +{ + TnyMsg *new_msg = NULL; + TnyHeader *new_header, *header; + const gchar* reply_to; + gchar *new_cc = NULL; + const gchar *cc = NULL, *bcc = NULL; + GString *tmp = NULL; + + new_msg = create_reply_forward_mail (msg, from, TRUE, reply_type); + + /* Fill the header */ + header = tny_msg_get_header (msg); + new_header = tny_msg_get_header (new_msg); + reply_to = tny_header_get_replyto (header); + + if (reply_to) + tny_header_set_to (new_header, reply_to); + else + tny_header_set_to (new_header, tny_header_get_from (header)); + + switch (reply_mode) { + case MODEST_TNY_MSG_REPLY_MODE_SENDER: + /* Do not fill neither cc nor bcc */ + break; + case MODEST_TNY_MSG_REPLY_MODE_LIST: + /* TODO */ + break; + case MODEST_TNY_MSG_REPLY_MODE_ALL: + /* Concatenate to, cc and bcc */ + cc = tny_header_get_cc (header); + 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); + + /* Remove my own address from the cc list. TODO: + remove also the To: of the new message, needed due + to the new reply_to feature */ + new_cc = (gchar *) + modest_text_utils_remove_address ((const gchar *) tmp->str, + from); + /* FIXME: remove also the mails from the new To: */ + tny_header_set_cc (new_header, new_cc); + + /* Clean */ + g_string_free (tmp, TRUE); + g_free (new_cc); + break; + } + + /* Clean */ + g_object_unref (G_OBJECT (new_header)); + g_object_unref (G_OBJECT (header)); + + return new_msg; +} + static gboolean is_ascii(const gchar *s)