X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-gtkhtml-mime-part-view.c;h=4e1116f2a946fd2fcc896feb95dcc94df25b3f8b;hp=0a3fd5d152d4a1f903ee2dfb2f963e41f585ee0f;hb=4b0fd07337bee5a1fa19d96d5f5dca43bb9ae64b;hpb=3b214150a992267f0722e89c94759f8e3c637c0a diff --git a/src/widgets/modest-gtkhtml-mime-part-view.c b/src/widgets/modest-gtkhtml-mime-part-view.c index 0a3fd5d..4e1116f 100644 --- a/src/widgets/modest-gtkhtml-mime-part-view.c +++ b/src/widgets/modest-gtkhtml-mime-part-view.c @@ -34,6 +34,7 @@ #include #include #include +#include "modest-tny-mime-part.h" #include #include #include @@ -42,6 +43,8 @@ #include #include #include +#include +#include /* gobject structure methods */ static void modest_gtkhtml_mime_part_view_class_init (ModestGtkhtmlMimePartViewClass *klass); @@ -51,12 +54,15 @@ static void modest_zoomable_init (gpointer g, gpointer if static void modest_isearch_view_init (gpointer g, gpointer iface_data); static void modest_gtkhtml_mime_part_view_init (ModestGtkhtmlMimePartView *self); static void modest_gtkhtml_mime_part_view_finalize (GObject *self); +static void modest_gtkhtml_mime_part_view_dispose (GObject *self); /* GtkHTML signal handlers */ static gboolean on_link_clicked (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMimePartView *self); static gboolean on_url (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMimePartView *self); static gboolean on_url_requested (GtkWidget *widget, const gchar *uri, GtkHTMLStream *stream, ModestGtkhtmlMimePartView *self); +static void on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata); +static gboolean update_style (ModestGtkhtmlMimePartView *self); /* TnyMimePartView implementation */ static void modest_gtkhtml_mime_part_view_clear (TnyMimePartView *self); static void modest_gtkhtml_mime_part_view_clear_default (TnyMimePartView *self); @@ -67,6 +73,12 @@ static TnyMimePart* modest_gtkhtml_mime_part_view_get_part_default (TnyMimePartV /* ModestMimePartView implementation */ static gboolean modest_gtkhtml_mime_part_view_is_empty (ModestMimePartView *self); static gboolean modest_gtkhtml_mime_part_view_is_empty_default (ModestMimePartView *self); +static gboolean modest_gtkhtml_mime_part_view_get_view_images (ModestMimePartView *self); +static gboolean modest_gtkhtml_mime_part_view_get_view_images_default (ModestMimePartView *self); +static void modest_gtkhtml_mime_part_view_set_view_images (ModestMimePartView *self, gboolean view_images); +static void modest_gtkhtml_mime_part_view_set_view_images_default (ModestMimePartView *self, gboolean view_images); +static gboolean modest_gtkhtml_mime_part_view_has_external_images (ModestMimePartView *self); +static gboolean modest_gtkhtml_mime_part_view_has_external_images_default (ModestMimePartView *self); /* ModestZoomable implementation */ static gdouble modest_gtkhtml_mime_part_view_get_zoom (ModestZoomable *self); static void modest_gtkhtml_mime_part_view_set_zoom (ModestZoomable *self, gdouble value); @@ -89,11 +101,14 @@ static gboolean modest_gtkhtml_mime_part_view_get_selection_area_default (Modest /* internal api */ static TnyMimePart *get_part (ModestGtkhtmlMimePartView *self); -static void set_html_part (ModestGtkhtmlMimePartView *self, TnyMimePart *part); +static void set_html_part (ModestGtkhtmlMimePartView *self, TnyMimePart *part, const gchar *encoding); static void set_text_part (ModestGtkhtmlMimePartView *self, TnyMimePart *part); static void set_empty_part (ModestGtkhtmlMimePartView *self); static void set_part (ModestGtkhtmlMimePartView *self, TnyMimePart *part); static gboolean is_empty (ModestGtkhtmlMimePartView *self); +static gboolean get_view_images (ModestGtkhtmlMimePartView *self); +static void set_view_images (ModestGtkhtmlMimePartView *self, gboolean view_images); +static gboolean has_external_images (ModestGtkhtmlMimePartView *self); static void set_zoom (ModestGtkhtmlMimePartView *self, gdouble zoom); static gdouble get_zoom (ModestGtkhtmlMimePartView *self); static gboolean has_contents_receiver (gpointer engine, const gchar *data, @@ -107,14 +122,24 @@ typedef struct _ModestGtkhtmlMimePartViewPrivate ModestGtkhtmlMimePartViewPrivat struct _ModestGtkhtmlMimePartViewPrivate { TnyMimePart *part; gdouble current_zoom; + gboolean view_images; + gboolean has_external_images; + GSList *sighandlers; }; #define MODEST_GTKHTML_MIME_PART_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_GTKHTML_MIME_PART_VIEW, \ ModestGtkhtmlMimePartViewPrivate)) +enum { + STOP_STREAMS_SIGNAL, + LAST_SIGNAL +}; + static GtkHTMLClass *parent_class = NULL; +static guint signals[LAST_SIGNAL] = {0}; + GtkWidget * modest_gtkhtml_mime_part_view_new () { @@ -190,15 +215,21 @@ static void modest_gtkhtml_mime_part_view_class_init (ModestGtkhtmlMimePartViewClass *klass) { GObjectClass *gobject_class; + GtkBindingSet *binding_set; + gobject_class = (GObjectClass*) klass; parent_class = g_type_class_peek_parent (klass); + gobject_class->dispose = modest_gtkhtml_mime_part_view_dispose; gobject_class->finalize = modest_gtkhtml_mime_part_view_finalize; klass->get_part_func = modest_gtkhtml_mime_part_view_get_part_default; klass->set_part_func = modest_gtkhtml_mime_part_view_set_part_default; klass->clear_func = modest_gtkhtml_mime_part_view_clear_default; klass->is_empty_func = modest_gtkhtml_mime_part_view_is_empty_default; + klass->get_view_images_func = modest_gtkhtml_mime_part_view_get_view_images_default; + klass->set_view_images_func = modest_gtkhtml_mime_part_view_set_view_images_default; + klass->has_external_images_func = modest_gtkhtml_mime_part_view_has_external_images_default; klass->get_zoom_func = modest_gtkhtml_mime_part_view_get_zoom_default; klass->set_zoom_func = modest_gtkhtml_mime_part_view_set_zoom_default; klass->zoom_minus_func = modest_gtkhtml_mime_part_view_zoom_minus_default; @@ -206,41 +237,165 @@ modest_gtkhtml_mime_part_view_class_init (ModestGtkhtmlMimePartViewClass *klass) klass->search_func = modest_gtkhtml_mime_part_view_search_default; klass->search_next_func = modest_gtkhtml_mime_part_view_search_next_default; klass->get_selection_area_func = modest_gtkhtml_mime_part_view_get_selection_area_default; - + + binding_set = gtk_binding_set_by_class (klass); + gtk_binding_entry_skip (binding_set, GDK_Down, 0); + gtk_binding_entry_skip (binding_set, GDK_Up, 0); + gtk_binding_entry_skip (binding_set, GDK_KP_Up, 0); + gtk_binding_entry_skip (binding_set, GDK_KP_Down, 0); + gtk_binding_entry_skip (binding_set, GDK_Page_Down, 0); + gtk_binding_entry_skip (binding_set, GDK_Page_Up, 0); + gtk_binding_entry_skip (binding_set, GDK_KP_Page_Up, 0); + gtk_binding_entry_skip (binding_set, GDK_KP_Page_Down, 0); + gtk_binding_entry_skip (binding_set, GDK_Home, 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_signal_new ("stop-streams", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (ModestGtkhtmlMimePartViewClass,stop_streams), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + } -static void +static void modest_gtkhtml_mime_part_view_init (ModestGtkhtmlMimePartView *self) { ModestGtkhtmlMimePartViewPrivate *priv = MODEST_GTKHTML_MIME_PART_VIEW_GET_PRIVATE (self); + GdkColor base; + GdkColor text; gtk_html_set_editable (GTK_HTML(self), FALSE); gtk_html_allow_selection (GTK_HTML(self), TRUE); gtk_html_set_caret_mode (GTK_HTML(self), FALSE); - gtk_html_set_blocking (GTK_HTML(self), FALSE); - gtk_html_set_images_blocking (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 + /* We set a maximum width of a bit less than the width of the screen, and a + maximum height of 2 times the full size of the window. Should be enough */ + gtk_html_set_max_image_size (GTK_HTML (self), 720, 880); +#endif +#ifdef HAVE_GTK_HTML_SET_ALLOW_DND + gtk_html_set_allow_dnd (GTK_HTML(self), FALSE); +#endif +#endif - g_signal_connect (G_OBJECT(self), "link_clicked", - G_CALLBACK(on_link_clicked), self); - g_signal_connect (G_OBJECT(self), "url_requested", - G_CALLBACK(on_url_requested), self); - g_signal_connect (G_OBJECT(self), "on_url", - G_CALLBACK(on_url), self); +#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); + gtk_widget_modify_text (GTK_WIDGET (self), GTK_STATE_NORMAL, &text); + + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT(self), "link_clicked", + G_CALLBACK(on_link_clicked), self); + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT(self), "url_requested", + G_CALLBACK(on_url_requested), self); + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT(self), "on_url", + G_CALLBACK(on_url), self); + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT(self), "notify::style", + G_CALLBACK (on_notify_style), (gpointer) self); priv->part = NULL; priv->current_zoom = 1.0; + priv->view_images = FALSE; + priv->has_external_images = FALSE; } static void modest_gtkhtml_mime_part_view_finalize (GObject *obj) { + ModestGtkhtmlMimePartViewPrivate *priv = MODEST_GTKHTML_MIME_PART_VIEW_GET_PRIVATE (obj); + + modest_signal_mgr_disconnect_all_and_destroy (priv->sighandlers); + priv->sighandlers = NULL; + G_OBJECT_CLASS (parent_class)->finalize (obj); } +static void +modest_gtkhtml_mime_part_view_dispose (GObject *obj) +{ + ModestGtkhtmlMimePartViewPrivate *priv = MODEST_GTKHTML_MIME_PART_VIEW_GET_PRIVATE (obj); + + g_signal_emit (G_OBJECT (obj), signals[STOP_STREAMS_SIGNAL], 0); + + if (priv->part) { + g_object_unref (priv->part); + priv->part = NULL; + } + + G_OBJECT_CLASS (parent_class)->dispose (obj); +} + /* GTKHTML SIGNALS HANDLERS */ +static void +on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata) +{ + if (strcmp ("style", spec->name) == 0) { + g_idle_add_full (G_PRIORITY_DEFAULT, (GSourceFunc) update_style, + g_object_ref (obj), g_object_unref); + gtk_widget_queue_draw (GTK_WIDGET (obj)); + } +} + +gboolean +same_color (GdkColor *a, GdkColor *b) +{ + return ((a->red == b->red) && + (a->green == b->green) && + (a->blue == b->blue)); +} + +static gboolean +update_style (ModestGtkhtmlMimePartView *self) +{ + GdkColor base; + GdkColor text; + GtkRcStyle *rc_style; + + gdk_threads_enter (); + + if (GTK_WIDGET_VISIBLE (self)) { + rc_style = gtk_widget_get_modifier_style (GTK_WIDGET (self)); + + gdk_color_parse ("#fff", &base); + gdk_color_parse ("#000", &text); + + if (!same_color (&(rc_style->base[GTK_STATE_NORMAL]), &base) && + !same_color (&(rc_style->text[GTK_STATE_NORMAL]), &text)) { + + rc_style->base[GTK_STATE_NORMAL] = base; + rc_style->text[GTK_STATE_NORMAL] = text; + gtk_widget_modify_style (GTK_WIDGET (self), rc_style); + } + } + + gdk_threads_leave (); + + return FALSE; +} + + + static gboolean on_link_clicked (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMimePartView *self) { @@ -261,70 +416,6 @@ on_url (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMimePartView *self) return result; } -typedef struct { - gpointer buffer; - GtkHTML *html; - GtkHTMLStream *stream; - gboolean html_finalized; -} ImageFetcherInfo; - -static void -html_finalized_notify (ImageFetcherInfo *ifinfo, - GObject *destroyed) -{ - ifinfo->html_finalized = TRUE; -} - -static void -image_fetcher_close (GnomeVFSAsyncHandle *handle, - GnomeVFSResult result, - gpointer data) -{ -} - -static void -image_fetcher_read (GnomeVFSAsyncHandle *handle, - GnomeVFSResult result, - gpointer buffer, - GnomeVFSFileSize bytes_requested, - GnomeVFSFileSize bytes_read, - ImageFetcherInfo *ifinfo) -{ - - if (ifinfo->html_finalized || result != GNOME_VFS_OK) { - gnome_vfs_async_close (handle, (GnomeVFSAsyncCloseCallback) image_fetcher_close, (gpointer) NULL); - if (!ifinfo->html_finalized) { - gtk_html_stream_close (ifinfo->stream, GTK_HTML_STREAM_OK); - g_object_weak_unref ((GObject *) ifinfo->html, (GWeakNotify) html_finalized_notify, (gpointer) ifinfo); - } - g_slice_free1 (128, ifinfo->buffer); - g_slice_free (ImageFetcherInfo, ifinfo); - return; - } - gtk_html_stream_write (ifinfo->stream, buffer, bytes_read); - gnome_vfs_async_read (handle, ifinfo->buffer, 128, - (GnomeVFSAsyncReadCallback)image_fetcher_read, ifinfo); - return; -} - -static void -image_fetcher_open (GnomeVFSAsyncHandle *handle, - GnomeVFSResult result, - ImageFetcherInfo *ifinfo) -{ - if (!ifinfo->html_finalized && result == GNOME_VFS_OK) { - ifinfo->buffer = g_slice_alloc (128); - gnome_vfs_async_read (handle, ifinfo->buffer, 128, - (GnomeVFSAsyncReadCallback) image_fetcher_read, ifinfo); - } else { - if (!ifinfo->html_finalized) { - gtk_html_stream_close (ifinfo->stream, GTK_HTML_STREAM_OK); - g_object_weak_unref ((GObject *) ifinfo->html, (GWeakNotify) html_finalized_notify, (gpointer) ifinfo); - } - g_slice_free (ImageFetcherInfo, ifinfo); - } -} - static gboolean on_url_requested (GtkWidget *widget, const gchar *uri, GtkHTMLStream *stream, ModestGtkhtmlMimePartView *self) @@ -333,50 +424,62 @@ on_url_requested (GtkWidget *widget, const gchar *uri, GtkHTMLStream *stream, TnyStream *tny_stream; g_return_val_if_fail (MODEST_IS_GTKHTML_MIME_PART_VIEW (self), FALSE); - if (g_str_has_prefix (uri, "http:") && - modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_FETCH_HTML_EXTERNAL_IMAGES, NULL)) { - GnomeVFSAsyncHandle *handle; - ImageFetcherInfo *ifinfo; - - ifinfo = g_slice_new (ImageFetcherInfo); - ifinfo->html_finalized = FALSE; - ifinfo->html = (GtkHTML *) self; - ifinfo->buffer = NULL; - ifinfo->stream = stream; - g_object_weak_ref ((GObject *) self, (GWeakNotify) html_finalized_notify, (gpointer) ifinfo); - gnome_vfs_async_open (&handle, uri, GNOME_VFS_OPEN_READ, - GNOME_VFS_PRIORITY_DEFAULT, - (GnomeVFSAsyncOpenCallback) image_fetcher_open, ifinfo); - return FALSE; + if (g_str_has_prefix (uri, "http:")) { + ModestGtkhtmlMimePartViewPrivate *priv = MODEST_GTKHTML_MIME_PART_VIEW_GET_PRIVATE (self); + + if (!priv->view_images) + priv->has_external_images = TRUE; } - - tny_stream = TNY_STREAM (modest_tny_stream_gtkhtml_new (stream)); + + tny_stream = TNY_STREAM (modest_tny_stream_gtkhtml_new (stream, GTK_HTML (widget))); g_signal_emit_by_name (MODEST_MIME_PART_VIEW (self), "fetch-url", uri, tny_stream, &result); - gtk_html_stream_close (stream, result?GTK_HTML_STREAM_OK:GTK_HTML_STREAM_ERROR); g_object_unref (tny_stream); return result; } /* INTERNAL API */ +static void +decode_to_stream_cb (TnyMimePart *self, + gboolean cancelled, + TnyStream *stream, + GError *err, + gpointer user_data) +{ + gboolean is_text = GPOINTER_TO_INT (user_data); + + if (is_text) { + if (tny_stream_write (stream, "\n", 1) == -1) { + g_warning ("failed to write CR in %s", __FUNCTION__); + } + tny_stream_reset (stream); + } + tny_stream_close (stream); +} static void -set_html_part (ModestGtkhtmlMimePartView *self, TnyMimePart *part) +set_html_part (ModestGtkhtmlMimePartView *self, TnyMimePart *part, const gchar *encoding) { GtkHTMLStream *gtkhtml_stream; - TnyStream *tny_stream; - + TnyStream *tny_stream; + gchar *content_type; + g_return_if_fail (self); g_return_if_fail (part); - - gtkhtml_stream = gtk_html_begin(GTK_HTML(self)); - tny_stream = TNY_STREAM(modest_tny_stream_gtkhtml_new (gtkhtml_stream)); + g_signal_emit (G_OBJECT (self), signals[STOP_STREAMS_SIGNAL], 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 ((TnyMimePart*)part, tny_stream, NULL); - g_object_unref (G_OBJECT(tny_stream)); - - gtk_html_stream_destroy (gtkhtml_stream); + tny_mime_part_decode_to_stream_async (TNY_MIME_PART (part), + tny_stream, decode_to_stream_cb, + NULL, GINT_TO_POINTER (FALSE)); + g_object_unref (tny_stream); } static void @@ -384,23 +487,29 @@ set_text_part (ModestGtkhtmlMimePartView *self, TnyMimePart *part) { TnyStream* text_to_html_stream, *tny_stream; GtkHTMLStream *gtkhtml_stream; - + g_return_if_fail (self); g_return_if_fail (part); - gtkhtml_stream = gtk_html_begin(GTK_HTML(self)); - tny_stream = TNY_STREAM(modest_tny_stream_gtkhtml_new (gtkhtml_stream)); + g_signal_emit (G_OBJECT (self), signals[STOP_STREAMS_SIGNAL], 0); + + 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); - - // FIXME: tinymail - tny_mime_part_decode_to_stream ((TnyMimePart*)part, text_to_html_stream, NULL); - tny_stream_reset (text_to_html_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), + 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, + NULL, GINT_TO_POINTER (TRUE)); + g_object_unref (G_OBJECT(text_to_html_stream)); g_object_unref (G_OBJECT(tny_stream)); - gtk_html_stream_destroy (gtkhtml_stream); } static void @@ -408,18 +517,22 @@ set_empty_part (ModestGtkhtmlMimePartView *self) { g_return_if_fail (self); - gtk_html_load_from_string (GTK_HTML(self), - "", 1); + g_signal_emit (G_OBJECT (self), signals[STOP_STREAMS_SIGNAL], 0); + gtk_html_load_from_string (GTK_HTML(self), "", 1); } static void set_part (ModestGtkhtmlMimePartView *self, TnyMimePart *part) { ModestGtkhtmlMimePartViewPrivate *priv; + gchar *header_content_type, *header_content_type_lower; + const gchar *tmp; + gchar *charset = NULL; g_return_if_fail (self); priv = MODEST_GTKHTML_MIME_PART_VIEW_GET_PRIVATE(self); + priv->has_external_images = FALSE; if (part != priv->part) { if (priv->part) @@ -434,10 +547,48 @@ set_part (ModestGtkhtmlMimePartView *self, TnyMimePart *part) return; } - if (tny_mime_part_content_type_is (part, "text/html")) - set_html_part (self, part); - else - set_text_part (self, part); + header_content_type = modest_tny_mime_part_get_header_value (part, "Content-Type"); + if (header_content_type) { + header_content_type = g_strstrip (header_content_type); + header_content_type_lower = g_ascii_strdown (header_content_type, -1); + } else { + header_content_type_lower = NULL; + } + + if (header_content_type_lower) { + tmp = strstr (header_content_type_lower, "charset="); + if (tmp) { + const gchar *tmp2; + tmp = tmp + strlen ("charset="); + + tmp2 = strstr (tmp, ";"); + if (tmp2) { + charset = g_strndup (tmp, tmp2-tmp); + } else { + charset = g_strdup (tmp); + } + } + } + + if (tny_mime_part_content_type_is (part, "text/html")) { + set_html_part (self, part, charset); + } else { + if (tny_mime_part_content_type_is (part, "message/rfc822")) { + if (header_content_type) { + if (g_str_has_prefix (header_content_type_lower, "text/html")) + set_html_part (self, part, charset); + else + set_text_part (self, part); + + } else { + set_text_part (self, part); + } + } else { + set_text_part (self, part); + } + } + g_free (header_content_type_lower); + g_free (header_content_type); } @@ -481,6 +632,39 @@ is_empty (ModestGtkhtmlMimePartView *self) return !has_contents; } +static gboolean +get_view_images (ModestGtkhtmlMimePartView *self) +{ + ModestGtkhtmlMimePartViewPrivate *priv; + + g_return_val_if_fail (MODEST_IS_GTKHTML_MIME_PART_VIEW (self), FALSE); + + priv = MODEST_GTKHTML_MIME_PART_VIEW_GET_PRIVATE (self); + return priv->view_images; +} + +static void +set_view_images (ModestGtkhtmlMimePartView *self, gboolean view_images) +{ + ModestGtkhtmlMimePartViewPrivate *priv; + + g_return_if_fail (MODEST_IS_GTKHTML_MIME_PART_VIEW (self)); + + priv = MODEST_GTKHTML_MIME_PART_VIEW_GET_PRIVATE (self); + priv->view_images = view_images; +} + +static gboolean +has_external_images (ModestGtkhtmlMimePartView *self) +{ + ModestGtkhtmlMimePartViewPrivate *priv; + + g_return_val_if_fail (MODEST_IS_GTKHTML_MIME_PART_VIEW (self), FALSE); + + priv = MODEST_GTKHTML_MIME_PART_VIEW_GET_PRIVATE (self); + return priv->has_external_images; +} + static void set_zoom (ModestGtkhtmlMimePartView *self, gdouble zoom) { @@ -545,9 +729,9 @@ tny_mime_part_view_init (gpointer g, gpointer iface_data) { TnyMimePartViewIface *klass = (TnyMimePartViewIface *)g; - klass->get_part_func = modest_gtkhtml_mime_part_view_get_part; - klass->set_part_func = modest_gtkhtml_mime_part_view_set_part; - klass->clear_func = modest_gtkhtml_mime_part_view_clear; + klass->get_part = modest_gtkhtml_mime_part_view_get_part; + klass->set_part = modest_gtkhtml_mime_part_view_set_part; + klass->clear = modest_gtkhtml_mime_part_view_clear; return; } @@ -601,6 +785,9 @@ modest_mime_part_view_init (gpointer g, gpointer iface_data) ModestMimePartViewIface *klass = (ModestMimePartViewIface *)g; klass->is_empty_func = modest_gtkhtml_mime_part_view_is_empty; + klass->get_view_images_func = modest_gtkhtml_mime_part_view_get_view_images; + klass->set_view_images_func = modest_gtkhtml_mime_part_view_set_view_images; + klass->has_external_images_func = modest_gtkhtml_mime_part_view_has_external_images; return; } @@ -612,11 +799,47 @@ modest_gtkhtml_mime_part_view_is_empty (ModestMimePartView *self) } static gboolean +modest_gtkhtml_mime_part_view_get_view_images (ModestMimePartView *self) +{ + return MODEST_GTKHTML_MIME_PART_VIEW_GET_CLASS (self)->get_view_images_func (self); +} + +static void +modest_gtkhtml_mime_part_view_set_view_images (ModestMimePartView *self, gboolean view_images) +{ + MODEST_GTKHTML_MIME_PART_VIEW_GET_CLASS (self)->set_view_images_func (self, view_images); +} + +static gboolean +modest_gtkhtml_mime_part_view_has_external_images (ModestMimePartView *self) +{ + return MODEST_GTKHTML_MIME_PART_VIEW_GET_CLASS (self)->has_external_images_func (self); +} + +static gboolean modest_gtkhtml_mime_part_view_is_empty_default (ModestMimePartView *self) { return is_empty (MODEST_GTKHTML_MIME_PART_VIEW (self)); } +static gboolean +modest_gtkhtml_mime_part_view_get_view_images_default (ModestMimePartView *self) +{ + return get_view_images (MODEST_GTKHTML_MIME_PART_VIEW (self)); +} + +static void +modest_gtkhtml_mime_part_view_set_view_images_default (ModestMimePartView *self, gboolean view_images) +{ + set_view_images (MODEST_GTKHTML_MIME_PART_VIEW (self), view_images); +} + +static gboolean +modest_gtkhtml_mime_part_view_has_external_images_default (ModestMimePartView *self) +{ + return has_external_images (MODEST_GTKHTML_MIME_PART_VIEW (self)); +} + /* MODEST ZOOMABLE IMPLEMENTATION */ static void