aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-05-30 11:39:55 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-05-30 11:39:55 +0800
commitf8626b2845d8abb07cbe8be08ec600f8d7cab4ef (patch)
tree5e74d552dbddb760a55291581d431c0f0b225eb7
parentda3b1942ea34514871a404b1530ff785d0e4e549 (diff)
downloadgsoc2013-evolution-f8626b2845d8abb07cbe8be08ec600f8d7cab4ef.tar.gz
gsoc2013-evolution-f8626b2845d8abb07cbe8be08ec600f8d7cab4ef.tar.zst
gsoc2013-evolution-f8626b2845d8abb07cbe8be08ec600f8d7cab4ef.zip
Bug 619345 - GtkHTML color settings not being honored
Includes some minor code cleanups related to this investigation.
-rw-r--r--em-format/em-format-quote.h1
-rw-r--r--mail/mail-config.c15
-rw-r--r--mail/mail-config.h1
3 files changed, 1 insertions, 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);
@@ -230,13 +226,6 @@ gconf_int_value_changed (GConfClient *client,
}
void
-mail_config_clear (void)
-{
- if (!config)
- return;
-}
-
-void
mail_config_write (void)
{
EAccountList *account_list;
@@ -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);