X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-view-window.c;h=7fa69d74cfeb9fde8e2d26bdb313b2c7190479f5;hp=49a772056c409ee85ee936ccbe11bf04d56086bf;hb=cad3f56ab4e492218e57dbc5e700816a94090ee1;hpb=5160784c7b83181a46cc62f84da3ec18c4e5905d

diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index 49a7720..7fa69d7 100644
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -95,34 +95,30 @@ static void modest_msg_view_window_show_toolbar   (ModestWindow *window,
 static void modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboard,
 							   GdkEvent *event,
 							   ModestMsgViewWindow *window);
-void modest_msg_view_window_on_row_changed(
-		GtkTreeModel *header_model,
-		GtkTreePath *arg1,
-		GtkTreeIter *arg2,
-		ModestMsgViewWindow *window);
-
-void modest_msg_view_window_on_row_deleted(
-		GtkTreeModel *header_model,
-		GtkTreePath *arg1,
-		ModestMsgViewWindow *window);
-
-void modest_msg_view_window_on_row_inserted(
-		GtkTreeModel *header_model,
-		GtkTreePath *tree_path,
-		GtkTreeIter *tree_iter,
-		ModestMsgViewWindow *window);
-
-void modest_msg_view_window_on_row_reordered(
-		GtkTreeModel *header_model,
-		GtkTreePath *arg1,
-		GtkTreeIter *arg2,
-		gpointer arg3,
-		ModestMsgViewWindow *window);
-
-void modest_msg_view_window_update_model_replaced(
-		ModestHeaderViewObserver *window,
-		GtkTreeModel *model,
-		const gchar *tny_folder_id);
+
+static void modest_msg_view_window_on_row_changed (GtkTreeModel *header_model,
+						   GtkTreePath *arg1,
+						   GtkTreeIter *arg2,
+						   ModestMsgViewWindow *window);
+
+static void modest_msg_view_window_on_row_deleted (GtkTreeModel *header_model,
+						   GtkTreePath *arg1,
+						   ModestMsgViewWindow *window);
+
+static void modest_msg_view_window_on_row_inserted (GtkTreeModel *header_model,
+						    GtkTreePath *tree_path,
+						    GtkTreeIter *tree_iter,
+						    ModestMsgViewWindow *window);
+
+static void modest_msg_view_window_on_row_reordered (GtkTreeModel *header_model,
+						     GtkTreePath *arg1,
+						     GtkTreeIter *arg2,
+						     gpointer arg3,
+						     ModestMsgViewWindow *window);
+
+static void modest_msg_view_window_update_model_replaced (ModestHeaderViewObserver *window,
+							  GtkTreeModel *model,
+							  const gchar *tny_folder_id);
 
 static void cancel_progressbar  (GtkToolButton *toolbutton,
 				 ModestMsgViewWindow *self);
@@ -157,6 +153,12 @@ static void init_window (ModestMsgViewWindow *obj);
 
 static gboolean msg_is_visible (TnyHeader *header, gboolean check_outbox);
 
