diff options
| -rw-r--r-- | mail/em-utils.c | 27 | ||||
| -rw-r--r-- | mail/em-utils.h | 2 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-backend.c | 7 |
3 files changed, 1 insertions, 35 deletions
diff --git a/mail/em-utils.c b/mail/em-utils.c index 399e51294b..1423130772 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -219,33 +219,6 @@ em_utils_uids_free (GPtrArray *uids) g_ptr_array_free (uids, TRUE); } -/** - * em_utils_check_user_can_send_mail: - * - * Returns %TRUE if the user has an account configured (to send mail) - * or %FALSE otherwise. - **/ -gboolean -em_utils_check_user_can_send_mail (void) -{ - EAccountList *account_list; - EAccount *account; - - account_list = e_get_account_list (); - - if (e_list_length (E_LIST (account_list)) == 0) - return FALSE; - - if (!(account = e_get_default_account ())) - return FALSE; - - /* Check for a transport */ - if (!account->transport->url) - return FALSE; - - return TRUE; -} - /* Editing Filters/Search Folders... */ static GtkWidget *filter_editor = NULL; diff --git a/mail/em-utils.h b/mail/em-utils.h index b07b74b186..b7e3ec6f49 100644 --- a/mail/em-utils.h +++ b/mail/em-utils.h @@ -42,8 +42,6 @@ gboolean em_utils_prompt_user (GtkWindow *parent, const gchar *promptkey, const GPtrArray *em_utils_uids_copy (GPtrArray *uids); void em_utils_uids_free (GPtrArray *uids); -gboolean em_utils_check_user_can_send_mail (void); - void em_utils_edit_filters (GtkWidget *parent, EMailBackend *backend); void em_filename_make_safe (gchar *string); void em_utils_edit_vfolders (GtkWidget *parent); diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index ce563124c6..b729a00832 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; } |