Fixes NB#110349, added support to render messages with different encodings to UTF-8

pmo-trunk-r8791

diff --git a/configure.ac b/configure.ac
index 45bdd8a..0133311 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -140,6 +140,8 @@ AC_CHECK_FUNCS(gtk_html_get_selection_area)
 AC_SUBST(HAVE_GTK_HTML_GET_SELECTION_AREA)
 AC_CHECK_FUNCS(gtk_html_set_allow_dnd)
 AC_SUBST(HAVE_GTK_HTML_SET_ALLOW_DND)
 AC_SUBST(HAVE_GTK_HTML_GET_SELECTION_AREA)
 AC_CHECK_FUNCS(gtk_html_set_allow_dnd)
 AC_SUBST(HAVE_GTK_HTML_SET_ALLOW_DND)

+AC_CHECK_FUNCS(gtk_html_set_default_engine)
+AC_SUBST(HAVE_GTK_HTML_SET_DEFAULT_ENGINE)

 AC_CHECK_FUNCS(gtk_tree_view_column_get_cell_data_hint)
 AC_SUBST(HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT)
 CFLAGS="$modest_save_cflags"
 AC_CHECK_FUNCS(gtk_tree_view_column_get_cell_data_hint)
 AC_SUBST(HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT)
 CFLAGS="$modest_save_cflags"

diff --git a/src/widgets/modest-gtkhtml-mime-part-view.c b/src/widgets/modest-gtkhtml-mime-part-view.c
index 9c584b7..69c201b 100644 (file)
--- a/src/widgets/modest-gtkhtml-mime-part-view.c
+++ b/src/widgets/modest-gtkhtml-mime-part-view.c
@@ -251,7 +251,7 @@ modest_gtkhtml_mime_part_view_class_init (ModestGtkhtmlMimePartViewClass *klass)
        gtk_binding_entry_skip (binding_set, GDK_End, 0);
        gtk_binding_entry_skip (binding_set, GDK_KP_Home, 0);
        gtk_binding_entry_skip (binding_set, GDK_KP_End, 0);
        gtk_binding_entry_skip (binding_set, GDK_End, 0);
        gtk_binding_entry_skip (binding_set, GDK_KP_Home, 0);
        gtk_binding_entry_skip (binding_set, GDK_KP_End, 0);

-       
+

        g_type_class_add_private (gobject_class, sizeof(ModestGtkhtmlMimePartViewPrivate));
 
        signals[STOP_STREAMS_SIGNAL] = 
        g_type_class_add_private (gobject_class, sizeof(ModestGtkhtmlMimePartViewPrivate));
 
        signals[STOP_STREAMS_SIGNAL] = 

@@ -265,7 +265,7 @@ modest_gtkhtml_mime_part_view_class_init (ModestGtkhtmlMimePartViewClass *klass)
 
 }
 
 
 }
 

-static void    
+static void

 modest_gtkhtml_mime_part_view_init (ModestGtkhtmlMimePartView *self)
 {
        ModestGtkhtmlMimePartViewPrivate *priv = MODEST_GTKHTML_MIME_PART_VIEW_GET_PRIVATE (self);
 modest_gtkhtml_mime_part_view_init (ModestGtkhtmlMimePartView *self)
 {
        ModestGtkhtmlMimePartViewPrivate *priv = MODEST_GTKHTML_MIME_PART_VIEW_GET_PRIVATE (self);

@@ -290,6 +290,11 @@ modest_gtkhtml_mime_part_view_init (ModestGtkhtmlMimePartView *self)
 #endif
 #endif
 
 #endif
 #endif
 

+#ifdef HAVE_GTK_HTML_SET_DEFAULT_ENGINE
+       /* Enable Content type handling */
+       gtk_html_set_default_engine (GTK_HTML (self), TRUE);
+#endif
+

        gdk_color_parse ("#fff", &base);
        gdk_color_parse ("#000", &text);
        gtk_widget_modify_base (GTK_WIDGET (self), GTK_STATE_NORMAL, &base);
        gdk_color_parse ("#fff", &base);
        gdk_color_parse ("#000", &text);
        gtk_widget_modify_base (GTK_WIDGET (self), GTK_STATE_NORMAL, &base);

@@ -411,12 +416,6 @@ on_url (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMimePartView *self)
        return result;
 }
 
        return result;
 }
 

-typedef struct {
-       gpointer buffer;
-       GtkHTML *html;
-       GtkHTMLStream *stream;
-} ImageFetcherInfo;
-

 static gboolean
 on_url_requested (GtkWidget *widget, const gchar *uri, GtkHTMLStream *stream, 
                  ModestGtkhtmlMimePartView *self)
 static gboolean
 on_url_requested (GtkWidget *widget, const gchar *uri, GtkHTMLStream *stream, 
                  ModestGtkhtmlMimePartView *self)