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.

1 files changed, 14 insertions, 215 deletions

diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index aec9832cf2..7a5bc4da98 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);