From: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Date: Mon, 9 Jul 2007 05:33:06 +0000 (+0000)
Subject: * unbreak deleting messages from the viewer
X-Git-Tag: git_migration_finished~2906
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=e928dd9e7308a9438c786439038e8d21a8a4fb46

* unbreak deleting messages from the viewer

pmo-trunk-r2632
---

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index be1d2a0..f868d21 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -369,7 +369,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
 
 
 
-/* delete either message or folder, based on what has focus */
+/* delete either message or folder, based on where we are */
 void
 modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow *win)
 {
@@ -378,14 +378,6 @@ modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow *
 	/* Check first if the header view has the focus */
 	if (MODEST_IS_MAIN_WINDOW (win)) {
 		GtkWidget *w;
-
-		w = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-							 MODEST_WIDGET_TYPE_HEADER_VIEW);
-		if (gtk_widget_is_focus (w)) {
-			modest_ui_actions_on_delete_message (action, win);
-			return;
-		}
-		
 		w = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
 							 MODEST_WIDGET_TYPE_FOLDER_VIEW);
 		if (gtk_widget_is_focus (w)) {
@@ -393,8 +385,7 @@ modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow *
 			return;
 		}
 	}
-	g_warning ("BUG: delete toolbar button pressed with neither headerview nor folderview "
-		   "having focus");
+	modest_ui_actions_on_delete_message (action, win);
 }