From 9b4b5c6598cfac2e6436530c75bfe95b617d7ec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Crozat?= <fcrozat@src.gnome.org>
Date: Mon, 30 Jul 2001 14:22:50 +0000
Subject: Fix support for gtkhtml when compiled with gconf support

svn path=/trunk/; revision=11473
---
 addressbook/ChangeLog                           | 5 +++++
 addressbook/gui/component/addressbook-factory.c | 8 ++++++++
 2 files changed, 13 insertions(+)

(limited to 'addressbook')

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 85c34066df..f3e8185e30 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-30  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* addressbook/gui/component/addressbook-factory.c: Fix crashes
+	when gtkhtml is compiled with gconf support
+
 2001-07-27  JP Rosevear  <jpr@ximian.com>
 
 	* conduit/Makefile.am: Tidy ldadds
diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c
index b4012f4223..6a5e79066a 100644
--- a/addressbook/gui/component/addressbook-factory.c
+++ b/addressbook/gui/component/addressbook-factory.c
@@ -18,6 +18,10 @@
 #include <glade/glade.h>
 #include <gal/widgets/e-cursors.h>
 
+#ifdef GTKHTML_HAVE_GCONF
+#include <gconf/gconf.h>
+#endif
+
 #include "addressbook.h"
 #include "addressbook-component.h"
 #include "e-address-widget.h"
@@ -41,6 +45,10 @@ init_bonobo (int argc, char **argv)
 	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
 		g_error (_("Could not initialize Bonobo"));
 
+#ifdef GTKHTML_HAVE_GCONF
+	gconf_init (argc, argv, NULL);
+#endif
+
 	glade_gnome_init ();
 }
 
-- 
cgit v1.2.3