+static void check_dimming_rules_after_change (ModestMsgViewWindow *window);
+
+static gboolean on_fetch_image (ModestMsgView *msgview,
+				const gchar *uri,
+				TnyStream *stream,
+				ModestMsgViewWindow *window);
 
 /* list my signals */
 enum {
@@ -687,12 +689,13 @@ modest_msg_view_window_finalize (GObject *obj)
 static gboolean
 select_next_valid_row (GtkTreeModel *model,
 		       GtkTreeRowReference **row_reference,
-		       gboolean cycle)
+		       gboolean cycle,
+		       gboolean is_outbox)
 {
 	GtkTreeIter tmp_iter;
 	GtkTreePath *path;
 	GtkTreePath *next = NULL;
-	gboolean retval = FALSE;
+	gboolean retval = FALSE, finished;
 
 	g_return_val_if_fail (gtk_tree_row_reference_valid (*row_reference), FALSE);
 
@@ -701,19 +704,55 @@ select_next_valid_row (GtkTreeModel *model,
 	gtk_tree_row_reference_free (*row_reference);
 	*row_reference = NULL;
 
-	if (gtk_tree_model_iter_next (model, &tmp_iter)) {
-		next = gtk_tree_model_get_path (model, &tmp_iter);
-		*row_reference = gtk_tree_row_reference_new (model, next);
-		retval = TRUE;
-	} else if (cycle && gtk_tree_model_get_iter_first (model, &tmp_iter)) {
-		next = gtk_tree_model_get_path (model, &tmp_iter);
-
-		/* Ensure that we are not selecting the same */
-		if (gtk_tree_path_compare (path, next) != 0) {
-			*row_reference = gtk_tree_row_reference_new (model, next);
-			retval = TRUE;
+	finished = FALSE;
+	do {
+		TnyHeader *header = NULL;
+
+		if (gtk_tree_model_iter_next (model, &tmp_iter)) {
+			gtk_tree_model_get (model, &tmp_iter, 
+					    TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
+					    &header, -1);
+
+			if (header) {
+				if (msg_is_visible (header, is_outbox)) {
+					next = gtk_tree_model_get_path (model, &tmp_iter);
+					*row_reference = gtk_tree_row_reference_new (model, next);
+					retval = TRUE;
+					finished = TRUE;
+				}
+				g_object_unref (header);
+				header = NULL;
+			}
+		} else if (cycle && gtk_tree_model_get_iter_first (model, &tmp_iter)) {
+			next = gtk_tree_model_get_path (model, &tmp_iter);
+			
+			/* Ensure that we are not selecting the same */
+			if (gtk_tree_path_compare (path, next) != 0) {
+				gtk_tree_model_get (model, &tmp_iter, 
+						    TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
+						    &header, -1);				
+				if (header) {
+					if (msg_is_visible (header, is_outbox)) {
+						*row_reference = gtk_tree_row_reference_new (model, next);
+						retval = TRUE;
+						finished = TRUE;
+					}
+					g_object_unref (header);
+					header = NULL;
+				}
+			} else {
+				/* If we ended up in the same message
+				   then there is no valid next
+				   message */
+				finished = TRUE;
+			}
+		} else {
+			/* If there are no more messages and we don't
+			   want to start again in the first one then
+			   there is no valid next message */
+			finished = TRUE;
 		}
-	}
+	} while (!finished);
 
 	/* Free */
 	gtk_tree_path_free (path);
@@ -789,6 +828,8 @@ modest_msg_view_window_construct (ModestMsgViewWindow *self,
 			  G_CALLBACK (modest_ui_actions_on_msg_recpt_activated), obj);
 	g_signal_connect (G_OBJECT(priv->msg_view), "link_contextual",
 			  G_CALLBACK (modest_ui_actions_on_msg_link_contextual), obj);
+	g_signal_connect (G_OBJECT (priv->msg_view), "fetch_image",
+			  G_CALLBACK (on_fetch_image), obj);
 
 	g_signal_connect (G_OBJECT (obj), "key-release-event",
 			  G_CALLBACK (modest_msg_view_window_key_event),
@@ -882,32 +923,35 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg,
 		}
 	}
 
-	priv->header_model = g_object_ref(model);
+	/* Setup row references and connect signals */
+	priv->header_model = g_object_ref (model);
+
 	if (row_reference) {
 		priv->row_reference = gtk_tree_row_reference_copy (row_reference);
 		priv->next_row_reference = gtk_tree_row_reference_copy (row_reference);
-		select_next_valid_row (model, &(priv->next_row_reference), TRUE);
+		select_next_valid_row (model, &(priv->next_row_reference), TRUE, priv->is_outbox);
 	} else {
 		priv->row_reference = NULL;
 		priv->next_row_reference = NULL;
 	}
 
-	priv->row_changed_handler = g_signal_connect(
-			GTK_TREE_MODEL(model), "row-changed",
-			G_CALLBACK(modest_msg_view_window_on_row_changed),
-			window);
-	priv->row_deleted_handler = g_signal_connect(
-			GTK_TREE_MODEL(model), "row-deleted",
-			G_CALLBACK(modest_msg_view_window_on_row_deleted),
-			window);
-	priv->row_inserted_handler = g_signal_connect (
-			GTK_TREE_MODEL(model), "row-inserted",
-			G_CALLBACK(modest_msg_view_window_on_row_inserted),
-			window);
-	priv->rows_reordered_handler = g_signal_connect(
-			GTK_TREE_MODEL(model), "rows-reordered",
-			G_CALLBACK(modest_msg_view_window_on_row_reordered),
-			window);
+	/* Connect signals */
+	priv->row_changed_handler = 
+		g_signal_connect (GTK_TREE_MODEL(model), "row-changed",
+				  G_CALLBACK(modest_msg_view_window_on_row_changed),
+				  window);
+	priv->row_deleted_handler = 
+		g_signal_connect (GTK_TREE_MODEL(model), "row-deleted",
+				  G_CALLBACK(modest_msg_view_window_on_row_deleted),
+				  window);
+	priv->row_inserted_handler = 
+		g_signal_connect (GTK_TREE_MODEL(model), "row-inserted",
+				  G_CALLBACK(modest_msg_view_window_on_row_inserted),
+				  window);
+	priv->rows_reordered_handler = 
+		g_signal_connect(GTK_TREE_MODEL(model), "rows-reordered",
+				 G_CALLBACK(modest_msg_view_window_on_row_reordered),
+				 window);
 
 	if (header_view != NULL){
 		modest_header_view_add_observer(header_view,
@@ -950,10 +994,13 @@ modest_msg_view_window_new_for_search_result (TnyMsg *msg,
 	tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg);
 	
 	update_window_title (window);
-	modest_msg_view_window_update_priority (window);
-
 	gtk_widget_show_all (GTK_WIDGET (window));
+	modest_msg_view_window_update_priority (window);
 
+	/* Check dimming rules */
+	modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+	modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
+	modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD);
 
 	return MODEST_WINDOW(window);
 }
@@ -987,21 +1034,53 @@ modest_msg_view_window_new_for_attachment (TnyMsg *msg,
 	return MODEST_WINDOW(obj);
 }
 
-void modest_msg_view_window_on_row_changed(
-		GtkTreeModel *header_model,
-		GtkTreePath *arg1,
-		GtkTreeIter *arg2,
-		ModestMsgViewWindow *window){
-	modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+static void
+modest_msg_view_window_on_row_changed (GtkTreeModel *header_model,
+				       GtkTreePath *arg1,
+				       GtkTreeIter *arg2,
+				       ModestMsgViewWindow *window)
+{
+	check_dimming_rules_after_change (window);
 }
 
-void modest_msg_view_window_on_row_deleted(
-		GtkTreeModel *header_model,
-		GtkTreePath *arg1,
-		ModestMsgViewWindow *window){
-	modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+static void 
+modest_msg_view_window_on_row_deleted(GtkTreeModel *header_model,
+				      GtkTreePath *arg1,
+				      ModestMsgViewWindow *window)
+{
+	check_dimming_rules_after_change (window);
 }
 
+static gboolean
+check_dimming_rules_after_change_in_idle (gpointer data)
+{
+	/* The window could have dissapeared */
+	if (MODEST_IS_WINDOW (data)) {
+		ModestWindow *win = MODEST_WINDOW (data);
+		gdk_threads_enter ();
+		modest_ui_actions_check_menu_dimming_rules (win);
+		modest_ui_actions_check_toolbar_dimming_rules (win);
+		gdk_threads_leave ();
+	}
+
+	return FALSE;
+}
+
+static void
+check_dimming_rules_after_change (ModestMsgViewWindow *window)
+{
+	static guint dimming_delayer = 0;
+
+	if (dimming_delayer > 0)
+		g_source_remove (dimming_delayer);
+
+	/* We're expecting a lot of changes at the same time so don't
+	   need to check dimming rules for every change that
+	   happens */
+	dimming_delayer = g_timeout_add (100, check_dimming_rules_after_change_in_idle, window);
+}
+
+
 /* On insertions we check if the folder still has the message we are
  * showing or do not. If do not, we do nothing. Which means we are still
  * not attached to any header folder and thus next/prev buttons are
@@ -1013,90 +1092,122 @@ void modest_msg_view_window_on_row_deleted(
  * inserted into the model again for example if it is removed by the
  * imap server and the header view is refreshed.)
  */
-void modest_msg_view_window_on_row_inserted(
-		GtkTreeModel *new_model,
-		GtkTreePath *tree_path,
-		GtkTreeIter *tree_iter,
-		ModestMsgViewWindow *window){
+static void 
+modest_msg_view_window_on_row_inserted (GtkTreeModel *model,
+				        GtkTreePath *tree_path,
+					GtkTreeIter *tree_iter,
+					ModestMsgViewWindow *window)
+{
 	ModestMsgViewWindowPrivate *priv = NULL; 
 	TnyHeader *header = NULL;
-	gchar *uid = NULL;
 
 	g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
-
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
-	
-	/* If we already has a model attached then the message shown by
-	 * msg-view is in it, and thus we do not need any actions but
-	 * to check the dimming rules.*/
-	if(priv->header_model != NULL){
-		if (priv->row_reference) {
-			gtk_tree_row_reference_free(priv->next_row_reference);
-			priv->next_row_reference = gtk_tree_row_reference_copy(
-				priv->row_reference);
-			select_next_valid_row (priv->header_model,
-					       &(priv->next_row_reference), FALSE);
-		}
-		modest_ui_actions_check_toolbar_dimming_rules (
-				MODEST_WINDOW (window));
-		return;
-	}
 
+	g_assert (model == priv->header_model);
+	
 	/* Check if the newly inserted message is the same we are actually
 	 * showing. IF not, we should remain detached from the header model
-	 * and thus prev and next toolbarbuttons should remain dimmed. */
-	gtk_tree_model_get (new_model, tree_iter, 
-			TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, -1);
-	uid = modest_tny_folder_get_header_unique_id(header);
-	if(!g_str_equal(priv->msg_uid, uid)){
+	 * and thus prev and next toolbar buttons should remain dimmed. */
+	gtk_tree_model_get (model, tree_iter, 
+			    TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
+			    &header, -1);
+
+	if (TNY_IS_HEADER (header)) {
+		gchar *uid = NULL;
+
+		uid = modest_tny_folder_get_header_unique_id (header);
+		if (!g_str_equal(priv->msg_uid, uid)) {
+			check_dimming_rules_after_change (window);
+			g_free(uid);
+			g_object_unref (G_OBJECT(header));
+			return;
+		}
 		g_free(uid);
 		g_object_unref(G_OBJECT(header));
-		header = NULL;
-		return;
 	}
-	if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN))
-		tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
-	g_object_unref(G_OBJECT(header));
-	header = NULL;
-	g_free(uid);
+
+	if (priv->row_reference) {
+		gtk_tree_row_reference_free (priv->row_reference); 
+	}
 
 	/* Setup row_reference for the actual msg. */
-	priv->row_reference = gtk_tree_row_reference_new(
-			new_model, tree_path);
-	if(priv->row_reference == NULL){
+	priv->row_reference = gtk_tree_row_reference_new (priv->header_model, tree_path);
+	if (priv->row_reference == NULL) {
 		g_warning("No reference for msg header item.");
 		return;
 	}
 
-	/* Attach new_model and connect some callback to it to become able
-	 * to detect changes in header-view. */
-	priv->header_model = g_object_ref(new_model);
-	priv->row_changed_handler = g_signal_connect (new_model, "row-changed",
-						      G_CALLBACK (modest_msg_view_window_on_row_changed),
-						      window);
-	priv->row_deleted_handler = g_signal_connect (new_model, "row-deleted",
-						      G_CALLBACK (modest_msg_view_window_on_row_deleted),
-						      window);
-	priv->rows_reordered_handler = g_signal_connect (new_model, "rows-reordered",
-							 G_CALLBACK (modest_msg_view_window_on_row_reordered),
-							 window);
-
 	/* Now set up next_row_reference. */
-	priv->next_row_reference = gtk_tree_row_reference_copy(
-			priv->row_reference);
-	select_next_valid_row (priv->header_model,
-			&(priv->next_row_reference), FALSE);
+	if (priv->next_row_reference) {
+		gtk_tree_row_reference_free (priv->next_row_reference); 
+	}
 
-	modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+	priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference);
+	select_next_valid_row (priv->header_model,
+			       &(priv->next_row_reference), FALSE, priv->is_outbox);
+
+	/* Connect the remaining callbacks to become able to detect
+	 * changes in header-view. */
+	priv->row_changed_handler = 
+		g_signal_connect (priv->header_model, "row-changed",
+				  G_CALLBACK (modest_msg_view_window_on_row_changed),
+				  window);
+	priv->row_deleted_handler = 
+		g_signal_connect (priv->header_model, "row-deleted",
+				  G_CALLBACK (modest_msg_view_window_on_row_deleted),
+				  window);
+	priv->rows_reordered_handler = 
+		g_signal_connect (priv->header_model, "rows-reordered",
+				  G_CALLBACK (modest_msg_view_window_on_row_reordered),
+				  window);
+
+	check_dimming_rules_after_change (window);	
 }
 
-void modest_msg_view_window_on_row_reordered(
-		GtkTreeModel *header_model,
-		GtkTreePath *arg1,
-		GtkTreeIter *arg2,
-		gpointer arg3,
-		ModestMsgViewWindow *window){
-	modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
+static void 
+modest_msg_view_window_on_row_reordered (GtkTreeModel *header_model,
+					 GtkTreePath *arg1,
+					 GtkTreeIter *arg2,
+					 gpointer arg3,
+					 ModestMsgViewWindow *window)
+{
+	ModestMsgViewWindowPrivate *priv = NULL; 
+	gboolean already_changed = FALSE;
+
+	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(window);
+
+	/* If the current row was reordered select the proper next
+	   valid row. The same if the next row reference changes */
+	if (priv->row_reference && 
+	    gtk_tree_row_reference_valid (priv->row_reference)) {
+		GtkTreePath *path;
+		path = gtk_tree_row_reference_get_path (priv->row_reference);
+		if (gtk_tree_path_compare (path, arg1) == 0) {
+			if (priv->next_row_reference) {
+				gtk_tree_row_reference_free (priv->next_row_reference);
+			}
+			priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference);
+			select_next_valid_row (header_model, &(priv->next_row_reference), FALSE, priv->is_outbox);
+			already_changed = TRUE;
+		}
+		gtk_tree_path_free (path);
+	}
+	if (!already_changed &&
+	    priv->next_row_reference &&
+	    gtk_tree_row_reference_valid (priv->next_row_reference)) {
+		GtkTreePath *path;
+		path = gtk_tree_row_reference_get_path (priv->next_row_reference);
+		if (gtk_tree_path_compare (path, arg1) == 0) {
+			if (priv->next_row_reference) {
+				gtk_tree_row_reference_free (priv->next_row_reference);
+			}
+			priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference);
+			select_next_valid_row (header_model, &(priv->next_row_reference), FALSE, priv->is_outbox);
+		}
+		gtk_tree_path_free (path);
+	}
+	check_dimming_rules_after_change (window);
 }
 
 /* The modest_msg_view_window_update_model_replaced implements update
@@ -1108,10 +1219,11 @@ void modest_msg_view_window_on_row_reordered(
  * the new model. In this case the view will be detached from it's
  * header folder. From this point the next/prev buttons are dimmed.
  */
-void 
-modest_msg_view_window_update_model_replaced(ModestHeaderViewObserver *observer,
-					     GtkTreeModel *model,
-					     const gchar *tny_folder_id){
+static void 
+modest_msg_view_window_update_model_replaced (ModestHeaderViewObserver *observer,
+					      GtkTreeModel *model,
+					      const gchar *tny_folder_id)
+{
 	ModestMsgViewWindowPrivate *priv = NULL; 
 	ModestMsgViewWindow *window = NULL;
 
@@ -1125,54 +1237,61 @@ modest_msg_view_window_update_model_replaced(ModestHeaderViewObserver *observer,
 	 * not care about it's model (msg list). Else if the
 	 * header-view shows the folder the msg shown by us is in, we
 	 * shall replace our model reference and make some check. */
-	if(tny_folder_id == NULL || 
+	if(model == NULL || tny_folder_id == NULL || 
 	   (priv->header_folder_id && !g_str_equal(tny_folder_id, priv->header_folder_id)))
 		return;
-	
+
 	/* Model is changed(replaced), so we should forget the old
 	 * one. Because there might be other references and there
 	 * might be some change on the model even if we unreferenced
 	 * it, we need to disconnect our signals here. */
-	if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
-					   priv->row_changed_handler))
-		g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
-					     priv->row_changed_handler);
-	priv->row_changed_handler = 0;
-	if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
-					   priv->row_deleted_handler))
-		g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
-					     priv->row_deleted_handler);
-	priv->row_deleted_handler = 0;
-	if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
-					   priv->row_inserted_handler))
-		g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
-					     priv->row_inserted_handler);
-	priv->row_inserted_handler = 0;
-	if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
-					   priv->rows_reordered_handler))
-		g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
-					     priv->rows_reordered_handler);
-	priv->rows_reordered_handler = 0;
-	g_object_unref(priv->header_model);
-	priv->header_model = NULL;
-	if (priv->row_reference)
-		gtk_tree_row_reference_free (priv->row_reference);
-	priv->row_reference = NULL;
-	if (priv->next_row_reference)
-		gtk_tree_row_reference_free (priv->next_row_reference);
-	priv->next_row_reference = NULL;
+	if (priv->header_model) {
+		if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
+						  priv->row_changed_handler))
+			g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
+						    priv->row_changed_handler);
+		if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
+						  priv->row_deleted_handler))
+			g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
+						    priv->row_deleted_handler);
+		if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
+						  priv->row_inserted_handler))
+			g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
+						    priv->row_inserted_handler);
+		if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), 
+						  priv->rows_reordered_handler))
+			g_signal_handler_disconnect(G_OBJECT (priv->header_model), 
+						    priv->rows_reordered_handler);
 
