aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/component/addressbook-factory.c8
-rw-r--r--shell/ChangeLog9
-rw-r--r--shell/Makefile.am1
-rw-r--r--shell/main.c8
5 files changed, 31 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 ();
}
diff --git a/shell/ChangeLog b/shell/ChangeLog
index b67c9ac737..8218f18693 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,12 @@
+2001-07-30 Frederic Crozat <fcrozat@mandrakesoft.com>
+
+ * main.c (main): call gconf_init if gtkhtml is compiled with gconf
+ support.
+
+ * Makefile.am (INCLUDES): add $(GTKHTML_CFLAGS) since we might
+ need to link with GConf (if gtkhtml is compiled with GConf
+ support)
+
2001-07-26 Ettore Perazzoli <ettore@ximian.com>
* evolution-activity-client.c (impl_destroy): Remove the source
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 4785fdae6e..9ec35f1c48 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -7,6 +7,7 @@ INCLUDES = -O \
$(BONOBO_GNOME_CFLAGS) \
$(BONOBO_CONF_CFLAGS) \
$(EXTRA_GNOME_CFLAGS) \
+ $(GTKHTML_CFLAGS) \
-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
diff --git a/shell/main.c b/shell/main.c
index 661c3784b8..45add1d1f9 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -37,6 +37,10 @@
#include <glade/glade.h>
#include <liboaf/liboaf.h>
+#ifdef GTKHTML_HAVE_GCONF
+#include <gconf/gconf.h>
+#endif
+
#include <gal/widgets/e-gui-utils.h>
#include <gal/widgets/e-cursors.h>
#include "e-setup.h"
@@ -237,6 +241,10 @@ main (int argc, char **argv)
oaf_init (argc, argv);
+#ifdef GTKHTML_HAVE_GCONF
+ gconf_init (argc, argv, NULL);
+#endif
+
glade_gnome_init ();
e_cursors_init ();