diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-14 20:08:57 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-11-14 20:08:57 +0800 |
| commit | 7ab5ae3fc72516cceeb09a48bc5a39f7b57933de (patch) | |
| tree | f1d1afbfa9d8c97dc691a2d241c9ec368fdf67d3 /modules/mail | |
| parent | cda52538315c481bc3b11ff2db40f7165113d1ab (diff) | |
| parent | c4308051159a37f16521b881f59259861998f4ae (diff) | |
| download | gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.gz gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.bz2 gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.lz gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.xz gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.tar.zst gsoc2013-evolution-7ab5ae3fc72516cceeb09a48bc5a39f7b57933de.zip | |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'modules/mail')
| -rw-r--r-- | modules/mail/e-mail-shell-backend.c | 7 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 2 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view.c | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index bc801dabf8..f498621852 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -160,9 +160,6 @@ action_mail_message_new_cb (GtkAction *action, shell = e_shell_window_get_shell (shell_window); - if (!em_utils_check_user_can_send_mail ()) - return; - /* Take care not to unnecessarily load the mail shell view. */ view_name = e_shell_window_get_active_view (shell_window); if (g_strcmp0 (view_name, BACKEND_NAME) != 0) @@ -268,9 +265,7 @@ mail_shell_backend_handle_uri_cb (EShell *shell, gboolean handled = FALSE; if (g_str_has_prefix (uri, "mailto:")) { - if (em_utils_check_user_can_send_mail ()) - em_utils_compose_new_message_with_mailto ( - shell, uri, NULL); + em_utils_compose_new_message_with_mailto (shell, uri, NULL); handled = TRUE; } diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index dc94c5c9ed..2427fc1ffd 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -123,6 +123,8 @@ action_mail_account_disable_cb (GtkAction *action, e_account_list_remove (account_list, account); e_account_list_save (account_list); + + e_shell_view_update_actions (shell_view); } static void diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index 5759b5830f..1e80e77a3c 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -990,7 +990,7 @@ mail_shell_view_update_actions (EShellView *shell_view) gtk_action_set_sensitive (action, sensitive); action = ACTION (MAIL_FOLDER_PROPERTIES); - sensitive = !folder_is_store; + sensitive = !folder_is_store && uri != NULL; gtk_action_set_sensitive (action, sensitive); action = ACTION (MAIL_FOLDER_REFRESH); |