-	modest_ui_actions_check_toolbar_dimming_rules(MODEST_WINDOW(window));
+		/* Frees */
+		if (priv->row_reference)
+			gtk_tree_row_reference_free (priv->row_reference);
+		if (priv->next_row_reference)
+			gtk_tree_row_reference_free (priv->next_row_reference);
+		g_object_unref(priv->header_model);
+
+		/* Initialize */
+		priv->row_changed_handler = 0;
+		priv->row_deleted_handler = 0;
+		priv->row_inserted_handler = 0;
+		priv->rows_reordered_handler = 0;
+		priv->next_row_reference = NULL;
+		priv->row_reference = NULL;
+		priv->header_model = NULL;
+	}
 
-	g_assert(model != NULL);
+	priv->header_model = g_object_ref (model);
 
 	/* Also we must connect to the new model for row insertions.
 	 * Only for insertions now. We will need other ones only after
 	 * the msg is show by msg-view is added to the new model. */
-	priv->row_inserted_handler = g_signal_connect (
-			model, "row-inserted",
-			G_CALLBACK(modest_msg_view_window_on_row_inserted),
-			window);
+	priv->row_inserted_handler =
+		g_signal_connect (priv->header_model, "row-inserted",
+				  G_CALLBACK(modest_msg_view_window_on_row_inserted),
+				  window);
+
+	modest_ui_actions_check_menu_dimming_rules(MODEST_WINDOW(window));
+	modest_ui_actions_check_toolbar_dimming_rules(MODEST_WINDOW(window));
 }
 
 gboolean 
@@ -1285,10 +1404,14 @@ modest_msg_view_window_find_toolbar_close (GtkWidget *widget,
 {
 	GtkToggleAction *toggle;
 	ModestWindowPrivate *parent_priv;
+	ModestMsgViewWindowPrivate *priv;
+
+	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (obj);
 	parent_priv = MODEST_WINDOW_GET_PRIVATE (obj);
 	
 	toggle = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/FindInMessage"));
 	gtk_toggle_action_set_active (toggle, FALSE);
+	modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view));
 }
 
 static void
@@ -1323,6 +1446,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
 			priv->last_search = NULL;
 		} else {
 			modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view));
+			hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE);
 		}
 	} else {
 		if (!modest_isearch_view_search_next (MODEST_ISEARCH_VIEW (priv->msg_view))) {
@@ -1331,6 +1455,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
 			priv->last_search = NULL;
 		} else {
 			modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view));
+			hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE);
 		}
 	}
 	
@@ -1553,9 +1678,16 @@ modest_msg_view_window_is_search_result (ModestMsgViewWindow *window)
 static gboolean
 msg_is_visible (TnyHeader *header, gboolean check_outbox)
 {
-	return (!(tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED)) &&
-		( (!check_outbox) || (modest_tny_all_send_queues_get_msg_status (header) != MODEST_TNY_SEND_QUEUE_FAILED)) ;
-	
+	if ((tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED))
+		return FALSE;
+	if (!check_outbox) {
+		return TRUE;
+	} else {
+		ModestTnySendQueueStatus status;
+		status = modest_tny_all_send_queues_get_msg_status (header);
+		return ((status != MODEST_TNY_SEND_QUEUE_FAILED) &&
+			(status != MODEST_TNY_SEND_QUEUE_SENDING));
+	}
 }
 
 gboolean
