From: Sergio Villar Senin <svillar@igalia.com>
Date: Fri, 23 Jan 2009 12:33:43 +0000 (+0000)
Subject: * Fixes NB#99161, show error banner when moving folders fails
X-Git-Tag: git_migration_finished~734
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=ec3c948dc9c547621c29a9c48e380cf2f5c0c2a2

* Fixes NB#99161, show error banner when moving folders fails

pmo-trunk-r7260
---

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 9383d97..a281474 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -5104,32 +5104,34 @@ void
 modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, 
 					     gpointer user_data)
 {
+	GObject *win = NULL;
+
+#ifndef MODEST_TOOLKIT_HILDON2
 	ModestWindow *main_window = NULL;
-	
+
 	/* Disable next automatic folder selection */
 	main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
 							 FALSE); /* don't create */
 	if (main_window) {
-		GObject *win = NULL;
 		GtkWidget *folder_view = NULL;
-	
+
 		folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_window),
 								   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);	
 		modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(folder_view));
-		
+
 		if (user_data && TNY_IS_FOLDER (user_data)) {
 			modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), 
 							  TNY_FOLDER (user_data), FALSE);
 		}
-
-		/* Show notification dialog only if the main window exists */
-		win = modest_mail_operation_get_source (mail_op);
-		modest_platform_run_information_dialog ((GtkWindow *) win, 
-							_("mail_in_ui_folder_move_target_error"), 
-							FALSE);
-		if (win)
-			g_object_unref (win);
 	}
+#endif
+	/* Show notification dialog only if the main window exists */
+	win = modest_mail_operation_get_source (mail_op);
+	modest_platform_run_information_dialog ((GtkWindow *) win, 
+						_("mail_in_ui_folder_move_target_error"), 
+						FALSE);
+	if (win)
+		g_object_unref (win);
 }
 
 static void