Set active account of folder window before registering, to allow

[modest] / src / widgets / modest-gtkhtml-msg-view.c

diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c
index 6a239bd..667281f 100644 (file)
--- a/src/widgets/modest-gtkhtml-msg-view.c
+++ b/src/widgets/modest-gtkhtml-msg-view.c
@@ -52,6 +52,8 @@
 #include <widgets/modest-isearch-view.h>
 #include <widgets/modest-ui-constants.h>
 #include <modest-icon-names.h>
+#include <tny-camel-bs-mime-part.h>
+#include <modest-runtime.h>
 
 /* 'private'/'protected' functions */
 static void     modest_gtkhtml_msg_view_class_init   (ModestGtkhtmlMsgViewClass *klass);
@@ -272,6 +274,8 @@ struct _ModestGtkhtmlMsgViewPrivate {
 
        /* link click management */
        gchar *last_url;
+
+       gboolean has_blocked_bs_images;
 };
 
 #define MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -1148,6 +1152,8 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj)
        
        priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(obj);
 
+       priv->has_blocked_bs_images = FALSE;
+
        priv->idle_changes_count = 0;
        priv->idle_readjust_scroll_id = 0;
        priv->idle_resize_children_id = 0;
@@ -1435,8 +1441,7 @@ set_hadjustment (ModestGtkhtmlMsgView *self, GtkAdjustment *hadj)
        if (!hadj)
                hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0,0.0,0.0,0.0,0.0,0.0));
        disconnect_hadjustment (self);
-       g_object_ref (G_OBJECT (hadj));
-       gtk_object_sink (GTK_OBJECT (hadj));
+       g_object_ref_sink (G_OBJECT (hadj));
        priv->hadj = hadj;
        set_hadjustment_values (self, &value_changed);
 
@@ -1464,8 +1469,7 @@ set_vadjustment (ModestGtkhtmlMsgView *self, GtkAdjustment *vadj)
        if (!vadj)
                vadj = (GtkAdjustment *) gtk_adjustment_new (0.0,0.0,0.0,0.0,0.0,0.0);
        disconnect_vadjustment (self);
-       g_object_ref (G_OBJECT (vadj));
-       gtk_object_sink (GTK_OBJECT (vadj));
+       g_object_ref_sink (G_OBJECT (vadj));
        priv->vadj = vadj;
        set_vadjustment_values (self, &value_changed);
 
