X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-formatter.c;h=f2ecfd92b2e45b3a6a0348b78be8c12b84c923f6;hp=19d18791f684c9a1e2fe6ed4b5829d3ab6a08e22;hb=a257b9e8b31184a663ccb7676362d4ac2cb1b039;hpb=05bad5813b835eef161d5d037dc4b24a1d4c57bd diff --git a/src/modest-formatter.c b/src/modest-formatter.c index 19d1879..f2ecfd9 100644 --- a/src/modest-formatter.c +++ b/src/modest-formatter.c @@ -27,18 +27,21 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include +#include #include -#include -#include +#include #include "modest-formatter.h" #include "modest-text-utils.h" #include "modest-tny-platform-factory.h" +#include typedef struct _ModestFormatterPrivate ModestFormatterPrivate; struct _ModestFormatterPrivate { gchar *content_type; + gchar *signature; }; #define MODEST_FORMATTER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_FORMATTER, \ @@ -46,16 +49,19 @@ struct _ModestFormatterPrivate { static GObjectClass *parent_class = NULL; -typedef gchar* FormatterFunc (ModestFormatter *self, const gchar *text, TnyHeader *header); +typedef gchar* FormatterFunc (ModestFormatter *self, const gchar *text, TnyHeader *header, GList *attachments); -static TnyMsg *modest_formatter_do (ModestFormatter *self, - TnyMimePart *body, - TnyHeader *header, - FormatterFunc func); +static TnyMsg *modest_formatter_do (ModestFormatter *self, TnyMimePart *body, TnyHeader *header, + FormatterFunc func, GList *attachments); -static gchar* modest_formatter_wrapper_cite (ModestFormatter *self, const gchar *text, TnyHeader *header); -static gchar* modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHeader *header); -static gchar* modest_formatter_wrapper_inline (ModestFormatter *self, const gchar *text, TnyHeader *header); +static gchar* modest_formatter_wrapper_cite (ModestFormatter *self, const gchar *text, + TnyHeader *header, GList *attachments); +static gchar* modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, + TnyHeader *header, GList *attachments); +static gchar* modest_formatter_wrapper_inline (ModestFormatter *self, const gchar *text, + TnyHeader *header, GList *attachments); + +static TnyMimePart *find_body_parent (TnyMimePart *part); static gchar * extract_text (ModestFormatter *self, TnyMimePart *body) @@ -69,30 +75,27 @@ extract_text (ModestFormatter *self, TnyMimePart *body) buf = gtk_text_buffer_new (NULL); stream = TNY_STREAM (tny_gtk_text_buffer_stream_new (buf)); tny_stream_reset (stream); - tny_mime_part_decode_to_stream (body, stream); + tny_mime_part_decode_to_stream (body, stream, NULL); tny_stream_reset (stream); g_object_unref (G_OBJECT(stream)); - g_object_unref (G_OBJECT(body)); gtk_text_buffer_get_bounds (buf, &start, &end); text = gtk_text_buffer_get_text (buf, &start, &end, FALSE); - g_object_unref (buf); + g_object_unref (G_OBJECT(buf)); /* Convert to desired content type if needed */ priv = MODEST_FORMATTER_GET_PRIVATE (self); - if (strcmp (tny_mime_part_get_content_type (body), priv->content_type)) { + if (strcmp (tny_mime_part_get_content_type (body), priv->content_type) == 0) { if (!strcmp (priv->content_type, "text/html")) converted_text = modest_text_utils_convert_to_html (text); else converted_text = g_strdup (text); -/* converted_text = modest_text_utils_convert_to_plain (text); */ g_free (text); text = converted_text; } - return text; } @@ -104,13 +107,12 @@ construct_from_text (TnyMimePart *part, TnyStream *text_body_stream; /* Create the stream */ - text_body_stream = TNY_STREAM (tny_camel_stream_new - (camel_stream_mem_new_with_buffer - (text, strlen(text)))); + text_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer + (text, strlen(text))); /* Construct MIME part */ tny_stream_reset (text_body_stream); - tny_mime_part_construct_from_stream (part, text_body_stream, content_type); + tny_mime_part_construct (part, text_body_stream, content_type, "7bit"); tny_stream_reset (text_body_stream); /* Clean */ @@ -118,29 +120,32 @@ construct_from_text (TnyMimePart *part, } static TnyMsg * -modest_formatter_do (ModestFormatter *self, - TnyMimePart *body, - TnyHeader *header, - FormatterFunc func) +modest_formatter_do (ModestFormatter *self, TnyMimePart *body, TnyHeader *header, FormatterFunc func, + GList *attachments) { TnyMsg *new_msg = NULL; gchar *body_text = NULL, *txt = NULL; ModestFormatterPrivate *priv; - TnyPlatformFactory *fact; + TnyMimePart *body_part = NULL; g_return_val_if_fail (self, NULL); - g_return_val_if_fail (body, NULL); g_return_val_if_fail (header, NULL); g_return_val_if_fail (func, NULL); /* Build new part */ - fact = modest_tny_platform_factory_get_instance (); - new_msg = tny_platform_factory_new_msg (fact); - body_text = extract_text (self, body); - txt = (gchar *) func (self, (const gchar*) body_text, header); - priv = MODEST_FORMATTER_GET_PRIVATE (self); - construct_from_text (TNY_MIME_PART (new_msg), (const gchar*) txt, priv->content_type); + new_msg = modest_formatter_create_message (self, TRUE, attachments != NULL, FALSE); + body_part = modest_formatter_create_body_part (self, new_msg); + + if (body) + body_text = extract_text (self, body); + else + body_text = g_strdup (""); + txt = (gchar *) func (self, (const gchar*) body_text, header, attachments); + priv = MODEST_FORMATTER_GET_PRIVATE (self); + construct_from_text (TNY_MIME_PART (body_part), (const gchar*) txt, priv->content_type); + g_object_unref (body_part); + /* Clean */ g_free (body_text); g_free (txt); @@ -151,55 +156,51 @@ modest_formatter_do (ModestFormatter *self, TnyMsg * modest_formatter_cite (ModestFormatter *self, TnyMimePart *body, TnyHeader *header) { - return modest_formatter_do (self, body, header, modest_formatter_wrapper_cite); + return modest_formatter_do (self, body, header, modest_formatter_wrapper_cite, NULL); } TnyMsg * -modest_formatter_quote (ModestFormatter *self, TnyMimePart *body, TnyHeader *header) +modest_formatter_quote (ModestFormatter *self, TnyMimePart *body, TnyHeader *header, GList *attachments) { - return modest_formatter_do (self, body, header, modest_formatter_wrapper_quote); + return modest_formatter_do (self, body, header, modest_formatter_wrapper_quote, attachments); } TnyMsg * -modest_formatter_inline (ModestFormatter *self, TnyMimePart *body, TnyHeader *header) +modest_formatter_inline (ModestFormatter *self, TnyMimePart *body, TnyHeader *header, GList *attachments) { - return modest_formatter_do (self, body, header, modest_formatter_wrapper_inline); + return modest_formatter_do (self, body, header, modest_formatter_wrapper_inline, attachments); } TnyMsg * -modest_formatter_attach (ModestFormatter *self, TnyMimePart *body, TnyHeader *header) +modest_formatter_attach (ModestFormatter *self, TnyMsg *msg, TnyHeader *header) { TnyMsg *new_msg = NULL; - gchar *attach_text = NULL; - TnyMimePart *body_part = NULL, *attach_part = NULL; + TnyMimePart *body_part = NULL; ModestFormatterPrivate *priv; - TnyPlatformFactory *fact; + gchar *txt; - fact = modest_tny_platform_factory_get_instance (); /* Build new part */ - new_msg = tny_platform_factory_new_msg (fact); - body_part = tny_platform_factory_new_mime_part (fact); - attach_part = tny_platform_factory_new_mime_part (fact); + new_msg = modest_formatter_create_message (self, TRUE, TRUE, FALSE); + body_part = modest_formatter_create_body_part (self, new_msg); /* Create the two parts */ priv = MODEST_FORMATTER_GET_PRIVATE (self); - attach_text = extract_text (self, body); - construct_from_text (body_part, "", priv->content_type); - construct_from_text (attach_part, (const gchar*) attach_text, priv->content_type); - tny_mime_part_set_filename (attach_part, tny_header_get_subject (header)); - - /* Add parts */ - tny_mime_part_add_part (TNY_MIME_PART (new_msg), body_part); - tny_mime_part_add_part (TNY_MIME_PART (new_msg), attach_part); + txt = modest_text_utils_cite ("", priv->content_type, priv->signature, + NULL, tny_header_get_date_sent (header)); + construct_from_text (body_part, txt, priv->content_type); + g_free (txt); + g_object_unref (body_part); - /* Clean */ - g_free (attach_text); + if (msg) { + /* Add parts */ + tny_mime_part_add_part (TNY_MIME_PART (new_msg), TNY_MIME_PART (msg)); + } return new_msg; } ModestFormatter* -modest_formatter_new (const gchar *content_type) +modest_formatter_new (const gchar *content_type, const gchar *signature) { ModestFormatter *formatter; ModestFormatterPrivate *priv; @@ -207,6 +208,7 @@ modest_formatter_new (const gchar *content_type) formatter = g_object_new (MODEST_TYPE_FORMATTER, NULL); priv = MODEST_FORMATTER_GET_PRIVATE (formatter); priv->content_type = g_strdup (content_type); + priv->signature = g_strdup (signature); return formatter; } @@ -229,6 +231,9 @@ modest_formatter_finalize (GObject *object) if (priv->content_type) g_free (priv->content_type); + if (priv->signature) + g_free (priv->signature); + (*parent_class->finalize) (object); } @@ -274,38 +279,203 @@ modest_formatter_get_type (void) /****************/ static gchar * -modest_formatter_wrapper_cite (ModestFormatter *self, const gchar *text, TnyHeader *header) +modest_formatter_wrapper_cite (ModestFormatter *self, const gchar *text, TnyHeader *header, + GList *attachments) { + gchar *result, *from; ModestFormatterPrivate *priv = MODEST_FORMATTER_GET_PRIVATE (self); - - return modest_text_utils_cite (text, - priv->content_type, - tny_header_get_from (header), - tny_header_get_date_sent (header)); + + from = tny_header_dup_from (header); + result = modest_text_utils_cite (text, + priv->content_type, + priv->signature, + from, + tny_header_get_date_sent (header)); + g_free (from); + return result; } static gchar * -modest_formatter_wrapper_inline (ModestFormatter *self, const gchar *text, TnyHeader *header) +modest_formatter_wrapper_inline (ModestFormatter *self, const gchar *text, TnyHeader *header, + GList *attachments) { + gchar *result, *from, *to, *subject; ModestFormatterPrivate *priv = MODEST_FORMATTER_GET_PRIVATE (self); - return modest_text_utils_inline (text, - priv->content_type, - tny_header_get_from (header), - tny_header_get_date_sent (header), - tny_header_get_to (header), - tny_header_get_subject (header)); + from = tny_header_dup_from (header); + to = tny_header_dup_to (header); + subject = tny_header_dup_subject (header); + result = modest_text_utils_inline (text, + priv->content_type, + priv->signature, + from, + tny_header_get_date_sent (header), + to, + subject); + g_free (subject); + g_free (to); + g_free (from); + return result; } static gchar * -modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHeader *header) +modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHeader *header, + GList *attachments) { ModestFormatterPrivate *priv = MODEST_FORMATTER_GET_PRIVATE (self); + GList *filenames = NULL; + GList *node = NULL; + gchar *result = NULL; + gchar *from; + + /* First we need a GList of attachments filenames */ + for (node = attachments; node != NULL; node = g_list_next (node)) { + TnyMimePart *part = (TnyMimePart *) node->data; + gchar *filename = NULL; + if (TNY_IS_MSG (part)) { + TnyHeader *header = tny_msg_get_header (TNY_MSG (part)); + filename = tny_header_dup_subject (header); + if ((filename == NULL)||(filename[0] == '\0')) { + g_free (filename); + filename = g_strdup (_("mail_va_no_subject")); + } + g_object_unref (header); + } else { + filename = g_strdup (tny_mime_part_get_filename (part)); + if ((filename == NULL)||(filename[0] == '\0')) + filename = g_strdup (""); + } + filenames = g_list_append (filenames, filename); + } + filenames = g_list_reverse (filenames); /* TODO: get 80 from the configuration */ - return modest_text_utils_quote (text, - priv->content_type, - tny_header_get_from (header), - tny_header_get_date_sent (header), - 80); + from = tny_header_dup_from (header); + result = modest_text_utils_quote (text, + priv->content_type, + priv->signature, + from, + tny_header_get_date_sent (header), + filenames, + 80); + g_free (from); + + g_list_foreach (filenames, (GFunc) g_free, NULL); + g_list_free (filenames); + return result; +} + +TnyMsg * +modest_formatter_create_message (ModestFormatter *self, gboolean single_body, + gboolean has_attachments, gboolean has_images) +{ + TnyMsg *result = NULL; + TnyPlatformFactory *fact = NULL; + TnyMimePart *body_mime_part = NULL; + TnyMimePart *related_mime_part = NULL; + + fact = modest_runtime_get_platform_factory (); + result = tny_platform_factory_new_msg (fact); + if (has_attachments) { + tny_mime_part_set_content_type (TNY_MIME_PART (result), "multipart/mixed"); + if (has_images) { + related_mime_part = tny_platform_factory_new_mime_part (fact); + tny_mime_part_set_content_type (related_mime_part, "multipart/related"); + tny_mime_part_add_part (TNY_MIME_PART (result), related_mime_part); + } else { + related_mime_part = g_object_ref (result); + } + + if (!single_body) { + body_mime_part = tny_platform_factory_new_mime_part (fact); + tny_mime_part_set_content_type (body_mime_part, "multipart/alternative"); + tny_mime_part_add_part (TNY_MIME_PART (related_mime_part), body_mime_part); + g_object_unref (body_mime_part); + } + + g_object_unref (related_mime_part); + } else if (has_images) { + tny_mime_part_set_content_type (TNY_MIME_PART (result), "multipart/related"); + + if (!single_body) { + body_mime_part = tny_platform_factory_new_mime_part (fact); + tny_mime_part_set_content_type (body_mime_part, "multipart/alternative"); + tny_mime_part_add_part (TNY_MIME_PART (result), body_mime_part); + g_object_unref (body_mime_part); + } + + } else if (!single_body) { + tny_mime_part_set_content_type (TNY_MIME_PART (result), "multipart/alternative"); + } + + return result; +} + +TnyMimePart * +find_body_parent (TnyMimePart *part) +{ + const gchar *msg_content_type = NULL; + msg_content_type = tny_mime_part_get_content_type (part); + + if ((msg_content_type != NULL) && + (!g_strcasecmp (msg_content_type, "multipart/alternative"))) + return g_object_ref (part); + else if ((msg_content_type != NULL) && + (g_str_has_prefix (msg_content_type, "multipart/"))) { + TnyIterator *iter = NULL; + TnyMimePart *alternative_part = NULL; + TnyMimePart *related_part = NULL; + TnyList *parts = TNY_LIST (tny_simple_list_new ()); + tny_mime_part_get_parts (TNY_MIME_PART (part), 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/alternative")) { + alternative_part = part; + break; + } else if (part && !g_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) { + related_part = part; + break; + } + + if (part) + g_object_unref (part); + + tny_iterator_next (iter); + } + g_object_unref (iter); + g_object_unref (parts); + if (related_part) { + TnyMimePart *result; + result = find_body_parent (related_part); + g_object_unref (related_part); + return result; + } else if (alternative_part) + return alternative_part; + else + return g_object_ref (part); + } else + return NULL; +} + +TnyMimePart * +modest_formatter_create_body_part (ModestFormatter *self, TnyMsg *msg) +{ + TnyMimePart *result = NULL; + TnyPlatformFactory *fact = NULL; + TnyMimePart *parent = NULL; + + parent = find_body_parent (TNY_MIME_PART (msg)); + fact = modest_runtime_get_platform_factory (); + if (parent != NULL) { + result = tny_platform_factory_new_mime_part (fact); + tny_mime_part_add_part (TNY_MIME_PART (parent), result); + g_object_unref (parent); + } else { + result = g_object_ref (msg); + } + + return result; + }