From 26ec0e30d7a635024b2edfff1bac2b4ebf2b0757 Mon Sep 17 00:00:00 2001 From: Felipe Erias Morandeira Date: Mon, 19 Nov 2007 11:25:08 +0000 Subject: [PATCH] Fixes NB#76204 pmo-trunk-r3761 --- src/maemo/modest-main-window-ui-dimming.h | 2 +- src/maemo/modest-main-window.c | 4 ++-- src/modest-ui-dimming-rules.c | 23 +++++++++++++++++++++++ src/modest-ui-dimming-rules.h | 1 + 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/maemo/modest-main-window-ui-dimming.h b/src/maemo/modest-main-window-ui-dimming.h index bb30381..ab3e2d6 100644 --- a/src/maemo/modest-main-window-ui-dimming.h +++ b/src/maemo/modest-main-window-ui-dimming.h @@ -76,7 +76,7 @@ static const ModestDimmingEntry modest_main_window_menu_dimming_entries [] = { { "/MenuBar/ToolsMenu/ToolsAccountsMenu", NULL }, { "/MenuBar/ToolsMenu/ToolsSMTPServersMenu", G_CALLBACK(modest_ui_dimming_rules_on_tools_smtp_servers) }, { "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu", NULL }, - { "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu", G_CALLBACK(modest_ui_dimming_rules_on_send_receive) }, + { "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu", G_CALLBACK(modest_ui_dimming_rules_on_send_receive_all) }, { "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveCancelSendingMenu", G_CALLBACK(modest_ui_dimming_rules_on_cancel_sending) }, { "/MenuBar/ToolsMenu/ToolsContactsMenu", NULL }, { "/MenuBar/ToolsMenu/ToolsSearchMessagesMenu", NULL }, diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index ba1fbd1..731ec5b 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -543,7 +543,7 @@ update_menus (ModestMainWindow* self) send_receive_all = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu"); - gtk_action_set_visible (send_receive_all, num_accounts > 1); + gtk_action_set_visible (send_receive_all, num_accounts > 0); /* Delete old send&receive popup items. We can not just do a menu_detach because it does not work well with @@ -1066,7 +1066,7 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data) accounts = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE); send_receive_all = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu"); - gtk_action_set_visible (send_receive_all, g_slist_length (accounts) > 1); + gtk_action_set_visible (send_receive_all, g_slist_length (accounts) > 0); modest_account_mgr_free_account_names (accounts); update_menus (MODEST_MAIN_WINDOW (self)); } diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index 59d5617..788e90a 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -1733,6 +1733,29 @@ modest_ui_dimming_rules_on_send_receive (ModestWindow *win, gpointer user_data) return dimmed; } +gboolean +modest_ui_dimming_rules_on_send_receive_all (ModestWindow *win, gpointer user_data) +{ + ModestDimmingRule *rule = NULL; + gboolean dimmed = FALSE; + + g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); + rule = MODEST_DIMMING_RULE (user_data); + + /* Check dimmed rule */ + if (!dimmed) { + GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE); + if (g_slist_length (account_names) <= 1) + dimmed = TRUE; + if (dimmed) + modest_dimming_rule_set_notification (rule, _("mcen_nc_no_email_acnts_defined")); + + modest_account_mgr_free_account_names (account_names); + } + + return dimmed; +} + gboolean modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_data) { diff --git a/src/modest-ui-dimming-rules.h b/src/modest-ui-dimming-rules.h index 57f5e7d..359a6ff 100644 --- a/src/modest-ui-dimming-rules.h +++ b/src/modest-ui-dimming-rules.h @@ -73,6 +73,7 @@ gboolean modest_ui_dimming_rules_on_tools_smtp_servers (ModestWindow *win, gpoin gboolean modest_ui_dimming_rules_on_cancel_sending (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_on_csm_cancel_sending (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_on_send_receive (ModestWindow *win, gpointer user_data); +gboolean modest_ui_dimming_rules_on_send_receive_all (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_on_find_msg (ModestWindow *win, gpointer user_data); gboolean modest_ui_dimming_rules_on_set_style (ModestWindow *win, gpointer user_data); -- 1.7.9.5