diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-05-24 05:09:24 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2011-05-24 09:50:50 +0800 |
commit | 9692758dc5c3a03597f0eb0b16edd10134153823 (patch) | |
tree | ae48699ccfd792672b0b3c4e382fbc5ce13eb584 /capplet/settings/mail-capplet-shell.c | |
parent | 61d1530c76341f1a69fa528071e3a6ffa07ed333 (diff) | |
download | gsoc2013-evolution-9692758dc5c3a03597f0eb0b16edd10134153823.tar.gz gsoc2013-evolution-9692758dc5c3a03597f0eb0b16edd10134153823.tar.zst gsoc2013-evolution-9692758dc5c3a03597f0eb0b16edd10134153823.zip |
EMFolderTree: Store an EMailBackend instead of an EMailSession.
All this so EMFolderTree can submit EActivity instances for async ops.
You can obtain an EMailSession from an EMailBackend, but not vice versa.
Creates lots of pretty ripples in the mail code, but ultimately reduces
complexity. So it's a code cleanup of sorts.
Diffstat (limited to 'capplet/settings/mail-capplet-shell.c')
-rw-r--r-- | capplet/settings/mail-capplet-shell.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index fecc0a67ad..2908531e57 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -66,7 +66,7 @@ static guint mail_capplet_shell_signals[LAST_SIGNAL]; struct _MailCappletShellPrivate { - EMailSession *session; + EMailBackend *backend; GtkWidget *box; GtkWidget * top_bar; @@ -202,6 +202,7 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean { MailCappletShellPrivate *priv = shell->priv; GtkStyle *style = gtk_widget_get_default_style (); + EMailSession *session; gchar *custom_dir; gtk_window_set_icon_name ((GtkWindow *)shell, "evolution"); @@ -238,17 +239,18 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean camel_provider_init (); - shell->priv->session = e_mail_session_new (); + shell->priv->backend = g_object_new (E_TYPE_MAIL_BACKEND, NULL); + session = e_mail_backend_get_session (shell->priv->backend); shell->view = mail_view_new (); - shell->view->session = shell->priv->session; + shell->view->backend = shell->priv->backend; gtk_widget_show ((GtkWidget *) shell->view); gtk_box_pack_end ((GtkBox *) priv->box, (GtkWidget *) shell->view, TRUE, TRUE, 2); - mail_config_init (shell->priv->session); + mail_config_init (session); mail_msg_init (); custom_dir = g_build_filename (e_get_user_data_dir (), "mail", NULL); - e_mail_store_init (shell->priv->session, custom_dir); + e_mail_store_init (session, custom_dir); g_free (custom_dir); if (just_druid) { |