Fix adding accelerators from menu items in shell windows

[modest] / src / modest-ui-dimming-rules.c

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 9090c23..bddbace 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -411,7 +411,7 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                        if (state)
                                dimmed = state->sent_in_progress;
                        if (dimmed)
-                               modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete"));
+                               modest_dimming_rule_set_notification (rule, _CS_UNABLE_TO_DELETE);
                }
 
                /* This could happen if we're viewing a message of the
@@ -427,7 +427,7 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                        if (!modest_msg_view_window_is_search_result (MODEST_MSG_VIEW_WINDOW(win))) {
                                dimmed = !modest_msg_view_window_has_headers_model (MODEST_MSG_VIEW_WINDOW(win));
                                if (dimmed) {
-                                       modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete"));
+                                       modest_dimming_rule_set_notification (rule, _CS_UNABLE_TO_DELETE);
                                }
                        }
                }
@@ -718,8 +718,7 @@ modest_ui_dimming_rules_on_select_all (ModestWindow *win, gpointer user_data)
        g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE);
        rule = MODEST_DIMMING_RULE (user_data);
 
-       focused = gtk_window_get_focus (GTK_WINDOW (win));
-
+       focused = gtk_container_get_focus_child ((GtkContainer *) win);
 
        if (!dimmed && GTK_IS_ENTRY (focused)) {
                const gchar *current_text;
@@ -1011,7 +1010,7 @@ modest_ui_dimming_rules_on_editor_paste (ModestWindow *win, gpointer user_data)
        g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (win), TRUE);
        rule = MODEST_DIMMING_RULE (user_data);
 
-       focused = gtk_window_get_focus (GTK_WINDOW (win));
+       focused = gtk_container_get_focus_child ((GtkContainer *) win);
 
        dimmed = MODEST_IS_ATTACHMENTS_VIEW (focused);
        
@@ -1330,7 +1329,7 @@ _invalid_clipboard_selected (ModestWindow *win,
        g_return_val_if_fail (MODEST_IS_WINDOW(win), FALSE);
 
        /* Get focuesed widget */
-       focused = gtk_window_get_focus (GTK_WINDOW (win));
+       focused = gtk_container_get_focus_child ((GtkContainer *) win);
 
        if (MODEST_IS_MSG_EDIT_WINDOW (win)) {
                gboolean has_selection = FALSE;