From 8ba458e12ef5ca931ce4f70a97918227bebec4bd Mon Sep 17 00:00:00 2001
From: jacob berkman <jacob@ximian.com>
Date: Fri, 13 Jul 2001 17:19:50 +0000
Subject: [PATCH] initialize gconf if gtkhtml is gconf-enabled

2001-07-13  jacob berkman  <jacob@ximian.com>

	* main.c (main): initialize gconf if gtkhtml is gconf-enabled
---
 control-center/ChangeLog | 4 ++++
 control-center/main.c    | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/control-center/ChangeLog b/control-center/ChangeLog
index 8db6ca485..92d4051ac 100644
--- a/control-center/ChangeLog
+++ b/control-center/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-13  jacob berkman  <jacob@ximian.com>
+
+	* main.c (main): initialize gconf if gtkhtml is gconf-enabled
+
 2001-07-12  Bradford Hovinen  <hovinen@ximian.com>
 
 	* capplet-dir.c (capplet_activate): Fix position of capplet name
diff --git a/control-center/main.c b/control-center/main.c
index 5597488cb..0cfbbb52f 100644
--- a/control-center/main.c
+++ b/control-center/main.c
@@ -30,6 +30,10 @@
 
 #include <bonobo.h>
 
+#ifdef GTKHTML_HAVE_GCONF
+#include <gconf/gconf.h>
+#endif
+
 #include "capplet-dir.h"
 #include "capplet-dir-view.h"
 
@@ -51,6 +55,9 @@ main (int argc, char **argv)
 
 	gnomelib_register_popt_table (gnomecc_options, _("GNOME Control Center options"));
 	gnome_init ("control-center", VERSION, argc, argv);
+#ifdef GTKHTML_HAVE_GCONF
+	gconf_init (argc, argv, NULL);
+#endif
 	glade_gnome_init ();
 
 	orb = oaf_init (argc, argv);