X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=794c0fa31af4af24383fc3bf125232c20bf68c2e;hb=38331c03731a7f43d5d8bd75bc2585475158d4d6;hp=553b5ae751625cb9c0962ce89ea4b67d50e391b9;hpb=d23b36df84cd2f794d4c2badbe3c233cb2dcc35e;p=modest diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index 553b5ae..794c0fa 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -34,6 +34,7 @@ #include #include "modest-ui-dimming-rules.h" #include "modest-ui-actions.h" +#include "modest-account-mgr-helpers.h" #include "modest-dimming-rule.h" #include "modest-debug.h" #include "modest-tny-folder.h" @@ -618,11 +619,6 @@ modest_ui_dimming_rules_on_rename_folder (ModestWindow *win, gpointer user_data) if (dimmed) modest_dimming_rule_set_notification (rule, ""); } - if (!dimmed) { - dimmed = _transfer_mode_enabled (win); - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); - } return dimmed; } @@ -1891,20 +1887,52 @@ modest_ui_dimming_rules_on_view_next (ModestWindow *win, gpointer user_data) if (!dimmed) { dimmed = modest_msg_view_window_last_message_selected (MODEST_MSG_VIEW_WINDOW (win)); modest_dimming_rule_set_notification (rule, NULL); - } + } return dimmed; } -gboolean +gboolean modest_ui_dimming_rules_on_tools_smtp_servers (ModestWindow *win, gpointer user_data) { - return !modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), - TRUE); + gboolean dimmed; + ModestAccountMgr *mgr; + + mgr = modest_runtime_get_account_mgr(); + dimmed = !modest_account_mgr_has_accounts(mgr, TRUE); + + /* Dimm it if we only have metaaccounts */ + if (!dimmed) { + ModestProtocolRegistry *reg = modest_runtime_get_protocol_registry (); + GSList *account_names = modest_account_mgr_account_names (mgr, TRUE); + + if (account_names) { + ModestProtocolType store_protocol; + gboolean found = FALSE; + GSList *iter = account_names; + const gchar *tag = MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS; + + while (iter && !found) { + gchar* account_name; + + account_name = (gchar *) iter->data; + store_protocol = modest_account_mgr_get_store_protocol (mgr, account_name); + + if (!modest_protocol_registry_protocol_type_has_tag (reg, store_protocol, tag)) + found = TRUE; + else + iter = g_slist_next (iter); + } + modest_account_mgr_free_account_names (account_names); + dimmed = !found; + } + } + + return dimmed; } -gboolean +gboolean modest_ui_dimming_rules_on_cancel_sending (ModestWindow *win, gpointer user_data) { ModestDimmingRule *rule = NULL; @@ -3110,6 +3138,12 @@ modest_ui_dimming_rules_on_folder_window_move_to (ModestWindow *win, gpointer us MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE); } + if (!dimmed) { + dimmed = _transfer_mode_enabled (win); + if (dimmed) + modest_dimming_rule_set_notification (rule, ""); + } + return dimmed; } @@ -3135,6 +3169,12 @@ modest_ui_dimming_rules_on_folder_window_delete (ModestWindow *win, gpointer use MODEST_FOLDER_RULES_FOLDER_NON_DELETABLE); } + if (!dimmed) { + dimmed = _transfer_mode_enabled (win); + if (dimmed) + modest_dimming_rule_set_notification (rule, ""); + } + return dimmed; }