diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-05-31 22:24:14 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-06-01 00:01:49 +0800 |
commit | 4f01d3d1823fd8d7b53919b03ff44cc46ad92b77 (patch) | |
tree | 93b7541b92635862399d7783cb2fed77cee74ef5 /modules/mail/e-mail-shell-view-actions.c | |
parent | 3d9b0002c5802e3d8c3a426221bfb5294691326e (diff) | |
download | gsoc2013-evolution-4f01d3d1823fd8d7b53919b03ff44cc46ad92b77.tar.gz gsoc2013-evolution-4f01d3d1823fd8d7b53919b03ff44cc46ad92b77.tar.zst gsoc2013-evolution-4f01d3d1823fd8d7b53919b03ff44cc46ad92b77.zip |
Keep chipping away at direct GtkHTML usage.
EMFormatHTML now holds a sealed EWebView instead of a public GtkHTML,
accessible through em_format_html_get_web_view().
Rename e_mail_reader_get_html_display() to e_mail_reader_get_formatter()
and have it return an EMFormatHTML instead of an EMFormatHTMLDisplay,
since that's usually the type you want (or else an EMFormat, but never
an EMFormatHTMLDisplay).
Diffstat (limited to 'modules/mail/e-mail-shell-view-actions.c')
-rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index 63b5b4f400..720f2da87e 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -594,11 +594,11 @@ action_mail_smart_backward_cb (GtkAction *action, EShellSettings *shell_settings; EMailShellSidebar *mail_shell_sidebar; EMFolderTree *folder_tree; - EMFormatHTMLDisplay *html_display; + EMFormatHTML *formatter; EMailReader *reader; GtkWidget *message_list; GtkToggleAction *toggle_action; - GtkHTML *html; + EWebView *web_view; gboolean caret_mode; gboolean magic_spacebar; @@ -613,7 +613,7 @@ action_mail_smart_backward_cb (GtkAction *action, folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar); reader = E_MAIL_READER (mail_shell_view->priv->mail_shell_content); - html_display = e_mail_reader_get_html_display (reader); + formatter = e_mail_reader_get_formatter (reader); message_list = e_mail_reader_get_message_list (reader); magic_spacebar = e_shell_settings_get_boolean ( @@ -622,9 +622,9 @@ action_mail_smart_backward_cb (GtkAction *action, toggle_action = GTK_TOGGLE_ACTION (ACTION (MAIL_CARET_MODE)); caret_mode = gtk_toggle_action_get_active (toggle_action); - html = EM_FORMAT_HTML (html_display)->html; + web_view = em_format_html_get_web_view (formatter); - if (e_web_view_scroll_backward (E_WEB_VIEW (html))) + if (e_web_view_scroll_backward (web_view)) return; if (caret_mode || !magic_spacebar) @@ -660,11 +660,11 @@ action_mail_smart_forward_cb (GtkAction *action, EShellSettings *shell_settings; EMailShellSidebar *mail_shell_sidebar; EMFolderTree *folder_tree; - EMFormatHTMLDisplay *html_display; + EMFormatHTML *formatter; EMailReader *reader; GtkWidget *message_list; GtkToggleAction *toggle_action; - GtkHTML *html; + EWebView *web_view; gboolean caret_mode; gboolean magic_spacebar; @@ -679,7 +679,7 @@ action_mail_smart_forward_cb (GtkAction *action, folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar); reader = E_MAIL_READER (mail_shell_view->priv->mail_shell_content); - html_display = e_mail_reader_get_html_display (reader); + formatter = e_mail_reader_get_formatter (reader); message_list = e_mail_reader_get_message_list (reader); magic_spacebar = e_shell_settings_get_boolean ( @@ -688,9 +688,9 @@ action_mail_smart_forward_cb (GtkAction *action, toggle_action = GTK_TOGGLE_ACTION (ACTION (MAIL_CARET_MODE)); caret_mode = gtk_toggle_action_get_active (toggle_action); - html = EM_FORMAT_HTML (html_display)->html; + web_view = em_format_html_get_web_view (formatter); - if (e_web_view_scroll_forward (E_WEB_VIEW (html))) + if (e_web_view_scroll_forward (web_view)) return; if (caret_mode || !magic_spacebar) |