* Fixes NB#57632, the delete option is dimmed for folders

pmo-trunk-r2305

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index d09f01c..071accc 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -264,9 +264,18 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
        gint response;
        gboolean found;
        ModestWindowMgr *mgr;
+       GtkWidget *header_view;
 
        g_return_if_fail (MODEST_IS_WINDOW(win));
 
+       /* Check first if the header view has the focus */
+       if (MODEST_IS_MAIN_WINDOW (win)) {
+               header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+                                                                  MODEST_WIDGET_TYPE_HEADER_VIEW);
+               if (!GTK_WIDGET_HAS_FOCUS (header_view))
+                       return;
+       }
+
        header_list = get_selected_headers (win);
        if (!header_list) return;
 

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index a5109d3..bd1ec89 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -1029,9 +1029,8 @@ _invalid_msg_selected (ModestMainWindow *win,
 
        /* Check dimmed rule (TODO: check focus on widgets */   
        if (!result) {
-               result = (selected_headers == NULL);
-/*             result = ((selected_headers == NULL) ||  */
-/*                       (GTK_WIDGET_HAS_FOCUS (folder_view))); */
+               result = ((selected_headers == NULL) ||
+                         (GTK_WIDGET_HAS_FOCUS (folder_view)));
                if (result)
                        modest_dimming_rule_set_notification (rule, _("mcen_ib_no_message_selected"));
        }