From: Sergio Villar Senin <svillar@igalia.com>
Date: Fri, 20 Mar 2009 12:20:31 +0000 (+0000)
Subject: Fixes NB#106826, folder location disabled for root folder in "Move to" dialog
X-Git-Tag: git_migration_finished~237
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=9f97ed3516bb6c9c740aadbf245b4e5d10274456

Fixes NB#106826, folder location disabled for root folder in "Move to" dialog

pmo-trunk-r8252
---

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 53e105e..fa5f8d4 100644
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -2517,6 +2517,10 @@ move_to_dialog_show_accounts (GtkWidget *dialog)
 	gtk_widget_set_sensitive (back_button, FALSE);
 	gtk_widget_set_sensitive (action_button, FALSE);
 
+	/* Need to set this here, otherwise callbacks called because
+	   of filtering won't perform correctly */
+	g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (FALSE));
+
 	gtk_label_set_text (GTK_LABEL (selection_label), "");
 	modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (folder_view), TRUE);
 	modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
@@ -2526,8 +2530,6 @@ move_to_dialog_show_accounts (GtkWidget *dialog)
 	g_object_set (G_OBJECT (folder_view), 
 		      "hildon-ui-mode", HILDON_UI_MODE_NORMAL, 
 		      NULL);
-
-	g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (FALSE));
 }
 
 static void
@@ -2551,8 +2553,12 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
 	gtk_widget_set_sensitive (back_button, TRUE);
 	gtk_widget_set_sensitive (action_button, FALSE);
 
-	g_object_set (G_OBJECT (folder_view), 
-		      "hildon-ui-mode", HILDON_UI_MODE_EDIT, 
+	/* Need to set this here, otherwise callbacks called because
+	   of filtering won't perform correctly */
+	g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (TRUE));
+
+	g_object_set (G_OBJECT (folder_view),
+		      "hildon-ui-mode", HILDON_UI_MODE_EDIT,
 		      NULL);
 
 	account = TNY_ACCOUNT (folder_store);
@@ -2593,8 +2599,6 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
 	modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
 	modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS);
 	hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (pannable), 0, 0);
-
-	g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (TRUE));
 }
 
 static void
@@ -2674,7 +2678,7 @@ on_move_to_dialog_selection_changed (GtkTreeSelection       *selection,
 
 	dialog = (GtkWidget *) user_data;
 	showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS));
-	if (showing_folders) {		
+	if (showing_folders) {
 		folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
 		selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
@@ -2694,7 +2698,7 @@ on_move_to_dialog_action_clicked (GtkButton       *selection,
 
 	dialog = (GtkWidget *) user_data;
 	showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS));
-	if (showing_folders) {		
+	if (showing_folders) {
 		folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
 		selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));