From f273b40d5edeb4da6408c265097c44d70ae861eb Mon Sep 17 00:00:00 2001
From: Peter Williams <peterw@src.gnome.org>
Date: Thu, 3 Aug 2000 17:06:28 +0000
Subject: Work with GtkHTML if it uses gconf

svn path=/trunk/; revision=4507
---
 mail/main.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'mail/main.c')

diff --git a/mail/main.c b/mail/main.c
index 93f118da5f..f1cc59b384 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -12,9 +12,10 @@
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-object-directory.h>
 #include <glade/glade.h>
-/*#include <gconf/gconf.h>*/
 #include <liboaf/liboaf.h>
-
+#ifdef GTKHTML_HAVE_GCONF
+#include <gconf/gconf.h>
+#endif
 #include "e-util/e-gui-utils.h"
 #include "e-util/e-cursors.h"
 
@@ -44,8 +45,9 @@ main (int argc, char *argv [])
 			 "Bonobo against GOAD instead of OAF.");
 	}
 
-	/*gconf_init (argc, argv, NULL);*/
-
+#ifdef GTKHTML_HAVE_GCONF
+	gconf_init (argc, argv, NULL);
+#endif
 	glade_gnome_init ();
 
 	session_init ();
-- 
cgit v1.2.3