X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;h=58c5a14d27be2f7d2ea87a2a0841c98b2b54d195;hb=17e149470f77d037df836438e6f3fe00fc632b20;hp=d64d65d0e79d5ceee85fdbf31e416f15c37a6151;hpb=77f91326a27bdbfe55126e980ecafcc894241481;p=modest

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index d64d65d..58c5a14 100644
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -807,8 +807,8 @@ modest_main_window_new (void)
 	action_group = gtk_action_group_new ("ModestMainWindowActions");
 	gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
 
-	menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules");
-	toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules");
+	menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules", FALSE);
+	toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules", TRUE);
 
 	/* Add common actions */
 	gtk_action_group_add_actions (action_group,
@@ -2079,6 +2079,14 @@ on_folder_view_focus_in (GtkWidget *widget,
 			 GdkEventFocus *event,
 			 gpointer userdata)
 {
+	ModestMainWindow *main_window = NULL;
+	
+	g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (userdata), FALSE);
+	main_window = MODEST_MAIN_WINDOW (userdata);
+	
+	/* Update toolbar dimming state */
+	modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
+
 	return FALSE;
 }
 
@@ -2087,8 +2095,12 @@ on_header_view_focus_in (GtkWidget *widget,
 			 GdkEventFocus *event,
 			 gpointer userdata)
 {
-	ModestMainWindow *main_window = MODEST_MAIN_WINDOW (userdata);
-	ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
+	ModestMainWindow *main_window = NULL;
+	ModestMainWindowPrivate *priv = NULL;
+
+	g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (userdata), FALSE);
+	main_window = MODEST_MAIN_WINDOW (userdata);
+	priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
 
 	if (modest_header_view_has_selected_headers (MODEST_HEADER_VIEW (priv->header_view))) {
 		TnyList *selection = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (priv->header_view));
@@ -2107,6 +2119,11 @@ on_header_view_focus_in (GtkWidget *widget,
 		g_object_unref (iterator);
 		g_object_unref (selection);
 	}
+
+
+	/* Update toolbar dimming state */
+	modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
+
 	return FALSE;
 }