X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwidgets%2Fmodest-msg-view.c;h=de775b17389b6caf9c01afaf7b205fa5b208b277;hb=40a8f5cbe03bd040fe3403dbfa6806df4fb6bc8a;hp=72dbaa92c6af4890c8363c7db96a93b1441ee2dd;hpb=5b745b2530945a03a3901d3d93d38fcda48fb163;p=modest

diff --git a/src/widgets/modest-msg-view.c b/src/widgets/modest-msg-view.c
index 72dbaa9..de775b1 100644
--- 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);
@@ -869,7 +874,6 @@ modest_msg_view_init (ModestMsgView *obj)
 	priv->headers_window = NULL;
 	priv->html_window = NULL;
 
-
 	gtk_widget_push_composite_child ();
 	priv->html_scroll = gtk_scrolled_window_new (NULL, NULL);
 	gtk_widget_set_composite_name (priv->html_scroll, "contents");
@@ -1197,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);
@@ -1323,6 +1328,7 @@ set_empty_message (ModestMsgView *self)
 
 	gtk_html_load_from_string (GTK_HTML(priv->gtkhtml),
 				   "", 1);
+
 	
 	return TRUE;
 }
@@ -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);
 }
 
 
@@ -1422,6 +1438,33 @@ modest_msg_view_get_message (ModestMsgView *self)
 	return msg;
 }
 
+static gboolean
+has_contents_receiver (gpointer engine, const gchar *data,
+		       size_t len, gboolean *has_contents)
+{
+	if (len > 1 || ((len == 1)&&(data[0]!='\n'))) {
+		*has_contents = TRUE;
+		return FALSE;
+	}
+	return TRUE;
+}
+
+gboolean 
+modest_msg_view_get_message_is_empty (ModestMsgView *self)
+{
+	/* TODO: Find some gtkhtml API to check whether there is any (visible, non markup)
+	 * text in the message:
+	 */
+	ModestMsgViewPrivate *priv = MODEST_MSG_VIEW_GET_PRIVATE (self);
+	gboolean has_contents = FALSE;
+
+	gtk_html_export (GTK_HTML (priv->gtkhtml), "text/plain", 
+			 (GtkHTMLSaveReceiverFn) has_contents_receiver, &has_contents);
+	
+	return !has_contents;
+}
+
+
 gboolean 
 modest_msg_view_search (ModestMsgView *self, const gchar *search)
 {
@@ -1439,7 +1482,11 @@ 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
 	if (result) {
 		gint x, y, w, h;
@@ -1454,7 +1501,8 @@ modest_msg_view_search (ModestMsgView *self, const gchar *search)
 		else if (offset_bottom > adj->value + adj->page_increment)
 			gtk_adjustment_set_value (adj, offset_bottom - adj->page_increment);
 	}
-#endif
+#endif 
+
 	y_offset = tmp_vadj->value;
 	gtk_layout_set_vadjustment (GTK_LAYOUT (priv->gtkhtml), vadj);
 	g_object_unref (vadj);
@@ -1472,6 +1520,8 @@ modest_msg_view_search_next (ModestMsgView *self)
 
 	priv = MODEST_MSG_VIEW_GET_PRIVATE (self);
 	result = gtk_html_engine_search_next (GTK_HTML (priv->gtkhtml));
+
+// fixme wait for new gtkhtml
 #if 0
 	if (result) {
 		gint x, y, w, h;
@@ -1488,7 +1538,6 @@ modest_msg_view_search_next (ModestMsgView *self)
 			gtk_adjustment_set_value (adj, offset_bottom - adj->page_increment);
 	}
 #endif
-
 	return result;
 }
 
@@ -1594,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;
+}