* Fixes NB#80734, check the dimming rules of the accelerators properly

pmo-trunk-r4344

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 241a42d..894c852 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -1653,6 +1653,9 @@ on_inner_widgets_key_pressed (GtkWidget *widget,
 {
        ModestMainWindowPrivate *priv;
 
+       if (event->type == GDK_KEY_RELEASE)
+               return FALSE;
+
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE (user_data);
 
        /* Do nothing if we're in SIMPLE style */
@@ -2161,6 +2164,7 @@ set_toolbar_mode (ModestMainWindow *self,
 
         /* Checks the dimming rules */
         modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
 
        /* Show and hide toolbar items */
        switch (mode) {
@@ -2593,6 +2597,7 @@ on_folder_view_focus_in (GtkWidget *widget, GdkEventFocus *event, gpointer userd
        
        /* Update toolbar dimming state */
        modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (main_window));
 
        return FALSE;
 }
@@ -2610,6 +2615,7 @@ on_header_view_focus_in (GtkWidget *widget,
 
        /* Update toolbar dimming state */
        modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (main_window));
 
        return FALSE;
 }

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 0616909..1959b40 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -2226,6 +2226,7 @@ folder_refreshed_cb (ModestMailOperation *mail_op,
        if (tny_folder_get_all_count (folder) == 0)
                modest_main_window_set_contents_style (win,
                                                       MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY);
+
 }
 
 void 
@@ -2299,7 +2300,8 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
                }
        }
 
-       /* Update toolbar dimming state */
+       /* Update dimming state */
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (main_window));
        modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
 }