[evolution/gnome-3-6] Bug 687400 - Composer settings not applied

[Matthew Barnes <mbarnes src gnome org>]

commit 14853f88345e1fbd9e0ad412182a42d624b6b702
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Nov 3 10:54:27 2012 -0400

    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.
    
    (cherry picked from commit d6105626509c73da6d0184edc0b864254d97cbd3)

 modules/mail/Makefile.am                      |    2 +
 modules/mail/e-mail-config-web-view-gtkhtml.c |  308 +++++++++++++++++++++++++
 modules/mail/e-mail-config-web-view-gtkhtml.h |   65 ++++++
 modules/mail/e-mail-config-web-view.c         |  229 ++-----------------
 modules/mail/evolution-module-mail.c          |    2 +
 5 files changed, 391 insertions(+), 215 deletions(-)
---
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index 74391b2..97050ae 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -24,6 +24,8 @@ module_mail_la_SOURCES = \
 	e-mail-config-reader.h						\
 	e-mail-config-web-view.c					\
 	e-mail-config-web-view.h					\
+	e-mail-config-web-view-gtkhtml.c				\
+	e-mail-config-web-view-gtkhtml.h				\
 	e-mail-event-hook.c						\
 	e-mail-event-hook.h						\
 	e-mail-shell-backend.c						\
