* src/widgets/modest-msg-view.c:

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

diff --git a/src/widgets/modest-msg-view.c b/src/widgets/modest-msg-view.c
index 373f75b..de775b1 100644 (file)
--- a/src/widgets/modest-msg-view.c
+++ b/src/widgets/modest-msg-view.c
@@ -86,6 +86,7 @@ static void adjustment_value_changed (GtkAdjustment *adj, gpointer data);
 static void html_adjustment_changed (GtkAdjustment *adj, gpointer data);
 static void disconnect_vadjustment (ModestMsgView *obj);
 static void disconnect_hadjustment (ModestMsgView *obj);
+static gboolean idle_readjust_scroll (ModestMsgView *obj);
 
 /* GtkContainer methods */
 static void forall (GtkContainer *container, gboolean include_internals,
@@ -830,7 +831,11 @@ html_adjustment_changed (GtkAdjustment *adj,
        gboolean vadj_changed;
        gint new_height;
 
+       g_signal_stop_emission_by_name (G_OBJECT (adj), "changed");
+
        priv->html_scroll->requisition.height = html_vadj->upper;
+       if (html_vadj->upper == priv->html_scroll->allocation.height)
+               return;
        priv->html_scroll->allocation.height = html_vadj->upper;
 
        set_vadjustment_values (msg_view, &vadj_changed);
@@ -1196,7 +1201,8 @@ find_cid_image (TnyMsg *msg, const gchar *cid)
                if (part_cid && strcmp (cid, part_cid) == 0)
                        break;
 
-               g_object_unref (G_OBJECT(part));
+               if (part)
+                       g_object_unref (G_OBJECT(part));
        
                part = NULL;
                tny_iterator_next (iter);
@@ -1334,6 +1340,7 @@ modest_msg_view_set_message (ModestMsgView *self, TnyMsg *msg)
        TnyMimePart *body;
        ModestMsgViewPrivate *priv;
        TnyHeader *header;
+       GtkAdjustment *html_vadj;
        
        g_return_if_fail (self);
        
@@ -1404,6 +1411,15 @@ modest_msg_view_set_message (ModestMsgView *self, TnyMsg *msg)
        if (priv->vadj != NULL)
                priv->vadj->value = 0.0;
 
+       html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+
+       g_signal_emit_by_name (G_OBJECT (html_vadj), "changed");
+
+       /* This is a hack to force reallocation of scroll after drawing all the stuff. This
+        * makes the html view get the proper and expected size and prevent being able to scroll
+        * the buffer when it shouldn't be scrollable */
+       g_object_ref (self);
+       g_timeout_add (250, (GSourceFunc) idle_readjust_scroll, self);
 }
 
 
@@ -1466,7 +1482,9 @@ modest_msg_view_search (ModestMsgView *self, const gchar *search)
        gtk_layout_set_vadjustment (GTK_LAYOUT (priv->gtkhtml), tmp_vadj);
        result = gtk_html_engine_search (GTK_HTML (priv->gtkhtml),
                                         search,
-                                        FALSE, TRUE, TRUE);
+                                        FALSE,   /* case sensitive */
+                                        TRUE,    /* forward */
+                                        FALSE);  /* regexp */
 
 // wait for the updated gtkhtml (w27) to enable this
 #if 0
@@ -1625,3 +1643,19 @@ modest_msg_view_remove_attachment (ModestMsgView *view, TnyMimePart *attachment)
                                                   attachment);
        
 }
+
+gboolean
+idle_readjust_scroll (ModestMsgView *view)
+{
+       if (GTK_WIDGET_DRAWABLE (view)) {
+               ModestMsgViewPrivate *priv = MODEST_MSG_VIEW_GET_PRIVATE (view);
+               GtkAdjustment *html_vadj;
+               html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
+               html_vadj->page_size = html_vadj->upper;
+               gtk_adjustment_changed (html_vadj);
+               gtk_widget_queue_resize (GTK_WIDGET (view));
+               gtk_widget_queue_draw (GTK_WIDGET (view));
+       }
+       g_object_unref (G_OBJECT (view));
+       return FALSE;
+}