Add a "settings" module.

Collect all the "config" extensions from the "addressbook", "calendar",
and "mail" modules into one place.  These extensions typically just bind
GObject properties of extensible classes to app-specific GSettings keys.

10 files changed, 0 insertions, 1039 deletions

diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index 0e78ab7969..bbf8366cfb 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -15,16 +15,8 @@ module_mail_la_SOURCES = \
 	evolution-module-mail.c						\
 	e-mail-attachment-handler.c					\
 	e-mail-attachment-handler.h					\
-	e-mail-config-format-html.c					\
-	e-mail-config-format-html.h					\
 	e-mail-config-hook.c						\
 	e-mail-config-hook.h						\
-	e-mail-config-reader.c						\
-	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						\
@@ -58,7 +50,6 @@ module_mail_la_LIBADD = \
 	$(top_builddir)/composer/libcomposer.la				\
 	$(top_builddir)/mail/libevolution-mail.la			\
 	$(top_builddir)/mail/importers/libevolution-mail-importers.la	\
-	$(top_builddir)/em-format/libemformat.la			\
 	$(libevolution_mail_settings_la)				\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)						\
diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c
deleted file mode 100644
index d2df6b9c42..0000000000
--- a/modules/mail/e-mail-config-format-html.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * e-mail-config-format-html.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 "e-mail-config-format-html.h"
-
-#include <shell/e-shell.h>
-#include <e-util/e-util.h>
-#include <em-format/e-mail-formatter.h>
-#include <mail/e-mail-reader-utils.h>
-
-#define E_MAIL_CONFIG_FORMAT_HTML_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_MAIL_CONFIG_FORMAT_HTML, EMailConfigFormatHTMLPrivate))
-
-struct _EMailConfigFormatHTMLPrivate {
-	GSettings *settings;
-	gulong headers_changed_id;
-};
-
-G_DEFINE_DYNAMIC_TYPE (
-	EMailConfigFormatHTML,
-	e_mail_config_format_html,
-	E_TYPE_EXTENSION)
-
-static EMailFormatter *
-mail_config_format_html_get_formatter (EMailConfigFormatHTML *extension)
-{
-	EExtensible *extensible;
-
-	extensible = e_extension_get_extensible (E_EXTENSION (extension));
-
-	return E_MAIL_FORMATTER (extensible);
-}
-
-static void
-mail_config_format_html_headers_changed_cb (GSettings *settings,
-                                            const gchar *key,
-                                            EMailConfigFormatHTML *extension)
-{
-	EMailFormatter *formatter;
-	gchar **headers;
-	gint ii;
-
-	formatter = mail_config_format_html_get_formatter (extension);
-
-	headers = g_settings_get_strv (settings, "headers");
-
-	e_mail_formatter_clear_headers (formatter);
-	for (ii = 0; headers && headers[ii]; ii++) {
-		EMailReaderHeader *h;
-		const gchar *xml = headers[ii];
-
-		h = e_mail_reader_header_from_xml (xml);
-		if (h && h->enabled)
-			e_mail_formatter_add_header (
-				formatter, h->name, NULL,
-				E_MAIL_FORMATTER_HEADER_FLAG_BOLD);
-
-		e_mail_reader_header_free (h);
-	}
-
-	if (!headers || !headers[0])
-		e_mail_formatter_set_default_headers (formatter);
-
-	g_strfreev (headers);
-}
-
-static void
-mail_config_format_html_dispose (GObject *object)
-{
-	EMailConfigFormatHTMLPrivate *priv;
-
-	priv = E_MAIL_CONFIG_FORMAT_HTML_GET_PRIVATE (object);
-
-	if (priv->settings != NULL) {
-		g_signal_handler_disconnect (
-			priv->settings,
-			priv->headers_changed_id);
-		g_object_unref (priv->settings);
-		priv->settings = NULL;
-	}
-
-	/* Chain up to parent's dispose() method. */
-	G_OBJECT_CLASS (e_mail_config_format_html_parent_class)->
-		dispose (object);
-}
-
-static void
-mail_config_format_html_constructed (GObject *object)
-{
-	EMailConfigFormatHTML *extension;
-	EMailFormatter *formatter;
-	EShellSettings *shell_settings;
-	EShell *shell;
-
-	extension = E_MAIL_CONFIG_FORMAT_HTML (object);
-	formatter = mail_config_format_html_get_formatter (extension);
-
-	shell = e_shell_get_default ();
-	shell_settings = e_shell_get_shell_settings (shell);
-
-	g_object_bind_property_full (
-		shell_settings, "mail-citation-color",
-		formatter, "citation-color",
-		G_BINDING_SYNC_CREATE,
-		e_binding_transform_string_to_color,
-		NULL, NULL, (GDestroyNotify) NULL);
-
-	g_object_bind_property (
-		shell_settings, "mail-mark-citations",
-		formatter, "mark-citations",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "mail-image-loading-policy",
-		formatter, "image-loading-policy",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "mail-only-local-photos",
-		formatter, "only-local-photos",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "mail-show-sender-photo",
-		formatter, "show-sender-photo",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "mail-show-real-date",
-		formatter, "show-real-date",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "mail-show-animated-images",
-		formatter, "animate-images",
-		G_BINDING_SYNC_CREATE);
-
-	extension->priv->headers_changed_id = g_signal_connect (
-		extension->priv->settings, "changed::headers",
-		G_CALLBACK (mail_config_format_html_headers_changed_cb),
-		extension);
-
-	/* Initial synchronization */
-	mail_config_format_html_headers_changed_cb (
-		extension->priv->settings, NULL, extension);
-
-	/* Chain up to parent's constructed() method. */
-	G_OBJECT_CLASS (e_mail_config_format_html_parent_class)->
-		constructed (object);
-}
-
-static void
-e_mail_config_format_html_class_init (EMailConfigFormatHTMLClass *class)
-{
-	GObjectClass *object_class;
-	EExtensionClass *extension_class;
-
-	g_type_class_add_private (
-		class, sizeof (EMailConfigFormatHTMLPrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->dispose = mail_config_format_html_dispose;
-	object_class->constructed = mail_config_format_html_constructed;
-
-	extension_class = E_EXTENSION_CLASS (class);
-	extension_class->extensible_type = E_TYPE_MAIL_FORMATTER;
-}
-
-static void
-e_mail_config_format_html_class_finalize (EMailConfigFormatHTMLClass *class)
-{
-}
-
-static void
-e_mail_config_format_html_init (EMailConfigFormatHTML *extension)
-{
-	extension->priv = E_MAIL_CONFIG_FORMAT_HTML_GET_PRIVATE (extension);
-
-	extension->priv->settings =
-		g_settings_new ("org.gnome.evolution.mail");
-}
-
-void
-e_mail_config_format_html_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_format_html_register_type (type_module);
-}
-
diff --git a/modules/mail/e-mail-config-format-html.h b/modules/mail/e-mail-config-format-html.h
deleted file mode 100644
index 09482108db..0000000000
--- a/modules/mail/e-mail-config-format-html.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * e-mail-config-format-html.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_FORMAT_HTML_H
-#define E_MAIL_CONFIG_FORMAT_HTML_H
-
-#include <libebackend/libebackend.h>
-
-/* Standard GObject macros */
-#define E_TYPE_MAIL_CONFIG_FORMAT_HTML \
-	(e_mail_config_format_html_get_type ())
-#define E_MAIL_CONFIG_FORMAT_HTML(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_MAIL_CONFIG_FORMAT_HTML, EMailConfigFormatHTML))
-#define E_MAIL_CONFIG_FORMAT_HTML_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_MAIL_CONFIG_FORMAT_HTML, EMailConfigFormatHTMLClass))
-#define E_IS_MAIL_CONFIG_FORMAT_HTML(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_MAIL_CONFIG_FORMAT_HTML))
-#define E_IS_MAIL_CONFIG_FORMAT_HTML_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_MAIL_CONFIG_FORMAT_HTML))
-#define E_MAIL_CONFIG_FORMAT_HTML_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_MAIL_CONFIG_FORMAT_HTML, EMailConfigFormatHTMLClass))
-
-G_BEGIN_DECLS
-
-typedef struct _EMailConfigFormatHTML EMailConfigFormatHTML;
-typedef struct _EMailConfigFormatHTMLClass EMailConfigFormatHTMLClass;
-typedef struct _EMailConfigFormatHTMLPrivate EMailConfigFormatHTMLPrivate;
-
-struct _EMailConfigFormatHTML {
-	EExtension parent;
-	EMailConfigFormatHTMLPrivate *priv;
-};
-
-struct _EMailConfigFormatHTMLClass {
-	EExtensionClass parent_class;
-};
-
-GType		e_mail_config_format_html_get_type
-						(void) G_GNUC_CONST;
-void		e_mail_config_format_html_type_register
-						(GTypeModule *type_module);
-
-G_END_DECLS
-
-#endif /* E_MAIL_CONFIG_FORMAT_HTML_H */
-
diff --git a/modules/mail/e-mail-config-reader.c b/modules/mail/e-mail-config-reader.c
deleted file mode 100644
index aacfbd956b..0000000000
--- a/modules/mail/e-mail-config-reader.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * e-mail-config-reader.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 "e-mail-config-reader.h"
-
-#include <shell/e-shell.h>
-#include <mail/e-mail-reader.h>
-
-#define E_MAIL_CONFIG_READER_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_MAIL_CONFIG_READER, EMailConfigReaderPrivate))
-
-struct _EMailConfigReaderPrivate {
-	gint placeholder;
-};
-
-G_DEFINE_DYNAMIC_TYPE (
-	EMailConfigReader,
-	e_mail_config_reader,
-	E_TYPE_EXTENSION)
-
-static gboolean
-mail_config_reader_idle_cb (EExtension *extension)
-{
-	EExtensible *extensible;
-	GtkActionGroup *action_group;
-	EShellSettings *shell_settings;
-	ESourceRegistry *registry;
-	ESource *source;
-	EShell *shell;
-
-	extensible = e_extension_get_extensible (extension);
-
-	shell = e_shell_get_default ();
-	registry = e_shell_get_registry (shell);
-	shell_settings = e_shell_get_shell_settings (shell);
-
-	g_object_bind_property (
-		shell_settings, "mail-forward-style",
-		extensible, "forward-style",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "mail-reply-style",
-		extensible, "reply-style",
-		G_BINDING_SYNC_CREATE);
-
-	action_group = e_mail_reader_get_action_group (
-		E_MAIL_READER (extensible),
-		E_MAIL_READER_ACTION_GROUP_SEARCH_FOLDERS);
-
-	source = e_source_registry_ref_source (registry, "vfolder");
-
-	g_object_bind_property (
-		source, "enabled",
-		action_group, "visible",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_unref (source);
-
-	return FALSE;
-}
-
-static void
-mail_config_reader_constructed (GObject *object)
-{
-	/* Bind properties to settings from an idle callback so the
-	 * EMailReader interface has a chance to be initialized first. */
-	g_idle_add_full (
-		G_PRIORITY_DEFAULT_IDLE,
-		(GSourceFunc) mail_config_reader_idle_cb,
-		g_object_ref (object),
-		(GDestroyNotify) g_object_unref);
-
-	/* Chain up to parent's constructed() method. */
-	G_OBJECT_CLASS (e_mail_config_reader_parent_class)->
-		constructed (object);
-}
-
-static void
-e_mail_config_reader_class_init (EMailConfigReaderClass *class)
-{
-	GObjectClass *object_class;
-	EExtensionClass *extension_class;
-
-	g_type_class_add_private (class, sizeof (EMailConfigReaderPrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->constructed = mail_config_reader_constructed;
-
-	extension_class = E_EXTENSION_CLASS (class);
-	extension_class->extensible_type = E_TYPE_MAIL_READER;
-}
-
-static void
-e_mail_config_reader_class_finalize (EMailConfigReaderClass *class)
-{
-}
-
-static void
-e_mail_config_reader_init (EMailConfigReader *extension)
-{
-	extension->priv = E_MAIL_CONFIG_READER_GET_PRIVATE (extension);
-}
-
-void
-e_mail_config_reader_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_reader_register_type (type_module);
-}
-
diff --git a/modules/mail/e-mail-config-reader.h b/modules/mail/e-mail-config-reader.h
deleted file mode 100644
index b808320ced..0000000000
--- a/modules/mail/e-mail-config-reader.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * e-mail-config-reader.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_READER_H
-#define E_MAIL_CONFIG_READER_H
-
-#include <libebackend/libebackend.h>
-
-/* Standard GObject macros */
-#define E_TYPE_MAIL_CONFIG_READER \
-	(e_mail_config_reader_get_type ())
-#define E_MAIL_CONFIG_READER(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_MAIL_CONFIG_READER, EMailConfigReader))
-#define E_MAIL_CONFIG_READER_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_MAIL_CONFIG_READER, EMailConfigReaderClass))
-#define E_IS_MAIL_CONFIG_READER(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_MAIL_CONFIG_READER))
-#define E_IS_MAIL_CONFIG_READER_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_MAIL_CONFIG_READER))
-#define E_MAIL_CONFIG_READER_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_MAIL_CONFIG_READER, EMailConfigReaderClass))
-
-G_BEGIN_DECLS
-
-typedef struct _EMailConfigReader EMailConfigReader;
-typedef struct _EMailConfigReaderClass EMailConfigReaderClass;
-typedef struct _EMailConfigReaderPrivate EMailConfigReaderPrivate;
-
-struct _EMailConfigReader {
-	EExtension parent;
-	EMailConfigReaderPrivate *priv;
-};
-
-struct _EMailConfigReaderClass {
-	EExtensionClass parent_class;
-};
-
-GType		e_mail_config_reader_get_type	(void) G_GNUC_CONST;
-void		e_mail_config_reader_type_register
-						(GTypeModule *type_module);
-
-G_END_DECLS
-
-#endif /* E_MAIL_CONFIG_READER_H */
-
diff --git a/modules/mail/e-mail-config-web-view-gtkhtml.c b/modules/mail/e-mail-config-web-view-gtkhtml.c
deleted file mode 100644
index 40360d4e48..0000000000
--- a/modules/mail/e-mail-config-web-view-gtkhtml.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * 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>
-
-#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
deleted file mode 100644
index 7391aa8628..0000000000
--- a/modules/mail/e-mail-config-web-view-gtkhtml.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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
deleted file mode 100644
index 5d2fb9296d..0000000000
--- a/modules/mail/e-mail-config-web-view.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * 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.h"
-
-#include <shell/e-shell.h>
-
-#define E_MAIL_CONFIG_WEB_VIEW_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW, EMailConfigWebViewPrivate))
-
-struct _EMailConfigWebViewPrivate {
-	gint placeholder;
-};
-
-G_DEFINE_DYNAMIC_TYPE (
-	EMailConfigWebView,
-	e_mail_config_web_view,
-	E_TYPE_EXTENSION)
-
-static void
-mail_config_web_view_constructed (GObject *object)
-{
-	EShell *shell;
-	EShellSettings *shell_settings;
-	EExtensible *extensible;
-
-	shell = e_shell_get_default ();
-	shell_settings = e_shell_get_shell_settings (shell);
-
-	extensible = e_extension_get_extensible (E_EXTENSION (object));
-
-	g_object_bind_property (
-		shell_settings, "composer-inline-spelling",
-		extensible, "inline-spelling",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "composer-magic-links",
-		extensible, "magic-links",
-		G_BINDING_SYNC_CREATE);
-
-	g_object_bind_property (
-		shell_settings, "composer-magic-smileys",
-		extensible, "magic-smileys",
-		G_BINDING_SYNC_CREATE);
-
-	/* Chain up to parent's constructed() method. */
-	G_OBJECT_CLASS (e_mail_config_web_view_parent_class)->
-		constructed (object);
-}
-
-static void
-e_mail_config_web_view_class_init (EMailConfigWebViewClass *class)
-{
-	GObjectClass *object_class;
-	EExtensionClass *extension_class;
-
-	g_type_class_add_private (class, sizeof (EMailConfigWebViewPrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->constructed = mail_config_web_view_constructed;
-
-	extension_class = E_EXTENSION_CLASS (class);
-	extension_class->extensible_type = E_TYPE_WEB_VIEW;
-}
-
-static void
-e_mail_config_web_view_class_finalize (EMailConfigWebViewClass *class)
-{
-}
-
-static void
-e_mail_config_web_view_init (EMailConfigWebView *extension)
-{
-	extension->priv = E_MAIL_CONFIG_WEB_VIEW_GET_PRIVATE (extension);
-}
-
-void
-e_mail_config_web_view_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_register_type (type_module);
-}
-
diff --git a/modules/mail/e-mail-config-web-view.h b/modules/mail/e-mail-config-web-view.h
deleted file mode 100644
index 873121a49c..0000000000
--- a/modules/mail/e-mail-config-web-view.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * e-mail-config-web-view.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_H
-#define E_MAIL_CONFIG_WEB_VIEW_H
-
-#include <libebackend/libebackend.h>
-
-/* Standard GObject macros */
-#define E_TYPE_MAIL_CONFIG_WEB_VIEW \
-	(e_mail_config_web_view_get_type ())
-#define E_MAIL_CONFIG_WEB_VIEW(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW, EMailConfigWebView))
-#define E_MAIL_CONFIG_WEB_VIEW_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_MAIL_CONFIG_WEB_VIEW, EMailConfigWebViewClass))
-#define E_IS_MAIL_CONFIG_WEB_VIEW(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW))
-#define E_IS_MAIL_CONFIG_WEB_VIEW_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_MAIL_CONFIG_WEB_VIEW))
-#define E_MAIL_CONFIG_WEB_VIEW_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW, EMailConfigWebViewClass))
-
-G_BEGIN_DECLS
-
-typedef struct _EMailConfigWebView EMailConfigWebView;
-typedef struct _EMailConfigWebViewClass EMailConfigWebViewClass;
-typedef struct _EMailConfigWebViewPrivate EMailConfigWebViewPrivate;
-
-struct _EMailConfigWebView {
-	EExtension parent;
-	EMailConfigWebViewPrivate *priv;
-};
-
-struct _EMailConfigWebViewClass {
-	EExtensionClass parent_class;
-};
-
-GType		e_mail_config_web_view_get_type	(void) G_GNUC_CONST;
-void		e_mail_config_web_view_type_register
-						(GTypeModule *type_module);
-
-G_END_DECLS
-
-#endif /* E_MAIL_CONFIG_WEB_VIEW_H */
diff --git a/modules/mail/evolution-module-mail.c b/modules/mail/evolution-module-mail.c
index fd2f5a3a58..fa2f14b2d2 100644
--- a/modules/mail/evolution-module-mail.c
+++ b/modules/mail/evolution-module-mail.c
@@ -33,11 +33,6 @@
 #include "e-mail-shell-sidebar.h"
 #include "e-mail-shell-view.h"
 
-#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"
 
 /* Module Entry Points */
@@ -60,11 +55,6 @@ e_module_load (GTypeModule *type_module)
 	e_mail_shell_sidebar_type_register (type_module);
 	e_mail_shell_view_register_type (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);
 }