X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=f38271aeadb34f4bdfbd4e19bb919c56cf6dcdc9;hp=f5ae0cfc33b38d9742493314d300729951c07151;hb=01e3f3528b1bf397ab952b3345c1477d3f2314de;hpb=14aa7364f6b3c006036bb107c6e7d03e57e4ac03

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index f5ae0cf..f38271a 100644
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -2592,6 +2592,31 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
 }
 
 static void
+move_to_dialog_set_selected_folder (GtkWidget *dialog, TnyFolderStore *folder_store)
+{
+	GtkWidget *selection_label;
+	GtkWidget *action_button;
+	gchar *folder_name;
+
+        selection_label = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL));
+        action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
+
+	gtk_widget_set_sensitive (action_button, TRUE);
+
+	if (TNY_IS_FOLDER (folder_store)) {
+		folder_name = modest_tny_folder_get_display_name (TNY_FOLDER (folder_store));
+	} else if (TNY_IS_ACCOUNT (folder_store)) {
+		folder_name = g_strdup (tny_account_get_name (TNY_ACCOUNT (folder_store)));
+	} else {
+		folder_name = g_strdup ("");
+	}
+
+	gtk_label_set_text (GTK_LABEL (selection_label), folder_name);
+	g_free (folder_name);
+
+}
+
+static void
 on_move_to_dialog_back_clicked (GtkButton *button,
 				gpointer userdata)
 {
@@ -2623,7 +2648,7 @@ on_move_to_dialog_folder_activated (GtkTreeView       *tree_view,
 	dialog = (GtkWidget *) user_data;
 	showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS));
 	if (showing_folders) {
-		gtk_dialog_response (GTK_DIALOG (user_data), GTK_RESPONSE_OK);
+		move_to_dialog_set_selected_folder (dialog, selected);
 	} else {
 		folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));