diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-10-27 00:31:33 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-10-27 00:46:13 +0800 |
| commit | 2b7bb054f06797c93e0b82dd78e1a2c0b6ad9659 (patch) | |
| tree | b2083067a76519ddc6da1f6423d86cbe398cb9fd /modules/mail/e-mail-shell-view-actions.c | |
| parent | 251b734a8573a1d6b04d2b82ce1f0be9fe9662ab (diff) | |
| download | gsoc2013-evolution-2b7bb054f06797c93e0b82dd78e1a2c0b6ad9659.tar gsoc2013-evolution-2b7bb054f06797c93e0b82dd78e1a2c0b6ad9659.tar.gz gsoc2013-evolution-2b7bb054f06797c93e0b82dd78e1a2c0b6ad9659.tar.bz2 gsoc2013-evolution-2b7bb054f06797c93e0b82dd78e1a2c0b6ad9659.tar.lz gsoc2013-evolution-2b7bb054f06797c93e0b82dd78e1a2c0b6ad9659.tar.xz gsoc2013-evolution-2b7bb054f06797c93e0b82dd78e1a2c0b6ad9659.tar.zst gsoc2013-evolution-2b7bb054f06797c93e0b82dd78e1a2c0b6ad9659.zip | |
e-mail-store.c: Take EMailSession instead of EMailBackend.
My apologies for flip-flopping the API again.
e-mail-store.c functions used to take an EMailSession, then I changed
it to take an EMailBackend in preparation for my account-mgmt branch.
Having rethought some API decisions on the branch, however, the first
flip-flop proved to be unnecessary. And now Srini needs the API to use
EMailSession for his mail-factory branch, so I'm flip-flopping again.
Diffstat (limited to 'modules/mail/e-mail-shell-view-actions.c')
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index 6d9b3a4252..f752506306 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -85,6 +85,7 @@ action_mail_account_disable_cb (GtkAction *action, EShellBackend *shell_backend; EShellView *shell_view; EMailBackend *backend; + EMailSession *session; EMFolderTree *folder_tree; CamelService *service; CamelStore *store; @@ -98,6 +99,7 @@ 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); @@ -115,7 +117,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 (backend, account); + e_mail_store_remove_by_account (session, account); if (account->parent_uid != NULL) e_account_list_remove (account_list, account); @@ -225,15 +227,17 @@ 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 ( - backend, (GFunc) action_mail_download_foreach_cb, reader); + session, (GFunc) action_mail_download_foreach_cb, reader); } static void |