diff options
Diffstat (limited to 'modules/mail/e-mail-shell-view-actions.c')
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index f4f5ea26f6..6d9b3a4252 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -85,7 +85,6 @@ action_mail_account_disable_cb (GtkAction *action, EShellBackend *shell_backend; EShellView *shell_view; EMailBackend *backend; - EMailSession *session; EMFolderTree *folder_tree; CamelService *service; CamelStore *store; @@ -99,7 +98,6 @@ action_mail_account_disable_cb (GtkAction *action, shell_backend = e_shell_view_get_shell_backend (shell_view); backend = E_MAIL_BACKEND (shell_backend); - session = e_mail_backend_get_session (backend); folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar); store = em_folder_tree_get_selected_store (folder_tree); @@ -117,7 +115,7 @@ action_mail_account_disable_cb (GtkAction *action, account->enabled = !account->enabled; e_account_list_change (account_list, account); - e_mail_store_remove_by_account (session, account); + e_mail_store_remove_by_account (backend, account); if (account->parent_uid != NULL) e_account_list_remove (account_list, account); @@ -227,17 +225,15 @@ action_mail_download_cb (GtkAction *action, EMailView *mail_view; EMailReader *reader; EMailBackend *backend; - EMailSession *session; mail_shell_content = mail_shell_view->priv->mail_shell_content; mail_view = e_mail_shell_content_get_mail_view (mail_shell_content); reader = E_MAIL_READER (mail_view); backend = e_mail_reader_get_backend (reader); - session = e_mail_backend_get_session (backend); e_mail_store_foreach ( - session, (GFunc) action_mail_download_foreach_cb, reader); + backend, (GFunc) action_mail_download_foreach_cb, reader); } static void @@ -247,15 +243,12 @@ action_mail_flush_outbox_cb (GtkAction *action, EShellBackend *shell_backend; EShellView *shell_view; EMailBackend *backend; - EMailSession *session; shell_view = E_SHELL_VIEW (mail_shell_view); shell_backend = e_shell_view_get_shell_backend (shell_view); - backend = E_MAIL_BACKEND (shell_backend); - session = e_mail_backend_get_session (backend); - mail_send (session); + mail_send (backend); } static void @@ -1059,7 +1052,6 @@ action_mail_tools_subscriptions_cb (GtkAction *action, EShellWindow *shell_window; EShellView *shell_view; EMailBackend *backend; - EMailSession *session; EMFolderTree *folder_tree; GtkWidget *dialog; CamelStore *store; @@ -1073,11 +1065,9 @@ action_mail_tools_subscriptions_cb (GtkAction *action, store = em_folder_tree_get_selected_store (folder_tree); backend = E_MAIL_BACKEND (shell_backend); - session = e_mail_backend_get_session (backend); dialog = em_subscription_editor_new ( - GTK_WINDOW (shell_window), - CAMEL_SESSION (session), store); + GTK_WINDOW (shell_window), backend, store); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } |