X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-view-window.c;h=d0f3f5c7b111a7eb70864fbcebdc1c631abd8342;hb=864d52f23c781badb8a491b8cca5c62c5494061e;hp=0c8e6ce1322fdd32e4a91bd6bdcfc0da857d493e;hpb=b9b49a980154aec02c88edd9a413dc6c5914c5f4;p=modest

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index 0c8e6ce..d0f3f5c 100644
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -202,7 +202,6 @@ static void set_progress_hint    (ModestMsgViewWindow *self,
 
 static void update_window_title (ModestMsgViewWindow *window);
 
-static gboolean set_toolbar_transfer_mode     (ModestMsgViewWindow *self); 
 static void init_window (ModestMsgViewWindow *obj);
 
 static gboolean msg_is_visible (TnyHeader *header, gboolean check_outbox);
@@ -395,7 +394,6 @@ modest_msg_view_window_init (ModestMsgViewWindow *obj)
 	ModestWindowPrivate *parent_priv = NULL;
 	GtkActionGroup *action_group = NULL;
 	GError *error = NULL;
-	GdkPixbuf *window_icon;
 
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj);
 	parent_priv = MODEST_WINDOW_GET_PRIVATE(obj);
@@ -458,33 +456,11 @@ modest_msg_view_window_init (ModestMsgViewWindow *obj)
 	/* Init window */
 	init_window (MODEST_MSG_VIEW_WINDOW(obj));
 	
-	/* Set window icon */
-	window_icon = modest_platform_get_icon (MODEST_APP_MSG_VIEW_ICON, MODEST_ICON_SIZE_BIG); 
-	if (window_icon) {
-		gtk_window_set_icon (GTK_WINDOW (obj), window_icon);
-		g_object_unref (window_icon);
-	}	
-	
 	hildon_program_add_window (hildon_program_get_instance(),
 				   HILDON_WINDOW(obj));
 
 }
 
-
-static gboolean
-set_toolbar_transfer_mode (ModestMsgViewWindow *self)
-{
-	ModestMsgViewWindowPrivate *priv = NULL;
-	
-	g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE);
-
-	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
-
-	set_progress_hint (self, TRUE);
-	
-	return FALSE;
-}
-
 static void
 update_progress_hint (ModestMsgViewWindow *self)
 {
@@ -1308,41 +1284,41 @@ modest_msg_view_window_on_row_reordered (GtkTreeModel *header_model,
 					 gpointer arg3,
 					 ModestMsgViewWindow *window)
 {
-	ModestMsgViewWindowPrivate *priv = NULL; 
+	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 &&
+	if (!priv->row_reference ||
+	    !gtk_tree_row_reference_valid (priv->row_reference))
+		return;
+
+	if (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);
-			}
+		GtkTreePath *cur, *next;
+		/* Check that the order is still the correct one */
+		cur = gtk_tree_row_reference_get_path (priv->row_reference);
+		next = gtk_tree_row_reference_get_path (priv->next_row_reference);
+		gtk_tree_path_next (cur);
+		if (gtk_tree_path_compare (cur, next) != 0) {
+			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);
+		gtk_tree_path_free (cur);
+		gtk_tree_path_free (next);
+	} else {
+		if (priv->next_row_reference)
+			gtk_tree_row_reference_free (priv->next_row_reference);
+		/* Update 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;
 	}
+
 	check_dimming_rules_after_change (window);
 }
 
@@ -2324,7 +2300,7 @@ toolbar_resize (ModestMsgViewWindow *self)
 		gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
 		gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
 		gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);
-		widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageMoveTo");
+		widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReplyAll");
 		gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
 		gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
 		gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);
@@ -2332,7 +2308,7 @@ toolbar_resize (ModestMsgViewWindow *self)
 		gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
 		gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
 		gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);
-		widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/FindInMessage");
+		widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarDownloadExternalImages");
 		gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
 		gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
 		gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);
@@ -2470,8 +2446,10 @@ on_mail_operation_started (ModestMailOperation *mail_op,
 	tmp = priv->progress_widgets;
 	source = modest_mail_operation_get_source(mail_op);
 	if (G_OBJECT (self) == source) {
-		if (op_type == MODEST_MAIL_OPERATION_TYPE_RECEIVE) {
-			set_toolbar_transfer_mode(self);
+		if (op_type == MODEST_MAIL_OPERATION_TYPE_RECEIVE ||
+		    op_type == MODEST_MAIL_OPERATION_TYPE_OPEN ||
+		    op_type == MODEST_MAIL_OPERATION_TYPE_DELETE) {
+			set_progress_hint (self, TRUE);
 			while (tmp) {
 				modest_progress_object_add_operation (
 						MODEST_PROGRESS_OBJECT (tmp->data),
@@ -2481,9 +2459,12 @@ on_mail_operation_started (ModestMailOperation *mail_op,
 		}
 	}
 	g_object_unref (source);
+
+	/* Update dimming rules */
+	check_dimming_rules_after_change (self);
 }
 
-static void 
+static void
 on_mail_operation_finished (ModestMailOperation *mail_op,
 			    gpointer user_data)
 {
@@ -2491,13 +2472,15 @@ on_mail_operation_finished (ModestMailOperation *mail_op,
 	ModestMailOperationTypeOperation op_type;
 	GSList *tmp;
 	ModestMsgViewWindowPrivate *priv;
-	
+
 	self = MODEST_MSG_VIEW_WINDOW (user_data);
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
 	op_type = modest_mail_operation_get_type_operation (mail_op);
 	tmp = priv->progress_widgets;
-	
-	if (op_type == MODEST_MAIL_OPERATION_TYPE_RECEIVE) {
+
+	if (op_type == MODEST_MAIL_OPERATION_TYPE_RECEIVE ||
+	    op_type == MODEST_MAIL_OPERATION_TYPE_OPEN ||
+	    op_type == MODEST_MAIL_OPERATION_TYPE_DELETE) {
 		while (tmp) {
 			modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data),
 								 mail_op);
@@ -2516,7 +2499,6 @@ on_mail_operation_finished (ModestMailOperation *mail_op,
 	   won't let the user delete the message that has been
 	   readed for example */
 	check_dimming_rules_after_change (self);
-
 }
 
 static void