aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Williams <peterw@src.gnome.org>2000-08-04 01:06:28 +0800
committerPeter Williams <peterw@src.gnome.org>2000-08-04 01:06:28 +0800
commitf273b40d5edeb4da6408c265097c44d70ae861eb (patch)
treec817b18506db531d65afcb9a3225db6e2d4456ee
parentbc9ac7db4c2046818cdc0769278c65e92039df75 (diff)
downloadgsoc2013-evolution-f273b40d5edeb4da6408c265097c44d70ae861eb.tar
gsoc2013-evolution-f273b40d5edeb4da6408c265097c44d70ae861eb.tar.gz
gsoc2013-evolution-f273b40d5edeb4da6408c265097c44d70ae861eb.tar.bz2
gsoc2013-evolution-f273b40d5edeb4da6408c265097c44d70ae861eb.tar.lz
gsoc2013-evolution-f273b40d5edeb4da6408c265097c44d70ae861eb.tar.xz
gsoc2013-evolution-f273b40d5edeb4da6408c265097c44d70ae861eb.tar.zst
gsoc2013-evolution-f273b40d5edeb4da6408c265097c44d70ae861eb.zip
Work with GtkHTML if it uses gconf
svn path=/trunk/; revision=4507
-rw-r--r--mail/Makefile.am2
-rw-r--r--mail/main.c10
2 files changed, 7 insertions, 5 deletions
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 7c4bbb08a3..5386741906 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -15,6 +15,7 @@ INCLUDES = \
$(GNOME_VFS_CFLAGS) \
$(UNICODE_CFLAGS) \
$(GCONF_CFLAGS) \
+ $(GTKHTML_CFLAGS) \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
@@ -60,7 +61,6 @@ evolution_mail_SOURCES = \
session.c \
mail.h
-
evolution_mail_LDADD = \
$(top_builddir)/shell/libeshell.a \
$(top_builddir)/composer/libcomposer.la \
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 ();