* Fixes NB#87102, add the signature to the forwarded mails that include the original...
[modest] / src / modest-formatter.c
index 5a3ced8..f2ecfd9 100644 (file)
@@ -32,8 +32,7 @@
 #include <tny-header.h>
 #include <tny-simple-list.h>
 #include <tny-gtk-text-buffer-stream.h>
-#include <tny-camel-stream.h>
-#include <camel/camel-stream-mem.h>
+#include <tny-camel-mem-stream.h>
 #include "modest-formatter.h"
 #include "modest-text-utils.h"
 #include "modest-tny-platform-factory.h"
@@ -55,9 +54,14 @@ typedef gchar* FormatterFunc (ModestFormatter *self, const gchar *text, TnyHeade
 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, 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 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)
@@ -71,7 +75,7 @@ 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));
@@ -103,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 */
@@ -117,7 +120,8 @@ construct_from_text (TnyMimePart *part,
 }
 
 static TnyMsg *
-modest_formatter_do (ModestFormatter *self, TnyMimePart *body, TnyHeader *header, FormatterFunc func, GList *attachments)
+modest_formatter_do (ModestFormatter *self, TnyMimePart *body, TnyHeader *header, FormatterFunc func,
+                    GList *attachments)
 {
        TnyMsg *new_msg = NULL;
        gchar *body_text = NULL, *txt = NULL;
@@ -129,7 +133,7 @@ modest_formatter_do (ModestFormatter *self, TnyMimePart *body, TnyHeader *header
        g_return_val_if_fail (func, NULL);
 
        /* Build new part */
-       new_msg = modest_formatter_create_message (self, TRUE, attachments != NULL);
+       new_msg = modest_formatter_create_message (self, TRUE, attachments != NULL, FALSE);
        body_part = modest_formatter_create_body_part (self, new_msg);
 
        if (body)
@@ -141,7 +145,7 @@ modest_formatter_do (ModestFormatter *self, TnyMimePart *body, TnyHeader *header
        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);
@@ -168,36 +172,29 @@ modest_formatter_inline (ModestFormatter *self, TnyMimePart *body, TnyHeader *he
 }
 
 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;
-       const gchar *subject;
-       TnyMimePart *body_part = NULL, *attach_part = NULL;
+       TnyMimePart *body_part = NULL;
        ModestFormatterPrivate *priv;
-       TnyPlatformFactory *fact;
+       gchar *txt;
 
-       fact = modest_runtime_get_platform_factory ();
        /* Build new part */
-       new_msg     = modest_formatter_create_message (self, TRUE, TRUE);
+       new_msg     = modest_formatter_create_message (self, TRUE, TRUE, FALSE);
        body_part = modest_formatter_create_body_part (self, new_msg);
-       attach_part = tny_platform_factory_new_mime_part (fact);
 
        /* Create the two parts */
        priv = MODEST_FORMATTER_GET_PRIVATE (self);
-       attach_text = extract_text (self, body);
-       construct_from_text (body_part, "", priv->content_type);
+       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);
-       construct_from_text (attach_part, (const gchar*) attach_text, priv->content_type);
-       subject = tny_header_get_subject (header);
-       tny_mime_part_set_filename (attach_part, subject ? subject : _("No subject"));
-
-       /* Add parts */
-       tny_mime_part_add_part (TNY_MIME_PART (new_msg), attach_part);
-       g_object_unref (attach_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;
 }
@@ -282,38 +279,54 @@ modest_formatter_get_type (void)
 
 /****************/
 static gchar *
-modest_formatter_wrapper_cite (ModestFormatter *self, const gchar *text, TnyHeader *header, GList *attachments) 
+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, 
-                                      priv->signature,
-                                      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, GList *attachments) 
+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, 
-                                        priv->signature,
-                                        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, GList *attachments) 
+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)) {
@@ -321,7 +334,7 @@ modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHea
                gchar *filename = NULL;
                if (TNY_IS_MSG (part)) {
                        TnyHeader *header = tny_msg_get_header (TNY_MSG (part));
-                       filename = g_strdup (tny_header_get_subject (header));
+                       filename = tny_header_dup_subject (header);
                        if ((filename == NULL)||(filename[0] == '\0')) {
                                g_free (filename);
                                filename = g_strdup (_("mail_va_no_subject"));
@@ -337,13 +350,15 @@ modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHea
        filenames = g_list_reverse (filenames);
 
        /* TODO: get 80 from the configuration */
+       from = tny_header_dup_from (header);
        result = modest_text_utils_quote (text, 
                                          priv->content_type, 
                                          priv->signature,
-                                         tny_header_get_from (header), 
+                                         from,
                                          tny_header_get_date_sent (header),
                                          filenames,
                                          80);
+       g_free (from);
 
        g_list_foreach (filenames, (GFunc) g_free, NULL);
        g_list_free (filenames);
@@ -351,21 +366,44 @@ modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHea
 }
 
 TnyMsg * 
-modest_formatter_create_message (ModestFormatter *self, gboolean single_body, gboolean has_attachments)
+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");
        }
@@ -373,51 +411,71 @@ modest_formatter_create_message (ModestFormatter *self, gboolean single_body, gb
        return result;
 }
 
-TnyMimePart * 
-modest_formatter_create_body_part (ModestFormatter *self, TnyMsg *msg)
+TnyMimePart *
+find_body_parent (TnyMimePart *part)
 {
-       TnyMimePart *result = NULL;
        const gchar *msg_content_type = NULL;
-       TnyPlatformFactory *fact = NULL;
+       msg_content_type = tny_mime_part_get_content_type (part);
 
-       fact = modest_runtime_get_platform_factory ();
-       msg_content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
-       /* First it checks if the main part is alternative */
-       if ((msg_content_type != NULL) && 
-           (!g_strcasecmp (msg_content_type, "multipart/alternative"))) {
-               result = tny_platform_factory_new_mime_part (fact);
-               tny_mime_part_add_part (TNY_MIME_PART (msg), result);
-               return result;
-       } else if ((msg_content_type != NULL) &&
-                  (!g_strcasecmp (msg_content_type, "multipart/mixed"))) {
-               TnyList *parts = NULL;
+       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;
-
-               parts = TNY_LIST (tny_simple_list_new ());
-               tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+               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 (!g_strcasecmp(tny_mime_part_get_content_type (part), "multipart/alternative")) {
+                       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;
                        }
-                       g_object_unref (part);
+
+                       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);
-               if (alternative_part != NULL) {
-                       tny_mime_part_add_part (alternative_part, result);
-               } else {
-                       tny_mime_part_add_part (TNY_MIME_PART (msg), result);
-               }
-               g_object_unref (G_OBJECT (parts));
-               return result;
+               tny_mime_part_add_part (TNY_MIME_PART (parent), result);
+               g_object_unref (parent);
        } else {
-               /* We add a reference as this method is intended to obtain
-                  a ref'ed part */
-               g_object_ref (msg);
-               return TNY_MIME_PART (msg);
+               result = g_object_ref (msg);
        }
+
+       return result;
+
 }