From: Jose Dapena Paz <jdapena@igalia.com>
Date: Mon, 18 May 2009 17:10:14 +0000 (+0200)
Subject: Close the edit mode after running move to dialog, not before.
X-Git-Tag: 3.0.17-rc7~33
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=431e6afaedd1f67abdca9e5bb7b14e5027401d00

Close the edit mode after running move to dialog, not before.

* src/modest-ui-actions.c
  (on_move_to_dialog_response): unset edit mode on destroying the move to
  dialog.
  (modest_ui_actions_on_edit_mode_move_to): don't close the edit mode
  on processing the action to show the dialog (fixes NB#116989).
---

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index e6fc380..4512dbe 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -5032,6 +5032,7 @@ on_move_to_dialog_response (GtkDialog *dialog,
 	GtkWidget *parent_win;
 	MoveToInfo *helper = NULL;
 	ModestFolderView *folder_view;
+	gboolean unset_edit_mode = FALSE;
 
 	helper = (MoveToInfo *) user_data;
 
@@ -5093,6 +5094,7 @@ on_move_to_dialog_response (GtkDialog *dialog,
 		if (dst_folder)
 			g_object_unref (dst_folder);
 
+		unset_edit_mode = TRUE;
 		break;
 	default:
 		g_warning ("%s unexpected response id %d", __FUNCTION__, response);
@@ -5101,6 +5103,11 @@ on_move_to_dialog_response (GtkDialog *dialog,
 	/* Free the helper and exit */
 	if (helper->list)
 		g_object_unref (helper->list);
+	if (unset_edit_mode) {
+#ifdef MODEST_TOOLKIT_HILDON2
+		modest_hildon2_window_unset_edit_mode (MODEST_HILDON2_WINDOW (helper->win));
+#endif
+	}
 	g_slice_free (MoveToInfo, helper);
 	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
@@ -6060,7 +6067,7 @@ modest_ui_actions_on_edit_mode_move_to (ModestWindow *win)
 	/* Show the dialog */
 	gtk_widget_show (dialog);
 
-	return TRUE;
+	return FALSE;
 }
 
 /*