diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-12-16 23:40:37 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-12-16 23:58:54 +0800 |
| commit | a9cfed5938aef37d95c009411f965ebc185547c1 (patch) | |
| tree | d0c6eb1d5acea6752425169aae47e8f4ed4b55ea /modules/mail/e-mail-shell-backend.c | |
| parent | df85cb1b7a47f713cb775f648f735e642a1bb71b (diff) | |
| download | gsoc2013-evolution-a9cfed5938aef37d95c009411f965ebc185547c1.tar gsoc2013-evolution-a9cfed5938aef37d95c009411f965ebc185547c1.tar.gz gsoc2013-evolution-a9cfed5938aef37d95c009411f965ebc185547c1.tar.bz2 gsoc2013-evolution-a9cfed5938aef37d95c009411f965ebc185547c1.tar.lz gsoc2013-evolution-a9cfed5938aef37d95c009411f965ebc185547c1.tar.xz gsoc2013-evolution-a9cfed5938aef37d95c009411f965ebc185547c1.tar.zst gsoc2013-evolution-a9cfed5938aef37d95c009411f965ebc185547c1.zip | |
Avoid passing EMailBackend as much as possible.
More mail API churn... reversing some previous API decisions.
I've made some key API changes to EMailSession on the account-mgmt
branch which should allow for this, and will hopefully also benefit
the "email-factory" branch.
EMailBackend barely needs to exist anymore, except as the owner of
EMailSession.
For several low-level functions, we replace its EMailBackend parameter
with EMailSession and EAlertSink parameters; the latter so it can still
pass user alerts up the chain.
Diffstat (limited to 'modules/mail/e-mail-shell-backend.c')
| -rw-r--r-- | modules/mail/e-mail-shell-backend.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index 64817fad00..891fc64ae9 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -115,7 +115,7 @@ action_mail_folder_new_cb (GtkAction *action, { EMFolderTree *folder_tree = NULL; EMailShellSidebar *mail_shell_sidebar; - EMailBackend *backend; + EMailSession *session; EShellSidebar *shell_sidebar; EShellView *shell_view; const gchar *view_name; @@ -123,8 +123,9 @@ action_mail_folder_new_cb (GtkAction *action, /* 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) { - EShellBackend *shell_backend; EShell *shell; + EShellBackend *shell_backend; + EMailBackend *backend; shell = e_shell_window_get_shell (shell_window); @@ -133,6 +134,7 @@ action_mail_folder_new_cb (GtkAction *action, g_return_if_fail (E_IS_MAIL_BACKEND (shell_backend)); backend = E_MAIL_BACKEND (shell_backend); + session = e_mail_backend_get_session (backend); goto exit; } @@ -142,11 +144,11 @@ action_mail_folder_new_cb (GtkAction *action, mail_shell_sidebar = E_MAIL_SHELL_SIDEBAR (shell_sidebar); folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar); - backend = em_folder_tree_get_backend (folder_tree); + session = em_folder_tree_get_session (folder_tree); exit: em_folder_utils_create_folder ( - GTK_WINDOW (shell_window), backend, folder_tree, NULL); + GTK_WINDOW (shell_window), session, folder_tree, NULL); } static void @@ -481,7 +483,7 @@ mail_shell_backend_start (EShellBackend *shell_backend) g_error_free (error); } - mail_autoreceive_init (backend); + mail_autoreceive_init (session); if (g_getenv ("CAMEL_FLUSH_CHANGES") != NULL) priv->mail_sync_source_id = g_timeout_add_seconds ( |