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
This commit is contained in:
jacob berkman 2001-07-13 17:19:50 +00:00 committed by Jacob Berkman
parent 50d12d5f22
commit 8ba458e12e
2 changed files with 11 additions and 0 deletions

View file

@ -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

View file

@ -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);