X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=02ff9cc4078a7d2f546ae3aea8f04bc605f2e7f9;hb=6dad547adcceb728ce8a12e7bbc78017e8bdaa50;hp=48cbf05705711c46e255f97eb06682956be212bd;hpb=6710ec5f7f84b313753b1953c8bf12345ff07bd9;p=modest

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 48cbf05..02ff9cc 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -3442,7 +3442,7 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
 		   message is opened for example */
 		message = _("emev_ni_internal_error");
 	} else {
-		message = _("emev_ib_ui_imap_unable_to_rename");
+		message = _CS("ckdg_ib_unable_to_remove");
 	}
 
 	/* We don't set a parent for the dialog because the dialog
@@ -5667,6 +5667,10 @@ modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
 	    !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder) &&
 	    !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (dst_folder))) {
 		do_xfer = FALSE;
+		/* Show an error */
+		modest_platform_run_information_dialog (win,
+							_("mail_in_ui_folder_move_target_error"),
+							FALSE);
 	} else if (!TNY_IS_FOLDER (src_folder)) {
 		g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__);
 		do_xfer = FALSE;
@@ -5675,7 +5679,7 @@ modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
 	if (do_xfer) {
 		MoveFolderInfo *info = g_new0 (MoveFolderInfo, 1);
 		DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo);
-		
+
 		info->src_folder = g_object_ref (src_folder);
 		info->dst_folder = g_object_ref (dst_folder);
 		info->delete_original = TRUE;
@@ -5689,6 +5693,7 @@ modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
 							   TNY_FOLDER_STORE (src_folder), 
 							   connect_info);
 	}
+
 	/* Frees */
 	g_object_unref (src_folder);
 }