From a9cfed5938aef37d95c009411f965ebc185547c1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 16 Dec 2011 10:40:37 -0500 Subject: 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. --- mail/e-mail-paned-view.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mail/e-mail-paned-view.c') diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c index 1634044589..0098462de1 100644 --- a/mail/e-mail-paned-view.c +++ b/mail/e-mail-paned-view.c @@ -619,6 +619,8 @@ mail_paned_view_constructed (GObject *object) EShellSettings *shell_settings; ESearchBar *search_bar; EMailReader *reader; + EMailBackend *backend; + EMailSession *session; EMailView *view; GtkWidget *message_list; GtkWidget *container; @@ -635,6 +637,9 @@ mail_paned_view_constructed (GObject *object) shell = e_shell_window_get_shell (shell_window); shell_settings = e_shell_get_shell_settings (shell); + backend = E_MAIL_BACKEND (shell_backend); + session = e_mail_backend_get_session (backend); + /* Make headers collapsable and store state of headers in config file */ em_format_html_set_headers_collapsable ( EM_FORMAT_HTML (priv->formatter), TRUE); @@ -675,7 +680,7 @@ mail_paned_view_constructed (GObject *object) container = widget; - widget = message_list_new (E_MAIL_BACKEND (shell_backend)); + widget = message_list_new (session); gtk_container_add (GTK_CONTAINER (container), widget); priv->message_list = g_object_ref (widget); gtk_widget_show (widget); -- cgit v1.2.3