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 /mail/em-format-html.h | |
| 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 'mail/em-format-html.h')
| -rw-r--r-- | mail/em-format-html.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mail/em-format-html.h b/mail/em-format-html.h index 26a6671cea..4e9b315765 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -30,7 +30,7 @@ #include <em-format/em-format.h> #include <mail/mail-config.h> -#include <gtkhtml/gtkhtml.h> +#include <misc/e-web-view.h> #include <gtkhtml/gtkhtml-embedded.h> /* Standard GObject macros */ @@ -195,8 +195,6 @@ struct _EMFormatHTML { EMFormat parent; EMFormatHTMLPrivate *priv; - GtkHTML *html; - GQueue pending_object_list; GSList *headers; @@ -217,6 +215,7 @@ struct _EMFormatHTMLClass { }; GType em_format_html_get_type (void); +EWebView * em_format_html_get_web_view (EMFormatHTML *efh); void em_format_html_load_images (EMFormatHTML *efh); void em_format_html_get_color (EMFormatHTML *efh, EMFormatHTMLColorType type, |