From 8091cf96d151b5401a702dc6a06913db72b64413 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Fri, 16 Jan 2009 10:29:48 +0000 Subject: [PATCH] * Fixes NB#97195, show Send&Receive in folder window pmo-trunk-r7161 --- src/hildon2/modest-folder-window.c | 10 +++++++--- src/modest-ui-dimming-rules.c | 16 ++++++++++------ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c index 0980eda..df924f1 100644 --- a/src/hildon2/modest-folder-window.c +++ b/src/hildon2/modest-folder-window.c @@ -365,14 +365,18 @@ static void setup_menu (ModestFolderWindow *self) NULL); /* new message */ - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "n", + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), + _("mcen_me_new_message"), + "n", APP_MENU_CALLBACK (modest_ui_actions_on_new_msg), NULL); /* send receive actions should be only one visible always */ - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL, + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), + _("mcen_me_inbox_sendandreceive"), + NULL, APP_MENU_CALLBACK (modest_ui_actions_on_send_receive), - MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive_all)); + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive)); modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL, APP_MENU_CALLBACK (modest_ui_actions_cancel_send), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all)); diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index d9d8396..edd1ae4 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -1857,13 +1857,17 @@ modest_ui_dimming_rules_on_send_receive (ModestWindow *win, gpointer user_data) { ModestDimmingRule *rule = NULL; gboolean dimmed = FALSE; - + ModestAccountMgr *mgr; + const gchar* account_name; + g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); rule = MODEST_DIMMING_RULE (user_data); - - /* Check dimmed rule */ - dimmed = !modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), - TRUE); + mgr = modest_runtime_get_account_mgr(); + + /* Check dimmed rule */ + account_name = modest_window_get_active_account (win); + dimmed = modest_account_mgr_account_is_busy (mgr, account_name); + if (dimmed) modest_dimming_rule_set_notification (rule, _("mcen_nc_no_email_acnts_defined")); @@ -1885,7 +1889,7 @@ modest_ui_dimming_rules_on_send_receive_all (ModestWindow *win, gpointer user_da dimmed = TRUE; if (dimmed) modest_dimming_rule_set_notification (rule, _("mcen_nc_no_email_acnts_defined")); - + modest_account_mgr_free_account_names (account_names); if (!dimmed) { -- 1.7.9.5