From 6d2c382788a4042d53f49a080acd11b499aa52f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 28 Mar 2012 18:38:11 +0200 Subject: WebKit port - port formatter and mail module --- mail/e-mail-notebook-view.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'mail/e-mail-notebook-view.c') diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c index 64995bc8ef..86b47f6b92 100644 --- a/mail/e-mail-notebook-view.c +++ b/mail/e-mail-notebook-view.c @@ -900,21 +900,17 @@ mail_notebook_view_get_backend (EMailReader *reader) return E_MAIL_BACKEND (shell_backend); } -static EMFormatHTML * -mail_notebook_view_get_formatter (EMailReader *reader) +static EMailDisplay * +mail_notebook_view_get_mail_display (EMailReader *reader) { - EMailNotebookView *notebook_view; - EMailView *current_view; + EMailNotebookViewPrivate *priv; - notebook_view = E_MAIL_NOTEBOOK_VIEW (reader); - current_view = notebook_view->priv->current_view; + priv = E_MAIL_NOTEBOOK_VIEW (reader)->priv; - if (current_view == NULL) + if (priv->current_view == NULL) return NULL; - reader = E_MAIL_READER (current_view); - - return e_mail_reader_get_formatter (reader); + return e_mail_reader_get_mail_display (E_MAIL_READER (priv->current_view)); } static gboolean @@ -1458,7 +1454,7 @@ e_mail_notebook_view_reader_init (EMailReaderInterface *interface) interface->get_action_group = mail_notebook_view_get_action_group; interface->get_alert_sink = mail_notebook_view_get_alert_sink; interface->get_backend = mail_notebook_view_get_backend; - interface->get_formatter = mail_notebook_view_get_formatter; + interface->get_mail_display = mail_notebook_view_get_mail_display; interface->get_hide_deleted = mail_notebook_view_get_hide_deleted; interface->get_message_list = mail_notebook_view_get_message_list; interface->get_popup_menu = mail_notebook_view_get_popup_menu; -- cgit v1.2.3