diff options
| author | Frédéric Crozat <fcrozat@src.gnome.org> | 2001-07-30 22:22:50 +0800 |
|---|---|---|
| committer | Frédéric Crozat <fcrozat@src.gnome.org> | 2001-07-30 22:22:50 +0800 |
| commit | 9b4b5c6598cfac2e6436530c75bfe95b617d7ec7 (patch) | |
| tree | fa4a148eb132618bba21348b7071393f49917bb7 /addressbook | |
| parent | ca87e4cc43fa191f87cd2bf88e2447d40f54c244 (diff) | |
| download | gsoc2013-evolution-9b4b5c6598cfac2e6436530c75bfe95b617d7ec7.tar.gz gsoc2013-evolution-9b4b5c6598cfac2e6436530c75bfe95b617d7ec7.tar.zst gsoc2013-evolution-9b4b5c6598cfac2e6436530c75bfe95b617d7ec7.zip | |
Fix support for gtkhtml when compiled with gconf support
svn path=/trunk/; revision=11473
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 5 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-factory.c | 8 |
2 files changed, 13 insertions, 0 deletions
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 (); } |