Added dimming rules processing on toggling menu

pmo-drop-split-view-r6417

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index cfa602a..9ac9bc5 100644 (file)
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -137,6 +137,9 @@ static gboolean modest_msg_view_window_zoom_plus (ModestWindow *window);
 static gboolean modest_msg_view_window_key_event (GtkWidget *window,
                                                  GdkEventKey *event,
                                                  gpointer userdata);
+static gboolean modest_msg_view_window_toggle_menu (HildonWindow *window,
+                                                   guint button,
+                                                   guint32 time);
 static void modest_msg_view_window_update_priority (ModestMsgViewWindow *window);
 
 static void modest_msg_view_window_show_toolbar   (ModestWindow *window,
@@ -335,15 +338,19 @@ static void
 modest_msg_view_window_class_init (ModestMsgViewWindowClass *klass)
 {
        GObjectClass *gobject_class;
+       HildonWindowClass *hildon_window_class;
        ModestWindowClass *modest_window_class;
        GtkBindingSet *binding_set;
 
        gobject_class = (GObjectClass*) klass;
+       hildon_window_class = (HildonWindowClass *) klass;
        modest_window_class = (ModestWindowClass *) klass;
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_msg_view_window_finalize;
 
+       hildon_window_class->toggle_menu = modest_msg_view_window_toggle_menu;
+
        modest_window_class->set_zoom_func = modest_msg_view_window_set_zoom;
        modest_window_class->get_zoom_func = modest_msg_view_window_get_zoom;
        modest_window_class->zoom_minus_func = modest_msg_view_window_zoom_minus;
@@ -3176,8 +3183,16 @@ setup_menu (ModestMsgViewWindow *self, ModestDimmingRulesGroup *group)
                     G_CALLBACK (modest_ui_actions_on_add_to_contacts),
                     group, G_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));
 
-
-       /* TODO: attach dimming rules to buttons */
        hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (self), 
                                               HILDON_APP_MENU (app_menu));
 }
+
+static gboolean 
+modest_msg_view_window_toggle_menu (HildonWindow *window,
+                                   guint button,
+                                   guint32 time)
+{
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
+
+       return HILDON_WINDOW_CLASS (parent_class)->toggle_menu (window, button, time);  
+}