On disposing folder view, remove all accounts from store.

[modest] / src / widgets / modest-gtkhtml-mime-part-view.c

diff --git a/src/widgets/modest-gtkhtml-mime-part-view.c b/src/widgets/modest-gtkhtml-mime-part-view.c
index 69c201b..9ef261c 100644 (file)
--- a/src/widgets/modest-gtkhtml-mime-part-view.c
+++ b/src/widgets/modest-gtkhtml-mime-part-view.c
@@ -277,7 +277,6 @@ modest_gtkhtml_mime_part_view_init (ModestGtkhtmlMimePartView *self)
        gtk_html_set_caret_mode      (GTK_HTML(self), FALSE);
        gtk_html_set_blocking        (GTK_HTML(self), TRUE);
        gtk_html_set_images_blocking (GTK_HTML(self), TRUE);
-       gtk_container_set_border_width (GTK_CONTAINER (self), MODEST_MARGIN_DEFAULT);
 
 #ifdef MODEST_TOOLKIT_HILDON2
 #ifdef HAVE_GTK_HTML_SET_MAX_IMAGE_SIZE
@@ -461,15 +460,19 @@ set_html_part (ModestGtkhtmlMimePartView *self, TnyMimePart *part, const gchar *
 {
        GtkHTMLStream *gtkhtml_stream;
        TnyStream *tny_stream;
+       gchar *content_type;
 
        g_return_if_fail (self);
        g_return_if_fail (part);
 
        g_signal_emit (G_OBJECT (self), signals[STOP_STREAMS_SIGNAL], 0);
 
-       gtkhtml_stream = gtk_html_begin_full(GTK_HTML(self), NULL, (char *) encoding, 0);
+       content_type = g_strdup_printf ("text/html; charset=%s", encoding);
+       gtkhtml_stream = gtk_html_begin_full(GTK_HTML(self), NULL, content_type, 0);
+       g_free (content_type);
 
        tny_stream     = TNY_STREAM(modest_tny_stream_gtkhtml_new (gtkhtml_stream, GTK_HTML (self)));
+       modest_tny_stream_gtkhtml_set_max_size (MODEST_TNY_STREAM_GTKHTML (tny_stream), 128*1024);
        tny_stream_reset (tny_stream);
 
        tny_mime_part_decode_to_stream_async (TNY_MIME_PART (part),
@@ -491,11 +494,14 @@ set_text_part (ModestGtkhtmlMimePartView *self, TnyMimePart *part)
 
        gtkhtml_stream = gtk_html_begin(GTK_HTML(self));
        tny_stream =  TNY_STREAM(modest_tny_stream_gtkhtml_new (gtkhtml_stream, GTK_HTML (self)));
+       modest_tny_stream_gtkhtml_set_max_size (MODEST_TNY_STREAM_GTKHTML (tny_stream), 128*1024);
        text_to_html_stream = TNY_STREAM (modest_stream_text_to_html_new (tny_stream));
        modest_stream_text_to_html_set_linkify_limit (MODEST_STREAM_TEXT_TO_HTML (text_to_html_stream),
                                                      64*1024);
        modest_stream_text_to_html_set_full_limit (MODEST_STREAM_TEXT_TO_HTML (text_to_html_stream),
-                                                  640*1024);
+                                                  128*1024);
+       modest_stream_text_to_html_set_line_limit (MODEST_STREAM_TEXT_TO_HTML (text_to_html_stream),
+                                                  1024);
 
        tny_mime_part_decode_to_stream_async (TNY_MIME_PART (part),
                                              text_to_html_stream, decode_to_stream_cb,