* src/modest-defs.h:

        * Add (hidden) setting to enable fetching external images in
          html messages.
* src/widgets/modest-gtkhtml-mime-part-view.c:
        * Now it fetches external images from http servers, if allowed
          in a hidden setting. It does the fetch asynchronously so that
          it's retrieved after showing the message.
* src/modest-init.c:
        * Default value of fetching external images is false.

pmo-trunk-r3953

diff --git a/src/modest-defs.h b/src/modest-defs.h
index 65dd89f..009ac99 100644 (file)
--- a/src/modest-defs.h
+++ b/src/modest-defs.h
@@ -195,6 +195,9 @@
 #define MODEST_CONF_REPLY_TYPE           MODEST_CONF_NAMESPACE "/reply_type"        /*  int  */
 #define MODEST_CONF_FORWARD_TYPE         MODEST_CONF_NAMESPACE "/forward_type"      /*  int  */
 
+/* hidden global settings */
+#define MODEST_CONF_FETCH_HTML_EXTERNAL_IMAGES MODEST_CONF_NAMESPACE "/fetch_external_images" /* bool */
+
 /* Notification ids */
 #define MODEST_CONF_NOTIFICATION_IDS MODEST_CONF_NAMESPACE "/notification_ids"      /* list of ints */
 

diff --git a/src/modest-init.c b/src/modest-init.c
index b453992..79247e0 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -720,6 +720,9 @@ init_default_settings (ModestConf *conf)
 
        if (!modest_conf_key_exists (conf, MODEST_CONF_REPLY_TYPE, NULL))
                modest_conf_set_int (conf, MODEST_CONF_REPLY_TYPE, MODEST_TNY_MSG_REPLY_TYPE_QUOTE, NULL);
+
+       if (!modest_conf_key_exists (conf, MODEST_CONF_FETCH_HTML_EXTERNAL_IMAGES, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_FETCH_HTML_EXTERNAL_IMAGES, FALSE, NULL);
 }
 
 

diff --git a/src/widgets/modest-gtkhtml-mime-part-view.c b/src/widgets/modest-gtkhtml-mime-part-view.c
index b6855c7..324b568 100644 (file)
--- a/src/widgets/modest-gtkhtml-mime-part-view.c
+++ b/src/widgets/modest-gtkhtml-mime-part-view.c
@@ -36,9 +36,12 @@
 #include <tny-mime-part-view.h>
 #include <modest-stream-text-to-html.h>
 #include <modest-text-utils.h>
+#include <modest-conf.h>
+#include <modest-runtime.h>
 #include <widgets/modest-mime-part-view.h>
 #include <widgets/modest-zoomable.h>
 #include <widgets/modest-tny-stream-gtkhtml.h>
+#include <libgnomevfs/gnome-vfs.h>
 
 /* gobject structure methods */
 static void    modest_gtkhtml_mime_part_view_class_init (ModestGtkhtmlMimePartViewClass *klass);
@@ -258,6 +261,70 @@ 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)
@@ -266,6 +333,23 @@ 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;
+       }
+       
        tny_stream = TNY_STREAM (modest_tny_stream_gtkhtml_new (stream));
        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);

diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c
index 38e37be..48216b0 100644 (file)
--- a/src/widgets/modest-gtkhtml-msg-view.c
+++ b/src/widgets/modest-gtkhtml-msg-view.c
@@ -36,6 +36,7 @@
 #include <glib/gi18n.h>
 #include <tny-list.h>
 #include <tny-simple-list.h>
+#include <tny-vfs-stream.h>
 
 #include <modest-tny-msg.h>
 #include <modest-text-utils.h>
@@ -1387,7 +1388,7 @@ on_fetch_url (GtkWidget *widget, const gchar *uri,
        TnyMimePart *part = NULL;
        
        priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
-       
+
        /*
         * we search for either something starting with cid:, or something
         * with no prefix at all; this latter case occurs when sending mails