Bug 643507 - Font preferences don't work

2 files changed, 182 insertions, 113 deletions

diff --git a/mail/mail-config.c b/mail/mail-config.c
index 77204f7830..d1f87b9dd6 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -43,8 +43,6 @@
 #include "mail-tools.h"
 
 typedef struct {
-	gchar *gtkrc;
-
 	GSList *labels;
 
 	gboolean address_compress;
@@ -62,79 +60,6 @@ extern gint camel_header_param_encode_filenames_in_rfc_2047;
 static MailConfig *config = NULL;
 
 static void
-config_write_style (void)
-{
-	GConfClient *client;
-	gboolean custom;
-	gchar *fix_font;
-	gchar *var_font;
-	gchar *citation_color;
-	gchar *spell_color;
-	const gchar *key;
-	FILE *rc;
-
-	if (!(rc = g_fopen (config->gtkrc, "wt"))) {
-		g_warning ("unable to open %s", config->gtkrc);
-		return;
-	}
-
-	client = gconf_client_get_default ();
-
-	key = "/apps/evolution/mail/display/fonts/use_custom";
-	custom = gconf_client_get_bool (client, key, NULL);
-
-	key = "/apps/evolution/mail/display/fonts/variable";
-	var_font = gconf_client_get_string (client, key, NULL);
-
-	key = "/apps/evolution/mail/display/fonts/monospace";
-	fix_font = gconf_client_get_string (client, key, NULL);
-
-	key = "/apps/evolution/mail/display/citation_colour";
-	citation_color = gconf_client_get_string (client, key, NULL);
-
-	key = "/apps/evolution/mail/composer/spell_color";
-	spell_color = gconf_client_get_string (client, key, NULL);
-
-	fprintf (rc, "style \"evolution-mail-custom-fonts\" {\n");
-	fprintf (rc, "        GtkHTML::spell_error_color = \"%s\"\n", spell_color);
-	g_free (spell_color);
-
-	key = "/apps/evolution/mail/display/mark_citations";
-	if (gconf_client_get_bool (client, key, NULL))
-		fprintf (rc, "        GtkHTML::cite_color = \"%s\"\n",
-			 citation_color);
-	g_free (citation_color);
-
-	if (custom && var_font && fix_font) {
-		fprintf (rc,
-			 "        GtkHTML::fixed_font_name = \"%s\"\n"
-			 "        font_name = \"%s\"\n",
-			 fix_font, var_font);
-	}
-	g_free (fix_font);
-	g_free (var_font);
-
-	fprintf (rc, "}\n\n");
-
-	fprintf (rc, "class \"EWebView\" style \"evolution-mail-custom-fonts\"\n");
-	fflush (rc);
-	fclose (rc);
-
-	gtk_rc_reparse_all ();
-
-	g_object_unref (client);
-}
-
-static void
-gconf_style_changed (GConfClient *client,
-                     guint cnxn_id,
-                     GConfEntry *entry,
-                     gpointer user_data)
-{
-	config_write_style ();
-}
-
-static void
 gconf_outlook_filenames_changed (GConfClient *client,
                                  guint cnxn_id,
                                  GConfEntry *entry,
@@ -497,11 +422,6 @@ mail_config_init (EMailSession *session)
 		return;
 
 	config = g_new0 (MailConfig, 1);
-	config->gtkrc = g_build_filename (
-		mail_session_get_config_dir (),
-		"gtkrc-mail-fonts", NULL);
-
-	gtk_rc_parse (config->gtkrc);
 
 	client = gconf_client_get_default ();
 
@@ -515,10 +435,6 @@ mail_config_init (EMailSession *session)
 		client, "/apps/evolution/mail/composer",
 		GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 
-	key = "/apps/evolution/mail/composer/spell_color";
-	func = (GConfClientNotifyFunc) gconf_style_changed;
-	gconf_client_notify_add (client, key, func, NULL, NULL, NULL);
-
 	key = "/apps/evolution/mail/composer/outlook_filenames";
 	func = (GConfClientNotifyFunc) gconf_outlook_filenames_changed;
 	gconf_outlook_filenames_changed (client, 0, NULL, NULL);
@@ -544,24 +460,12 @@ mail_config_init (EMailSession *session)
 		&config->address_count, NULL, NULL);
 	config->address_count = gconf_client_get_int (client, key, NULL);
 
-	key = "/apps/evolution/mail/display/citation_colour";
-	func = (GConfClientNotifyFunc) gconf_style_changed;
-	gconf_client_notify_add (client, key, func, NULL, NULL, NULL);
-
-	key = "/apps/evolution/mail/display/mark_citations";
-	func = (GConfClientNotifyFunc) gconf_style_changed;
-	gconf_client_notify_add (client, key, func, NULL, NULL, NULL);
-
 	/* Font Configuration */
 
 	gconf_client_add_dir (
 		client, "/apps/evolution/mail/display/fonts",
 		GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 
-	key = "/apps/evolution/mail/display/fonts";
-	func = (GConfClientNotifyFunc) gconf_style_changed;
-	gconf_client_notify_add (client, key, func, NULL, NULL, NULL);
-
 	/* Junk Configuration */
 
 	gconf_client_add_dir (
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index 41b17efbad..d2c5ccf2cc 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -22,46 +22,208 @@
 #include <e-util/e-extension.h>
 #include <misc/e-web-view.h>
 
+typedef struct _EMailConfigWebView EMailConfigWebView;
+typedef struct _EMailConfigWebViewClass EMailConfigWebViewClass;
+
+struct _EMailConfigWebView {
+	EExtension parent;
+	GtkCssProvider *css_provider;
+	EShellSettings *shell_settings;
+};
+
+struct _EMailConfigWebViewClass {
+	EExtensionClass parent_class;
+};
+
 static gpointer parent_class;
 
 static void
-mail_config_web_view_realize (GtkWidget *widget)
+mail_config_web_view_load_style (EMailConfigWebView *extension)
 {
-	EShell *shell;
-	EShellSettings *shell_settings;
+	GString *buffer;
+	gchar *citation_color;
+	gchar *monospace_font;
+	gchar *spell_color;
+	gchar *variable_font;
+	gboolean custom_fonts;
+	gboolean mark_citations;
+	GError *error = NULL;
 
-	shell = e_shell_get_default ();
-	shell_settings = e_shell_get_shell_settings (shell);
+	/* 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 GConf. */
+
+	custom_fonts = e_shell_settings_get_boolean (
+		extension->shell_settings, "mail-use-custom-fonts");
+
+	monospace_font = e_shell_settings_get_string (
+		extension->shell_settings, "mail-font-monospace");
+
+	variable_font = e_shell_settings_get_string (
+		extension->shell_settings, "mail-font-variable");
+
+	mark_citations = e_shell_settings_get_boolean (
+		extension->shell_settings, "mail-mark-citations");
+
+	citation_color = e_shell_settings_get_string (
+		extension->shell_settings, "mail-citation-color");
+
+	spell_color = e_shell_settings_get_string (
+		extension->shell_settings, "composer-spell-color");
+
+	buffer = g_string_new ("EWebView {\n");
+
+	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->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);
+}
 
+static void
+mail_config_web_view_realize (GtkWidget *widget,
+                              EMailConfigWebView *extension)
+{
 	g_object_bind_property (
-		shell_settings, "mail-show-animated-images",
+		extension->shell_settings,
+		"mail-show-animated-images",
 		widget, "animate",
 		G_BINDING_SYNC_CREATE);
 
 	g_object_bind_property (
-		shell_settings, "composer-inline-spelling",
+		extension->shell_settings,
+		"composer-inline-spelling",
 		widget, "inline-spelling",
 		G_BINDING_SYNC_CREATE);
 
 	g_object_bind_property (
-		shell_settings, "composer-magic-links",
+		extension->shell_settings,
+		"composer-magic-links",
 		widget, "magic-links",
 		G_BINDING_SYNC_CREATE);
 
 	g_object_bind_property (
-		shell_settings, "composer-magic-smileys",
+		extension->shell_settings,
+		"composer-magic-smileys",
 		widget, "magic-smileys",
 		G_BINDING_SYNC_CREATE);
+
+	mail_config_web_view_load_style (extension);
+
+	gtk_style_context_add_provider (
+		gtk_widget_get_style_context (widget),
+		GTK_STYLE_PROVIDER (extension->css_provider),
+		GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+	/* Reload the style sheet when certain settings change. */
+
+	g_signal_connect_swapped (
+		extension->shell_settings,
+		"notify::mail-use-custom-fonts",
+		G_CALLBACK (mail_config_web_view_load_style),
+		extension);
+
+	g_signal_connect_swapped (
+		extension->shell_settings,
+		"notify::mail-font-monospace",
+		G_CALLBACK (mail_config_web_view_load_style),
+		extension);
+
+	g_signal_connect_swapped (
+		extension->shell_settings,
+		"notify::mail-font-variable",
+		G_CALLBACK (mail_config_web_view_load_style),
+		extension);
+
+	g_signal_connect_swapped (
+		extension->shell_settings,
+		"notify::mail-mark-citations",
+		G_CALLBACK (mail_config_web_view_load_style),
+		extension);
+
+	g_signal_connect_swapped (
+		extension->shell_settings,
+		"notify::mail-citation-color",
+		G_CALLBACK (mail_config_web_view_load_style),
+		extension);
+
+	g_signal_connect_swapped (
+		extension->shell_settings,
+		"notify::composer-spell-color",
+		G_CALLBACK (mail_config_web_view_load_style),
+		extension);
+}
+
+static void
+mail_config_web_view_dispose (GObject *object)
+{
+	EMailConfigWebView *extension;
+
+	extension = (EMailConfigWebView *) object;
+
+	if (extension->css_provider != NULL) {
+		g_object_unref (extension->css_provider);
+		extension->css_provider = NULL;
+	}
+
+	if (extension->shell_settings != NULL) {
+		g_signal_handlers_disconnect_by_func (
+			extension->shell_settings,
+			mail_config_web_view_load_style, object);
+		g_object_unref (extension->shell_settings);
+		extension->shell_settings = NULL;
+	}
+
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
 mail_config_web_view_constructed (GObject *object)
 {
-	EExtension *extension;
+	EShell *shell;
+	EShellSettings *shell_settings;
+	EMailConfigWebView *extension;
 	EExtensible *extensible;
 
-	extension = E_EXTENSION (object);
-	extensible = e_extension_get_extensible (extension);
+	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->css_provider = gtk_css_provider_new ();
+	extension->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.
@@ -69,36 +231,39 @@ mail_config_web_view_constructed (GObject *object)
 
 	g_signal_connect (
 		extensible, "realize",
-		G_CALLBACK (mail_config_web_view_realize), NULL);
+		G_CALLBACK (mail_config_web_view_realize), extension);
 
 	/* Chain up to parent's consturcted() method. */
 	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
-mail_config_web_view_class_init (EExtensionClass *class)
+mail_config_web_view_class_init (EMailConfigWebViewClass *class)
 {
 	GObjectClass *object_class;
+	EExtensionClass *extension_class;
 
 	parent_class = g_type_class_peek_parent (class);
 
 	object_class = G_OBJECT_CLASS (class);
+	object_class->dispose = mail_config_web_view_dispose;
 	object_class->constructed = mail_config_web_view_constructed;
 
-	class->extensible_type = E_TYPE_WEB_VIEW;
+	extension_class = E_EXTENSION_CLASS (class);
+	extension_class->extensible_type = E_TYPE_WEB_VIEW;
 }
 
 void
 e_mail_config_web_view_register_type (GTypeModule *type_module)
 {
 	static const GTypeInfo type_info = {
-		sizeof (EExtensionClass),
+		sizeof (EMailConfigWebViewClass),
 		(GBaseInitFunc) NULL,
 		(GBaseFinalizeFunc) NULL,
 		(GClassInitFunc) mail_config_web_view_class_init,
 		(GClassFinalizeFunc) NULL,
 		NULL,  /* class_data */
-		sizeof (EExtension),
+		sizeof (EMailConfigWebView),
 		0,     /* n_preallocs */
 		(GInstanceInitFunc) NULL,
 		NULL   /* value_table */