@@ -1637,9 +1769,13 @@ message_reader_performer (gboolean canceled,
 								 NULL, NULL);
 				
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-	modest_mail_operation_get_msg (mail_op, info->header, view_msg_cb, info->row_reference);
+	modest_mail_operation_get_msg (mail_op, info->header, TRUE, view_msg_cb, info->row_reference);
 	g_object_unref (mail_op);
 
+	/* Update dimming rules */
+	modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (parent_window));
+	modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (parent_window));
+
  frees:
 	/* Frees. The row_reference will be freed by the view_msg_cb callback */
 	g_object_unref (info->header);
@@ -1750,7 +1886,7 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
 	if (!gtk_tree_row_reference_valid (priv->next_row_reference)) {
 		if (gtk_tree_row_reference_valid (priv->row_reference)) {
 			priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference);
-			select_next_valid_row (priv->header_model, &(priv->next_row_reference), FALSE);
+			select_next_valid_row (priv->header_model, &(priv->next_row_reference), FALSE, priv->is_outbox);
 		}
 	}
 	if (priv->next_row_reference)
@@ -1778,7 +1914,7 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window)
 	/* Free */
 	g_object_unref (header);
 
-	return retval;       	
+	return retval;
 }
 
 gboolean        
@@ -1864,7 +2000,7 @@ view_msg_cb (ModestMailOperation *mail_op,
 			gtk_tree_row_reference_free (priv->next_row_reference);
 		}
 		priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference);
