Do ignore empty recipients when checking names

[modest] / src / modest-formatter.c

diff --git a/src/modest-formatter.c b/src/modest-formatter.c
index 8cdd091..aade0e3 100644 (file)
--- a/src/modest-formatter.c
+++ b/src/modest-formatter.c
@@ -33,11 +33,11 @@
 #include <tny-simple-list.h>
 #include <tny-gtk-text-buffer-stream.h>
 #include <tny-camel-mem-stream.h>
-#include <tny-camel-html-to-text-stream.h>
 #include "modest-formatter.h"
 #include "modest-text-utils.h"
 #include "modest-tny-platform-factory.h"
-#include <modest-runtime.h>
+#include "modest-runtime.h"
+#include "modest-stream-html-to-text.h"
 
 #define LINE_WRAP 78
 #define MAX_BODY_LINES 1024
@@ -73,20 +73,22 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
 {
        TnyStream *mp_stream;
        TnyStream *stream;
-       TnyStream *input_stream;
+       TnyStream *input_stream = NULL;
        GtkTextBuffer *buf;
        GtkTextIter start, end;
        gchar *text;
        ModestFormatterPrivate *priv;
-       gint total, total_lines, line_chars;
+       gint total, lines, total_lines, line_chars;
+       gboolean is_html, first_time;
 
        buf = gtk_text_buffer_new (NULL);
        stream = TNY_STREAM (tny_gtk_text_buffer_stream_new (buf));
        tny_stream_reset (stream);
        mp_stream = tny_mime_part_get_decoded_stream (body);
 
-       if (g_strcmp0 (tny_mime_part_get_content_type (body), "text/html") == 0) {
-               input_stream = tny_camel_html_to_text_stream_new (mp_stream);
+       is_html = (g_strcmp0 (tny_mime_part_get_content_type (body), "text/html") == 0);
+       if (is_html) {
+               input_stream = modest_stream_html_to_text_new (mp_stream);
        } else {
                input_stream = g_object_ref (mp_stream);
        }
@@ -94,7 +96,9 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
        total = 0;
        total_lines = 0;
        line_chars = 0;
+       lines = 0;
 
+       first_time = TRUE;
        while (!tny_stream_is_eos (input_stream)) {
                gchar buffer [128];
                gchar *offset;
@@ -106,9 +110,12 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
                        break;
                n_read = tny_stream_read (input_stream, buffer, next_read);
 
+               if (G_UNLIKELY (n_read < 0))
+                       break;
+
                offset = buffer;
                while (offset < buffer + n_read) {
-                       
+
                        if (*offset == '\n') {
                                total_lines ++;
                                line_chars = 0;
@@ -124,11 +131,11 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
                        offset++;
                }
 
-               
-
                if (offset - buffer > 0) {
-                       gint n_write;
-                       n_write = tny_stream_write (stream, buffer, offset - buffer);
+                       gint n_write = 0, to_write = 0;
+
+                       to_write = offset - buffer;
+                       n_write = tny_stream_write (stream, buffer, to_write);
                        total += n_write;
                } else if (n_read == -1) {
                        break;
@@ -143,7 +150,7 @@ extract_text (ModestFormatter *self, TnyMimePart *body)
        g_object_unref (G_OBJECT(stream));
        g_object_unref (G_OBJECT (mp_stream));
        g_object_unref (G_OBJECT (input_stream));
-       
+
        gtk_text_buffer_get_bounds (buf, &start, &end);
        text = gtk_text_buffer_get_text (buf, &start, &end, FALSE);
        g_object_unref (G_OBJECT(buf));
@@ -200,7 +207,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);
@@ -226,32 +233,6 @@ modest_formatter_inline (ModestFormatter *self, TnyMimePart *body, TnyHeader *he
        return modest_formatter_do (self, body, header, modest_formatter_wrapper_inline, attachments);
 }
 
-static void
-remove_purgeds (TnyMimePart *part)
-{
-       TnyList *parts;
-       TnyIterator *iterator;
-
-       parts = TNY_LIST (tny_simple_list_new ());
-       tny_mime_part_get_parts (part, parts);
-
-       for (iterator = tny_list_create_iterator (parts);
-            !tny_iterator_is_done (iterator);
-            tny_iterator_next (iterator)) {
-               TnyMimePart *current;
-
-               current = (TnyMimePart *) tny_iterator_get_current (iterator);
-               if (tny_mime_part_is_purged (current)) {
-                       tny_mime_part_del_part (part, current);
-               }
-
-               g_object_unref (current);
-       }
-
-       g_object_unref (iterator);
-       g_object_unref (parts);
-}
-
 TnyMsg *
 modest_formatter_attach (ModestFormatter *self, TnyMsg *msg, TnyHeader *header)
 {
@@ -273,10 +254,6 @@ modest_formatter_attach (ModestFormatter *self, TnyMsg *msg, TnyHeader *header)
        g_object_unref (body_part);
 
        if (msg) {
-
-               /* Remove purgeds */
-               remove_purgeds (TNY_MIME_PART (msg));
-
                /* Add parts */
                tny_mime_part_add_part (TNY_MIME_PART (new_msg), TNY_MIME_PART (msg));
        }
@@ -444,7 +421,7 @@ modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHea
                                          from,
                                          tny_header_get_date_sent (header),
                                          filenames,
-                                         80);
+                                         72);
        g_free (from);
 
        g_list_foreach (filenames, (GFunc) g_free, NULL);
@@ -505,7 +482,7 @@ find_body_parent (TnyMimePart *part)
        msg_content_type = tny_mime_part_get_content_type (part);
 
        if ((msg_content_type != NULL) &&
-           (!g_strcasecmp (msg_content_type, "multipart/alternative")))
+           (!g_ascii_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/"))) {
@@ -518,10 +495,10 @@ find_body_parent (TnyMimePart *part)
 
                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")) {
+                       if (part && !g_ascii_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")) {
+                       } else if (part && !g_ascii_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) {
                                related_part = part;
                                break;
                        }