#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
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);
}
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;
offset = buffer;
while (offset < buffer + n_read) {
-
+
if (*offset == '\n') {
total_lines ++;
line_chars = 0;
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;
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));
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);