diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-10-19 20:41:17 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-10-19 20:42:42 +0800 |
| commit | 32ca78553b735dcb1a05f62a351a56c1289dc8ce (patch) | |
| tree | c23071c88b374f652bc83bae30b4b3318a498043 /modules | |
| parent | 012a34614326e676168581ae69b605fd167363af (diff) | |
| download | gsoc2013-evolution-32ca78553b735dcb1a05f62a351a56c1289dc8ce.tar gsoc2013-evolution-32ca78553b735dcb1a05f62a351a56c1289dc8ce.tar.gz gsoc2013-evolution-32ca78553b735dcb1a05f62a351a56c1289dc8ce.tar.bz2 gsoc2013-evolution-32ca78553b735dcb1a05f62a351a56c1289dc8ce.tar.lz gsoc2013-evolution-32ca78553b735dcb1a05f62a351a56c1289dc8ce.tar.xz gsoc2013-evolution-32ca78553b735dcb1a05f62a351a56c1289dc8ce.tar.zst gsoc2013-evolution-32ca78553b735dcb1a05f62a351a56c1289dc8ce.zip | |
Remove "Disable Account" menu item for GOA-based accounts.
GOA-based accounts must only be disabled from gnome-control-center.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mail/e-mail-shell-view.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index 801362d331..4cd97c71cc 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -842,6 +842,7 @@ mail_shell_view_update_actions (EShellView *shell_view) gboolean folder_tree_and_message_list_agree = TRUE; gboolean store_is_builtin; gboolean store_is_subscribable; + gboolean store_can_be_disabled; gboolean any_store_is_subscribable = FALSE; /* Chain up to parent's update_actions() method. */ @@ -883,6 +884,8 @@ mail_shell_view_update_actions (EShellView *shell_view) (state & E_MAIL_SIDEBAR_STORE_IS_BUILTIN); store_is_subscribable = (state & E_MAIL_SIDEBAR_STORE_IS_SUBSCRIBABLE); + store_can_be_disabled = + (state & E_MAIL_SIDEBAR_STORE_CAN_BE_DISABLED); uri = em_folder_tree_get_selected_uri (folder_tree); store = em_folder_tree_get_selected_store (folder_tree); @@ -968,7 +971,7 @@ mail_shell_view_update_actions (EShellView *shell_view) g_list_free (list); action = ACTION (MAIL_ACCOUNT_DISABLE); - sensitive = (store != NULL) && folder_is_store; + sensitive = folder_is_store && store_can_be_disabled; if (account_is_groupwise) label = _("Proxy _Logout"); else |