diff --git a/modules/mail/e-mail-config-web-view-gtkhtml.c b/modules/mail/e-mail-config-web-view-gtkhtml.c
new file mode 100644
index 0000000..2721d5e
--- /dev/null
+++ b/modules/mail/e-mail-config-web-view-gtkhtml.c
@@ -0,0 +1,308 @@
+/*
+ * e-mail-config-web-view.c
+ *
+ * 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 <http://www.gnu.org/licenses/>
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+#include "e-mail-config-web-view-gtkhtml.h"
+
+#include <shell/e-shell.h>
+#include <misc/e-web-view-gtkhtml.h>
+
+#define E_MAIL_CONFIG_WEB_VIEW_GTKHTML_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW_GTKHTML, EMailConfigWebViewGtkHTMLPrivate))
+
+struct _EMailConfigWebViewGtkHTMLPrivate {
+	GtkCssProvider *css_provider;
+	EShellSettings *shell_settings;
+};
+
+G_DEFINE_DYNAMIC_TYPE (
+	EMailConfigWebViewGtkHTML,
+	e_mail_config_web_view_gtkhtml,
+	E_TYPE_EXTENSION)
+
+/* replaces content of color string */
+static void
+mail_config_web_view_gtkhtml_fix_color_string (gchar *color_string)
+{
+	GdkColor color;
+
+	if (color_string == NULL)
+		return;
+
+	if (strlen (color_string) < 13)
+		return;
+
+	if (!gdk_color_parse (color_string, &color))
+		return;
+
+	sprintf (
+		color_string, "#%02x%02x%02x",
+		(gint) color.red * 256 / 65536,
+		(gint) color.green * 256 / 65536,
+		(gint) color.blue * 256 / 65536);
+}
+
+static void
+mail_config_web_view_gtkhtml_load_style (EMailConfigWebViewGtkHTML *extension)
+{
+	GString *buffer;
+	gchar *citation_color;
+	gchar *monospace_font;
+	gchar *spell_color;
+	gchar *variable_font;
+	gboolean custom_fonts;
+	gboolean mark_citations;
+	EExtensible *extensible;
+	EShellSettings *shell_settings;
+	GtkStyleContext *style_context;
+	GError *error = NULL;
+
+	/* Some of our mail and composer preferences are passed down to
+	 * GtkHtml through style properties, unfortunately.  This builds
+	 * a style sheet for the EWebView using values from GSettings. */
+
+	shell_settings = extension->priv->shell_settings;
+
+	custom_fonts = e_shell_settings_get_boolean (
+		shell_settings, "mail-use-custom-fonts");
+
+	monospace_font = e_shell_settings_get_string (
+		shell_settings, "mail-font-monospace");
+
+	variable_font = e_shell_settings_get_string (
+		shell_settings, "mail-font-variable");
+
+	mark_citations = e_shell_settings_get_boolean (
+		shell_settings, "mail-mark-citations");
+
+	citation_color = e_shell_settings_get_string (
+		shell_settings, "mail-citation-color");
+
+	spell_color = e_shell_settings_get_string (
+		shell_settings, "composer-spell-color");
+
+	buffer = g_string_new ("EWebViewGtkHTML {\n");
+
+	mail_config_web_view_gtkhtml_fix_color_string (citation_color);
+	mail_config_web_view_gtkhtml_fix_color_string (spell_color);
+
+	if (custom_fonts && variable_font != NULL)
+		g_string_append_printf (
+			buffer, "  font: %s;\n", variable_font);
+
+	if (custom_fonts && monospace_font != NULL)
+		g_string_append_printf (
+			buffer, "  -GtkHTML-fixed-font-name: '%s';\n",
+			monospace_font);
+
+	if (mark_citations && citation_color != NULL)
+		g_string_append_printf (
+			buffer, "  -GtkHTML-cite-color: %s;\n",
+			citation_color);
+
+	if (spell_color != NULL)
+		g_string_append_printf (
+			buffer, "  -GtkHTML-spell-error-color: %s;\n",
+			spell_color);
+
+	g_string_append (buffer, "}\n");
+
+	gtk_css_provider_load_from_data (
+		extension->priv->css_provider,
+		buffer->str, buffer->len, &error);
+
+	if (error != NULL) {
+		g_warning ("%s", error->message);
+		g_error_free (error);
+	}
+
+	g_string_free (buffer, TRUE);
+
+	g_free (monospace_font);
+	g_free (variable_font);
+	g_free (citation_color);
+	g_free (spell_color);
+
+	extensible = e_extension_get_extensible (E_EXTENSION (extension));
+	style_context = gtk_widget_get_style_context (GTK_WIDGET (extensible));
+	gtk_style_context_invalidate (style_context);
+}
+
+static void
+mail_config_web_view_gtkhtml_realize (GtkWidget *widget,
+                                      EMailConfigWebViewGtkHTML *extension)
+{
+	EShellSettings *shell_settings;
+
+	shell_settings = extension->priv->shell_settings;
+
+	g_object_bind_property (
+		shell_settings, "composer-inline-spelling",
+		widget, "inline-spelling",
+		G_BINDING_SYNC_CREATE);
+
+	g_object_bind_property (
+		shell_settings, "composer-magic-links",
+		widget, "magic-links",
+		G_BINDING_SYNC_CREATE);
+
+	g_object_bind_property (
+		shell_settings, "composer-magic-smileys",
+		widget, "magic-smileys",
+		G_BINDING_SYNC_CREATE);
+
+	gtk_style_context_add_provider (
+		gtk_widget_get_style_context (widget),
+		GTK_STYLE_PROVIDER (extension->priv->css_provider),
+		GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+	mail_config_web_view_gtkhtml_load_style (extension);
+
+	/* Reload the style sheet when certain settings change. */
+
+	g_signal_connect_swapped (
+		shell_settings, "notify::mail-use-custom-fonts",
+		G_CALLBACK (mail_config_web_view_gtkhtml_load_style),
+		extension);
+
+	g_signal_connect_swapped (
+		shell_settings, "notify::mail-font-monospace",
+		G_CALLBACK (mail_config_web_view_gtkhtml_load_style),
+		extension);
+
+	g_signal_connect_swapped (
+		shell_settings, "notify::mail-font-variable",
+		G_CALLBACK (mail_config_web_view_gtkhtml_load_style),
+		extension);
+
+	g_signal_connect_swapped (
+		shell_settings, "notify::mail-mark-citations",
+		G_CALLBACK (mail_config_web_view_gtkhtml_load_style),
+		extension);
+
+	g_signal_connect_swapped (
+		shell_settings, "notify::mail-citation-color",
+		G_CALLBACK (mail_config_web_view_gtkhtml_load_style),
+		extension);
+
+	g_signal_connect_swapped (
+		shell_settings, "notify::composer-spell-color",
+		G_CALLBACK (mail_config_web_view_gtkhtml_load_style),
+		extension);
+}
+
+static void
+mail_config_web_view_gtkhtml_dispose (GObject *object)
+{
+	EMailConfigWebViewGtkHTMLPrivate *priv;
+
+	priv = E_MAIL_CONFIG_WEB_VIEW_GTKHTML_GET_PRIVATE (object);
+
+	if (priv->css_provider != NULL) {
+		g_object_unref (priv->css_provider);
+		priv->css_provider = NULL;
+	}
+
+	if (priv->shell_settings != NULL) {
+		g_signal_handlers_disconnect_by_func (
+			priv->shell_settings,
+			mail_config_web_view_gtkhtml_load_style, object);
+		g_object_unref (priv->shell_settings);
+		priv->shell_settings = NULL;
+	}
+
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_mail_config_web_view_gtkhtml_parent_class)->
+		dispose (object);
+}
+
+static void
+mail_config_web_view_gtkhtml_constructed (GObject *object)
+{
+	EShell *shell;
+	EShellSettings *shell_settings;
+	EMailConfigWebViewGtkHTML *extension;
+	EExtensible *extensible;
+
+	shell = e_shell_get_default ();
+	shell_settings = e_shell_get_shell_settings (shell);
+
+	extension = (EMailConfigWebViewGtkHTML *) object;
+	extensible = e_extension_get_extensible (E_EXTENSION (extension));
+
+	extension->priv->css_provider = gtk_css_provider_new ();
+	extension->priv->shell_settings = g_object_ref (shell_settings);
+
+	/* Wait to bind shell settings until the EWebView is realized
+	 * so GtkhtmlEditor has a chance to install a GtkHTMLEditorAPI.
+	 * Otherwise our settings will have no effect. */
+
+	g_signal_connect (
+		extensible, "realize",
+		G_CALLBACK (mail_config_web_view_gtkhtml_realize), extension);
+
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_mail_config_web_view_gtkhtml_parent_class)->
+		constructed (object);
+}
+
+static void
+e_mail_config_web_view_gtkhtml_class_init (EMailConfigWebViewGtkHTMLClass *class)
+{
+	GObjectClass *object_class;
+	EExtensionClass *extension_class;
+
+	g_type_class_add_private (
+		class, sizeof (EMailConfigWebViewGtkHTMLPrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->dispose = mail_config_web_view_gtkhtml_dispose;
+	object_class->constructed = mail_config_web_view_gtkhtml_constructed;
+
+	extension_class = E_EXTENSION_CLASS (class);
+	extension_class->extensible_type = E_TYPE_WEB_VIEW_GTKHTML;
+}
+
+static void
+e_mail_config_web_view_gtkhtml_class_finalize (EMailConfigWebViewGtkHTMLClass *class)
+{
+}
+
+static void
+e_mail_config_web_view_gtkhtml_init (EMailConfigWebViewGtkHTML *extension)
+{
+	extension->priv =
+		E_MAIL_CONFIG_WEB_VIEW_GTKHTML_GET_PRIVATE (extension);
+}
+
+void
+e_mail_config_web_view_gtkhtml_type_register (GTypeModule *type_module)
+{
+	/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
+	 *     function, so we have to wrap it with a public function in
+	 *     order to register types from a separate compilation unit. */
+	e_mail_config_web_view_gtkhtml_register_type (type_module);
+}
+
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 0000000..7391aa8
--- /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 <http://www.gnu.org/licenses/>
+ *
+ */
+
+#ifndef E_MAIL_CONFIG_WEB_VIEW_GTKHTML_H
+#define E_MAIL_CONFIG_WEB_VIEW_GTKHTML_H
+
+#include <libebackend/libebackend.h>
+
+/* 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 */
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index aec9832..7a5bc4d 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -33,8 +33,7 @@
 	((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW, EMailConfigWebViewPrivate))
 
 struct _EMailConfigWebViewPrivate {
-	GtkCssProvider *css_provider;
-	EShellSettings *shell_settings;
+	gint placeholder;
 };
 
 G_DEFINE_DYNAMIC_TYPE (
@@ -42,233 +41,34 @@ G_DEFINE_DYNAMIC_TYPE (
 	e_mail_config_web_view,
 	E_TYPE_EXTENSION)
 
-/* replaces content of color string */
 static void
-fix_color_string (gchar *color_string)
-{
-	GdkColor color;
-
-	if (!color_string || strlen (color_string) < 13)
-		return;
-
-	if (!gdk_color_parse (color_string, &color))
-		return;
-
-	sprintf (
-		color_string, "#%02x%02x%02x",
-		(gint) color.red * 256 / 65536,
-		(gint) color.green * 256 / 65536,
-		(gint) color.blue * 256 / 65536);
-}
-
-static void
-mail_config_web_view_load_style (EMailConfigWebView *extension)
+mail_config_web_view_constructed (GObject *object)
 {
-	GString *buffer;
-	gchar *citation_color;
-	gchar *monospace_font;
-	gchar *spell_color;
-	gchar *variable_font;
-	gboolean custom_fonts;
-	gboolean mark_citations;
-	EExtensible *extensible;
+	EShell *shell;
 	EShellSettings *shell_settings;
-	GtkStyleContext *style_context;
-	GError *error = NULL;
-
-	/* Some of our mail and composer preferences are passed down to
-	 * GtkHtml through style properties, unfortunately.  This builds
-	 * a style sheet for the EWebView using values from GSettings. */
-
-	shell_settings = extension->priv->shell_settings;
-
-	custom_fonts = e_shell_settings_get_boolean (
-		shell_settings, "mail-use-custom-fonts");
-
-	monospace_font = e_shell_settings_get_string (
-		shell_settings, "mail-font-monospace");
-
-	variable_font = e_shell_settings_get_string (
-		shell_settings, "mail-font-variable");
-
-	mark_citations = e_shell_settings_get_boolean (
-		shell_settings, "mail-mark-citations");
-
-	citation_color = e_shell_settings_get_string (
-		shell_settings, "mail-citation-color");
-
-	spell_color = e_shell_settings_get_string (
-		shell_settings, "composer-spell-color");
-
-	buffer = g_string_new ("EWebView {\n");
-
-	fix_color_string (citation_color);
-	fix_color_string (spell_color);
-
-	if (custom_fonts && variable_font != NULL)
-		g_string_append_printf (
-			buffer, "  font: %s;\n", variable_font);
-
-	if (custom_fonts && monospace_font != NULL)
-		g_string_append_printf (
-			buffer, "  -GtkHTML-fixed-font-name: '%s';\n",
-			monospace_font);
-
-	if (mark_citations && citation_color != NULL)
-		g_string_append_printf (
-			buffer, "  -GtkHTML-cite-color: %s;\n",
-			citation_color);
-
-	if (spell_color != NULL)
-		g_string_append_printf (
-			buffer, "  -GtkHTML-spell-error-color: %s;\n",
-			spell_color);
-
-	g_string_append (buffer, "}\n");
-
-	gtk_css_provider_load_from_data (
-		extension->priv->css_provider,
-		buffer->str, buffer->len, &error);
-
-	if (error != NULL) {
-		g_warning ("%s", error->message);
-		g_error_free (error);
-	}
-
-	g_string_free (buffer, TRUE);
-
-	g_free (monospace_font);
-	g_free (variable_font);
-	g_free (citation_color);
-	g_free (spell_color);
-
-	extensible = e_extension_get_extensible (E_EXTENSION (extension));
-	style_context = gtk_widget_get_style_context (GTK_WIDGET (extensible));
-	gtk_style_context_invalidate (style_context);
-}
+	EExtensible *extensible;
 
-static void
-mail_config_web_view_realize (GtkWidget *widget,
-                              EMailConfigWebView *extension)
-{
-	EShellSettings *shell_settings;
+	shell = e_shell_get_default ();
+	shell_settings = e_shell_get_shell_settings (shell);
 
-	shell_settings = extension->priv->shell_settings;
+	extensible = e_extension_get_extensible (E_EXTENSION (object));
 
 	g_object_bind_property (
-		shell_settings,
-		"composer-inline-spelling",
-		widget, "inline-spelling",
+		shell_settings, "composer-inline-spelling",
+		extensible, "inline-spelling",
 		G_BINDING_SYNC_CREATE);
 
 	g_object_bind_property (
-		shell_settings,
-		"composer-magic-links",
-		widget, "magic-links",
+		shell_settings, "composer-magic-links",
+		extensible, "magic-links",
 		G_BINDING_SYNC_CREATE);
 
 	g_object_bind_property (
-		shell_settings,
-		"composer-magic-smileys",
-		widget, "magic-smileys",
+		shell_settings, "composer-magic-smileys",
+		extensible, "magic-smileys",
 		G_BINDING_SYNC_CREATE);
 
-	gtk_style_context_add_provider (
-		gtk_widget_get_style_context (widget),
-		GTK_STYLE_PROVIDER (extension->priv->css_provider),
-		GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-
-	mail_config_web_view_load_style (extension);
-
-	/* Reload the style sheet when certain settings change. */
-
-	g_signal_connect_swapped (
-		shell_settings,
-		"notify::mail-use-custom-fonts",
-		G_CALLBACK (mail_config_web_view_load_style),
-		extension);
-
-	g_signal_connect_swapped (
-		shell_settings,
-		"notify::mail-font-monospace",
-		G_CALLBACK (mail_config_web_view_load_style),
-		extension);
-
-	g_signal_connect_swapped (
-		shell_settings,
-		"notify::mail-font-variable",
-		G_CALLBACK (mail_config_web_view_load_style),
-		extension);
-
-	g_signal_connect_swapped (
-		shell_settings,
-		"notify::mail-mark-citations",
-		G_CALLBACK (mail_config_web_view_load_style),
-		extension);
-
-	g_signal_connect_swapped (
-		shell_settings,
-		"notify::mail-citation-color",
-		G_CALLBACK (mail_config_web_view_load_style),
-		extension);
-
-	g_signal_connect_swapped (
-		shell_settings,
-		"notify::composer-spell-color",
-		G_CALLBACK (mail_config_web_view_load_style),
-		extension);
-}
-
-static void
-mail_config_web_view_dispose (GObject *object)
-{
-	EMailConfigWebViewPrivate *priv;
-
-	priv = E_MAIL_CONFIG_WEB_VIEW_GET_PRIVATE (object);
-
-	if (priv->css_provider != NULL) {
-		g_object_unref (priv->css_provider);
-		priv->css_provider = NULL;
-	}
-
-	if (priv->shell_settings != NULL) {
-		g_signal_handlers_disconnect_by_func (
-			priv->shell_settings,
-			mail_config_web_view_load_style, object);
-		g_object_unref (priv->shell_settings);
-		priv->shell_settings = NULL;
-	}
-
-	/* Chain up to parent's dispose() method. */
-	G_OBJECT_CLASS (e_mail_config_web_view_parent_class)->dispose (object);
-}
-
-static void
-mail_config_web_view_constructed (GObject *object)
-{
-	EShell *shell;
-	EShellSettings *shell_settings;
-	EMailConfigWebView *extension;
-	EExtensible *extensible;
-
-	shell = e_shell_get_default ();
-	shell_settings = e_shell_get_shell_settings (shell);
-
-	extension = (EMailConfigWebView *) object;
-	extensible = e_extension_get_extensible (E_EXTENSION (extension));
-
-	extension->priv->css_provider = gtk_css_provider_new ();
-	extension->priv->shell_settings = g_object_ref (shell_settings);
-
-	/* Wait to bind shell settings until the EWebView is realized
-	 * so GtkhtmlEditor has a chance to install a GtkHTMLEditorAPI.
-	 * Otherwise our settings will have no effect. */
-
-	g_signal_connect (
-		extensible, "realize",
-		G_CALLBACK (mail_config_web_view_realize), extension);
-
-	/* Chain up to parent's consturcted() method. */
+	/* Chain up to parent's constructed() method. */
 	G_OBJECT_CLASS (e_mail_config_web_view_parent_class)->
 		constructed (object);
 }
@@ -282,7 +82,6 @@ e_mail_config_web_view_class_init (EMailConfigWebViewClass *class)
 	g_type_class_add_private (class, sizeof (EMailConfigWebViewPrivate));
 
 	object_class = G_OBJECT_CLASS (class);
-	object_class->dispose = mail_config_web_view_dispose;
 	object_class->constructed = mail_config_web_view_constructed;
 
 	extension_class = E_EXTENSION_CLASS (class);
diff --git a/modules/mail/evolution-module-mail.c b/modules/mail/evolution-module-mail.c
index 91a2501..d3e065e 100644
--- a/modules/mail/evolution-module-mail.c
+++ b/modules/mail/evolution-module-mail.c
@@ -36,6 +36,7 @@
 #include "e-mail-config-format-html.h"
 #include "e-mail-config-reader.h"
 #include "e-mail-config-web-view.h"
+#include "e-mail-config-web-view-gtkhtml.h"
 
 #include "em-account-prefs.h"
 
@@ -62,6 +63,7 @@ e_module_load (GTypeModule *type_module)
 	e_mail_config_format_html_type_register (type_module);
 	e_mail_config_reader_type_register (type_module);
 	e_mail_config_web_view_type_register (type_module);
+	e_mail_config_web_view_gtkhtml_type_register (type_module);
 
 	em_account_prefs_type_register (type_module);
 }