aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorFrédéric Crozat <fcrozat@src.gnome.org>2001-07-30 22:22:50 +0800
committerFrédéric Crozat <fcrozat@src.gnome.org>2001-07-30 22:22:50 +0800
commit9b4b5c6598cfac2e6436530c75bfe95b617d7ec7 (patch)
treefa4a148eb132618bba21348b7071393f49917bb7 /shell
parentca87e4cc43fa191f87cd2bf88e2447d40f54c244 (diff)
downloadgsoc2013-evolution-9b4b5c6598cfac2e6436530c75bfe95b617d7ec7.tar
gsoc2013-evolution-9b4b5c6598cfac2e6436530c75bfe95b617d7ec7.tar.gz
gsoc2013-evolution-9b4b5c6598cfac2e6436530c75bfe95b617d7ec7.tar.bz2
gsoc2013-evolution-9b4b5c6598cfac2e6436530c75bfe95b617d7ec7.tar.lz
gsoc2013-evolution-9b4b5c6598cfac2e6436530c75bfe95b617d7ec7.tar.xz
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 'shell')
-rw-r--r--shell/ChangeLog9
-rw-r--r--shell/Makefile.am1
-rw-r--r--shell/main.c8
3 files changed, 18 insertions, 0 deletions
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 ();