@@ -1579,6 +1583,7 @@ request_fetch_images (ModestGtkhtmlMsgView *self)
        /* The message could have not been downloaded yet */
        if (priv->msg) {
                modest_mime_part_view_set_view_images (MODEST_MIME_PART_VIEW (priv->body_view), TRUE);
+               priv->has_blocked_bs_images = FALSE;
                part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (priv->body_view));
                if (part) {
                        tny_mime_part_view_set_part (TNY_MIME_PART_VIEW (priv->body_view), part);
@@ -1601,7 +1606,8 @@ has_blocked_external_images (ModestGtkhtmlMsgView *self)
 {
        ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
 
-       return (modest_mime_part_view_has_external_images (MODEST_MIME_PART_VIEW (priv->body_view)) &&
+       return ((modest_mime_part_view_has_external_images (MODEST_MIME_PART_VIEW (priv->body_view)) ||
+                (priv->has_blocked_bs_images)) &&
                !modest_mime_part_view_get_view_images (MODEST_MIME_PART_VIEW (priv->body_view)));
 }
 
@@ -1637,6 +1643,22 @@ on_limit_error (GtkWidget *widget, ModestGtkhtmlMsgView *msg_view)
        g_signal_emit_by_name (G_OBJECT (msg_view), "limit-error");
 }
 
+static gboolean
+part_cids_equal (const gchar *part_cid1,
+                const gchar *part_cid2)
+{
+       if (g_strcmp0 (part_cid1, part_cid2) == 0)
+               return TRUE;
+
+       if (part_cid2 && part_cid2[0] == '<') {
+               const gchar *end;
+               end = g_strrstr_len (part_cid2, -1, ">");
+
+               if (end && strncmp (part_cid2 + 1, part_cid1, end - part_cid2 - 1) == 0)
+                       return TRUE;
+       }
+       return FALSE;
+}
 
 static TnyMimePart *
 find_cid_image (TnyMsg *msg, const gchar *cid)
@@ -1665,8 +1687,8 @@ find_cid_image (TnyMsg *msg, const gchar *cid)
                 */
                if (!part_cid)
                        part_cid = tny_mime_part_get_content_location (part);
-               
-               if (part_cid && strcmp (cid, part_cid) == 0)
+
+               if (part_cids_equal (cid, part_cid))
                        break;
 
                if (tny_mime_part_content_type_is (part, "multipart/related")) {
@@ -1680,9 +1702,10 @@ find_cid_image (TnyMsg *msg, const gchar *cid)
                        while (!tny_iterator_is_done (related_iter)) {
                                related_part = TNY_MIME_PART (tny_iterator_get_current (related_iter));
                                part_cid = tny_mime_part_get_content_id (related_part);
-                               if (part_cid && strcmp (cid, part_cid) == 0) {
+
+                               if (part_cids_equal (cid, part_cid))
                                        break;
-                               }
+
                                g_object_unref (related_part);
                                related_part = NULL;
                                tny_iterator_next (related_iter);
@@ -1709,6 +1732,11 @@ find_cid_image (TnyMsg *msg, const gchar *cid)
        return part;
 }
 
+static void
+fetch_url_decode_to_stream_cb (TnyMimePart *self, gboolean cancelled, TnyStream *stream, GError *err, gpointer user_data)
+{
+       tny_stream_close (stream);
+}
 
 static gboolean
 on_fetch_url (GtkWidget *widget, const gchar *uri,
@@ -1749,10 +1777,17 @@ on_fetch_url (GtkWidget *widget, const gchar *uri,
                } else {
                        return FALSE;
                }
+       } else if (TNY_IS_CAMEL_BS_MIME_PART (part) && 
+                  !tny_camel_bs_mime_part_is_fetched (TNY_CAMEL_BS_MIME_PART (part))){
+         if (!modest_mime_part_view_get_view_images (MODEST_MIME_PART_VIEW (priv->body_view)) || 
+             !tny_device_is_online (modest_runtime_get_device ())) {
+                       priv->has_blocked_bs_images = TRUE;
+                       tny_stream_close (stream);
+                       return TRUE;
+               }
        }
 
-       tny_mime_part_decode_to_stream ((TnyMimePart*)part, stream, NULL);
-       tny_stream_close (stream);
+       tny_mime_part_decode_to_stream_async ((TnyMimePart*)part, stream, fetch_url_decode_to_stream_cb, NULL, NULL);
        g_object_unref (G_OBJECT(part));
        return TRUE;
 }
@@ -1768,6 +1803,7 @@ set_message (ModestGtkhtmlMsgView *self, TnyMsg *msg, TnyMimePart *other_body)
        g_return_if_fail (self);
 
        priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(self);
+       priv->has_blocked_bs_images = FALSE;
        modest_mail_header_view_set_loading (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view), FALSE);
        gtk_widget_set_no_show_all (priv->mail_header_view, FALSE);
        modest_mime_part_view_set_view_images (MODEST_MIME_PART_VIEW (priv->body_view), FALSE);
@@ -1924,6 +1960,7 @@ set_header (ModestGtkhtmlMsgView *self, TnyHeader *header)
        }
        
        priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(self);
+       priv->has_blocked_bs_images = FALSE;
        modest_mail_header_view_set_loading (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view), TRUE);
        gtk_widget_set_no_show_all (priv->mail_header_view, FALSE);
        modest_mime_part_view_set_view_images (MODEST_MIME_PART_VIEW (priv->body_view), FALSE);