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/e-mail-reader.h | |
| parent | 3d9b0002c5802e3d8c3a426221bfb5294691326e (diff) | |
| download | gsoc2013-evolution-4f01d3d1823fd8d7b53919b03ff44cc46ad92b77.tar gsoc2013-evolution-4f01d3d1823fd8d7b53919b03ff44cc46ad92b77.tar.gz gsoc2013-evolution-4f01d3d1823fd8d7b53919b03ff44cc46ad92b77.tar.bz2 gsoc2013-evolution-4f01d3d1823fd8d7b53919b03ff44cc46ad92b77.tar.lz gsoc2013-evolution-4f01d3d1823fd8d7b53919b03ff44cc46ad92b77.tar.xz 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/e-mail-reader.h')
| -rw-r--r-- | mail/e-mail-reader.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mail/e-mail-reader.h b/mail/e-mail-reader.h index 0b8f30d825..b493cff98f 100644 --- a/mail/e-mail-reader.h +++ b/mail/e-mail-reader.h @@ -29,7 +29,7 @@ #include <gtk/gtk.h> #include <camel/camel.h> -#include <mail/em-format-html-display.h> +#include <mail/em-format-html.h> #include <shell/e-shell-backend.h> /* Standard GObject macros */ @@ -84,9 +84,8 @@ struct _EMailReaderIface { GtkActionGroup * (*get_action_group) (EMailReader *reader); + EMFormatHTML * (*get_formatter) (EMailReader *reader); gboolean (*get_hide_deleted) (EMailReader *reader); - EMFormatHTMLDisplay * - (*get_html_display) (EMailReader *reader); GtkWidget * (*get_message_list) (EMailReader *reader); GtkMenu * (*get_popup_menu) (EMailReader *reader); GPtrArray * (*get_selected_uids) (EMailReader *reader); @@ -115,9 +114,8 @@ GtkAction * e_mail_reader_get_action (EMailReader *reader, const gchar *action_name); GtkActionGroup * e_mail_reader_get_action_group (EMailReader *reader); +EMFormatHTML * e_mail_reader_get_formatter (EMailReader *reader); gboolean e_mail_reader_get_hide_deleted (EMailReader *reader); -EMFormatHTMLDisplay * - e_mail_reader_get_html_display (EMailReader *reader); GtkWidget * e_mail_reader_get_message_list (EMailReader *reader); GtkMenu * e_mail_reader_get_popup_menu (EMailReader *reader); GPtrArray * e_mail_reader_get_selected_uids (EMailReader *reader); |