From f8626b2845d8abb07cbe8be08ec600f8d7cab4ef Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 29 May 2010 23:39:55 -0400
Subject: Bug 619345 - GtkHTML color settings not being honored

Includes some minor code cleanups related to this investigation.
---
 em-format/em-format-quote.h |  1 -
 mail/mail-config.c          | 15 +--------------
 mail/mail-config.h          |  1 -
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/em-format/em-format-quote.h b/em-format/em-format-quote.h
index 100e59d0a8..5ea841cfdb 100644
--- a/em-format/em-format-quote.h
+++ b/em-format/em-format-quote.h
@@ -64,7 +64,6 @@ struct _EMFormatQuote {
 	guint32 flags;
 
 	guint32 text_html_flags;
-	guint32 citation_colour;
 };
 
 struct _EMFormatQuoteClass {
diff --git a/mail/mail-config.c b/mail/mail-config.c
index a9f1870cc2..ab58ce8673 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -118,11 +118,7 @@ config_write_style (void)
 
 	fprintf (rc, "}\n\n");
 
-	fprintf (rc, "widget \"*.EMFolderView.*.GtkHTML\" style \"evolution-mail-custom-fonts\"\n");
-	fprintf (rc, "widget \"*.EMFolderBrowser.*.GtkHTML\" style \"evolution-mail-custom-fonts\"\n");
-	fprintf (rc, "widget \"*.EMMessageBrowser.*.GtkHTML\" style \"evolution-mail-custom-fonts\"\n");
-	fprintf (rc, "widget \"EMsgComposer.*.GtkHTML\" style \"evolution-mail-custom-fonts\"\n");
-	fprintf (rc, "widget \"*.EvolutionMailPrintHTMLWidget\" style \"evolution-mail-custom-fonts\"\n");
+	fprintf (rc, "class \"EWebView\" style \"evolution-mail-custom-fonts\"\n");
 	fflush (rc);
 	fclose (rc);
 
@@ -229,13 +225,6 @@ gconf_int_value_changed (GConfClient *client,
 	}
 }
 
-void
-mail_config_clear (void)
-{
-	if (!config)
-		return;
-}
-
 void
 mail_config_write (void)
 {
@@ -620,8 +609,6 @@ mail_config_init (void)
 		mail_session_get_config_dir (),
 		"gtkrc-mail-fonts", NULL);
 
-	mail_config_clear ();
-
 	gtk_rc_parse (config->gtkrc);
 
 	/* Composer Configuration */
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 65dd861940..4b67fbd222 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -68,7 +68,6 @@ typedef enum {
 
 /* Configuration */
 void mail_config_init (void);
-void mail_config_clear (void);
 void mail_config_write (void);
 
 GConfClient *mail_config_get_gconf_client (void);
-- 
cgit v1.2.3