aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-config.c8
2 files changed, 10 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 848a676a17..ea36a705a7 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-10 Larry Ewing <lewing@helixcode.com>
+
+ * mail-config.c (html_new): only set the default background color
+ if style is not NULL.
+
2000-05-09 Christopher James Lahey <clahey@helixcode.com>
* Makefile.am: Removed folder-browser-factory.h since it doesn't
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 9c68ea7931..a59af5dde6 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -69,9 +69,11 @@ html_new (gboolean white)
GTK_SIGNAL_FUNC (html_size_req), NULL);
gtk_html_set_editable (GTK_HTML (html), FALSE);
style = gtk_rc_get_style (html);
- gtk_html_set_default_background_color (GTK_HTML (html),
- white ? &style->white :
- &style->bg[0]);
+ if (style) {
+ gtk_html_set_default_background_color (GTK_HTML (html),
+ white ? &style->white :
+ &style->bg[0]);
+ }
gtk_widget_set_sensitive (html, FALSE);
scrolled = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),