-		select_next_valid_row (priv->header_model, &(priv->next_row_reference), TRUE);
+		select_next_valid_row (priv->header_model, &(priv->next_row_reference), TRUE, priv->is_outbox);
 	}
 
 	/* Mark header as read */
@@ -2576,7 +2712,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
 	GList *files_to_save = NULL;
 	GtkWidget *save_dialog = NULL;
 	gchar *folder = NULL;
-	const gchar *filename = NULL;
+	gchar *filename = NULL;
 	gchar *save_multiple_str = NULL;
 
 	g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
@@ -2600,7 +2736,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
 		if (!modest_tny_mime_part_is_msg (mime_part) && 
 		    modest_tny_mime_part_is_attachment_for_modest (mime_part) &&
 		    !tny_mime_part_is_purged (mime_part)) {
-			filename = tny_mime_part_get_filename (mime_part);
+			filename = g_strdup (tny_mime_part_get_filename (mime_part));
 		} else {
 			/* TODO: show any error? */
 			g_warning ("Tried to save a non-file attachment");
@@ -2622,9 +2758,11 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
 	g_free (folder);
 
 	/* set filename */
-	if (filename != NULL)
+	if (filename) {
 		gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (save_dialog), 
 						   filename);
+		g_free (filename);
+	}
 
 	/* if multiple, set multiple string */
 	if (save_multiple_str) {
@@ -2743,7 +2881,7 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean
 
 	n_attachments = tny_list_get_length (mime_parts);
 	if (n_attachments == 1) {
-		const gchar *filename;
+		gchar *filename;
 		TnyMimePart *part;
 
 		iter = tny_list_create_iterator (mime_parts);
@@ -2752,14 +2890,15 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean
 		if (modest_tny_mime_part_is_msg (part)) {
 			TnyHeader *header;
 			header = tny_msg_get_header (TNY_MSG (part));
-			filename = tny_header_get_subject (header);
+			filename = tny_header_dup_subject (header);
 			g_object_unref (header);
 			if (filename == NULL)
-				filename = _("mail_va_no_subject");
+				filename = g_strdup (_("mail_va_no_subject"));
 		} else {
-			filename = tny_mime_part_get_filename (TNY_MIME_PART (part));
+			filename = g_strdup (tny_mime_part_get_filename (TNY_MIME_PART (part)));
 		}
 		confirmation_message = g_strdup_printf (_("mcen_nc_purge_file_text"), filename);
+		g_free (filename);
 		g_object_unref (part);
 	} else {
 		confirmation_message = g_strdup_printf (ngettext("mcen_nc_purge_file_text", 
@@ -2822,18 +2961,21 @@ update_window_title (ModestMsgViewWindow *window)
 	ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
 	TnyMsg *msg = NULL;
 	TnyHeader *header = NULL;
-	const gchar *subject = NULL;
+	gchar *subject = NULL;
 	
 	msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view));
 
 	if (msg != NULL) {
 		header = tny_msg_get_header (msg);
-		subject = tny_header_get_subject (header);
+		subject = tny_header_dup_subject (header);
+		g_object_unref (header);
 		g_object_unref (msg);
 	}
 
-	if ((subject == NULL)||(subject[0] == '\0'))
-		subject = _("mail_va_no_subject");
+	if ((subject == NULL)||(subject[0] == '\0')) {
+		g_free (subject);
+		subject = g_strdup (_("mail_va_no_subject"));
+	}
 
 	gtk_window_set_title (GTK_WINDOW (window), subject);
 }
@@ -2846,3 +2988,116 @@ static void on_move_focus (GtkWidget *widget,
 	g_signal_stop_emission_by_name (G_OBJECT (widget), "move-focus");
 }
 
+static TnyStream *
+fetch_image_open_stream (TnyStreamCache *self, gint64 *expected_size, gchar *uri)
+{
+	GnomeVFSResult result;
+	GnomeVFSHandle *handle = NULL;
+	GnomeVFSFileInfo *info = NULL;
+	TnyStream *stream;
+
+	result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
+	if (result != GNOME_VFS_OK) {
+		*expected_size = 0;
+		return NULL;
+	}
+	
+	info = gnome_vfs_file_info_new ();
+	result = gnome_vfs_get_file_info_from_handle (handle, info, GNOME_VFS_FILE_INFO_DEFAULT);
+	if (result != GNOME_VFS_OK || ! (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE)) {
+		/* We put a "safe" default size for going to cache */
+		*expected_size = (300*1024);
+	} else {
+		*expected_size = info->size;
+	}
+	gnome_vfs_file_info_unref (info);
+
+	stream = tny_vfs_stream_new (handle);
+
+	return stream;
+
+}
+
+typedef struct {
+	gchar *uri;
+	gchar *cache_id;
+	TnyStream *output_stream;
+	GtkWidget *msg_view;
+} FetchImageData;
+
+gboolean
+on_fetch_image_idle_refresh_view (gpointer userdata)
+{
+
+	FetchImageData *fidata = (FetchImageData *) userdata;
+	g_message ("REFRESH VIEW");
+	if (GTK_WIDGET_DRAWABLE (fidata->msg_view)) {
+		g_message ("QUEUING DRAW");
+		gtk_widget_queue_draw (fidata->msg_view);
+	}
+	g_object_unref (fidata->msg_view);
+	g_slice_free (FetchImageData, fidata);
+	return FALSE;
+}
+
+static gpointer
+on_fetch_image_thread (gpointer userdata)
+{
+	FetchImageData *fidata = (FetchImageData *) userdata;
+	TnyStreamCache *cache;
+	TnyStream *cache_stream;
+
+	cache = modest_runtime_get_images_cache ();
+	cache_stream = tny_stream_cache_get_stream (cache, fidata->cache_id, (TnyStreamCacheOpenStreamFetcher) fetch_image_open_stream, (gpointer) fidata->uri);
+	g_free (fidata->cache_id);
+	g_free (fidata->uri);
+
+	if (cache_stream != NULL) {
+		tny_stream_write_to_stream (cache_stream, fidata->output_stream);
+		tny_stream_close (cache_stream);
+		g_object_unref (cache_stream);
+	}
+
+	tny_stream_close (fidata->output_stream);
+	g_object_unref (fidata->output_stream);
+
+
+	gdk_threads_enter ();
+	g_idle_add (on_fetch_image_idle_refresh_view, fidata);
+	gdk_threads_leave ();
+
+	return NULL;
+}
+
+static gboolean
+on_fetch_image (ModestMsgView *msgview,
+		const gchar *uri,
+		TnyStream *stream,
+		ModestMsgViewWindow *window)
+{
+	const gchar *current_account;
+	ModestMsgViewWindowPrivate *priv;
+	FetchImageData *fidata;
+
+	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+
+	current_account = modest_window_get_active_account (MODEST_WINDOW (window));
+
+	fidata = g_slice_new0 (FetchImageData);
+	fidata->msg_view = g_object_ref (msgview);
+	fidata->uri = g_strdup (uri);
+	fidata->cache_id = modest_images_cache_get_id (current_account, uri);
+	fidata->output_stream = g_object_ref (stream);
+
+	if (g_thread_create (on_fetch_image_thread, fidata, FALSE, NULL) == NULL) {
+		g_object_unref (fidata->output_stream);
+		g_free (fidata->cache_id);
+		g_free (fidata->uri);
+		g_object_unref (fidata->msg_view);
+		g_slice_free (FetchImageData, fidata);
+		tny_stream_close (stream);
+		return FALSE;
+	}
+
+	return TRUE;;
+}