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 e1ad656..667281f 100644 (file)
--- a/src/widgets/modest-gtkhtml-msg-view.c
+++ b/src/widgets/modest-gtkhtml-msg-view.c
@@ -1441,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);
 
@@ -1470,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);
 
@@ -1645,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)
@@ -1673,17 +1687,9 @@ 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)
-                       break;
-
-               if (part_cid && part_cid[0] == '<') {
-                       const gchar *end;
-                       end = g_strrstr_len (part_cid, -1, ">");
 
-                       if (end && strncmp (part_cid + 1, cid, end - part_cid - 1) == 0)
-                               break;
-               }
+               if (part_cids_equal (cid, part_cid))
+                       break;
 
                if (tny_mime_part_content_type_is (part, "multipart/related")) {
                        TnyList *related_parts = TNY_LIST (tny_simple_list_new ());
@@ -1696,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);
@@ -1725,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,
@@ -1775,8 +1787,7 @@ on_fetch_url (GtkWidget *widget, const gchar *uri,
                }
        }
 
-       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;
 }