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 6ad1055..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);
 
@@ -1734,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,
@@ -1784,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;
 }