From d6105626509c73da6d0184edc0b864254d97cbd3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 3 Nov 2012 10:54:27 -0400 Subject: Bug 687400 - Composer settings not applied EMailConfigWebView is an extension that configures EWebView instances. This used to cover both the email formatter and the email composer, but with the email formatter now using WebKit/GTK+ and the email composer still using GtkHtml, the composer was left unconfigured. Add an EMailConfigWebViewGtkHTML extension that targets EWebViewGtkHTML instances and applies the relevant settings, and remove all the GtkHTML contortions from EMailConfigWebView. --- modules/mail/e-mail-config-web-view-gtkhtml.h | 65 +++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 modules/mail/e-mail-config-web-view-gtkhtml.h (limited to 'modules/mail/e-mail-config-web-view-gtkhtml.h') diff --git a/modules/mail/e-mail-config-web-view-gtkhtml.h b/modules/mail/e-mail-config-web-view-gtkhtml.h new file mode 100644 index 0000000000..7391aa8628 --- /dev/null +++ b/modules/mail/e-mail-config-web-view-gtkhtml.h @@ -0,0 +1,65 @@ +/* + * e-mail-config-web-view-gtkhtml.h + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + */ + +#ifndef E_MAIL_CONFIG_WEB_VIEW_GTKHTML_H +#define E_MAIL_CONFIG_WEB_VIEW_GTKHTML_H + +#include + +/* Standard GObject macros */ +#define E_TYPE_MAIL_CONFIG_WEB_VIEW_GTKHTML \ + (e_mail_config_web_view_gtkhtml_get_type ()) +#define E_MAIL_CONFIG_WEB_VIEW_GTKHTML(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW_GTKHTML, EMailConfigWebViewGtkHTML)) +#define E_MAIL_CONFIG_WEB_VIEW_GTKHTML_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), E_TYPE_MAIL_CONFIG_WEB_VIEW_GTKHTML, EMailConfigWebViewGtkHTMLClass)) +#define E_IS_MAIL_CONFIG_WEB_VIEW_GTKHTML(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW_GTKHTML)) +#define E_IS_MAIL_CONFIG_WEB_VIEW_GTKHTML_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), E_TYPE_MAIL_CONFIG_WEB_VIEW_GTKHTML)) +#define E_MAIL_CONFIG_WEB_VIEW_GTKHTML_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW_GTKHTML, EMailConfigWebViewGtkHTMLClass)) + +G_BEGIN_DECLS + +typedef struct _EMailConfigWebViewGtkHTML EMailConfigWebViewGtkHTML; +typedef struct _EMailConfigWebViewGtkHTMLClass EMailConfigWebViewGtkHTMLClass; +typedef struct _EMailConfigWebViewGtkHTMLPrivate EMailConfigWebViewGtkHTMLPrivate; + +struct _EMailConfigWebViewGtkHTML { + EExtension parent; + EMailConfigWebViewGtkHTMLPrivate *priv; +}; + +struct _EMailConfigWebViewGtkHTMLClass { + EExtensionClass parent_class; +}; + +GType e_mail_config_web_view_gtkhtml_get_type + (void) G_GNUC_CONST; +void e_mail_config_web_view_gtkhtml_type_register + (GTypeModule *type_module); + +G_END_DECLS + +#endif /* E_MAIL_CONFIG_WEB_VIEW_GTKHTML_H */ -- cgit v1.2.3