aboutsummaryrefslogtreecommitdiffstats
path: root/importers
diff options
context:
space:
mode:
Diffstat (limited to 'importers')
-rw-r--r--importers/ChangeLog9
-rw-r--r--importers/Makefile.am3
-rw-r--r--importers/evolution-gnomecard-importer.c2
-rw-r--r--importers/pine-importer.c4
4 files changed, 14 insertions, 4 deletions
diff --git a/importers/ChangeLog b/importers/ChangeLog
index c5c2b12994..edaf35c0ea 100644
--- a/importers/ChangeLog
+++ b/importers/ChangeLog
@@ -1,3 +1,12 @@
+2002-07-08 Peter Williams <peterw@ximian.com>
+
+ * Makefile.am: Fix cflags to get at ebook headers correctly.
+
+ * pine-importer.c: Fix include lines to get ebook headers the "right"
+ way.
+
+ * evolution-gnomecard-importer.c: Same.
+
2002-05-27 Iain Holmes <iain@ximian.com>
* netscape-importer.c: Apply patch from Christian to fix a typo.
diff --git a/importers/Makefile.am b/importers/Makefile.am
index 8ba389df41..3df473c6d4 100644
--- a/importers/Makefile.am
+++ b/importers/Makefile.am
@@ -10,7 +10,8 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/shell \
-I$(top_srcdir)/shell \
- -I$(top_srcdir)/addressbook/backend/ebook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
$(IMPORTERS_CFLAGS)
IDLS = \
diff --git a/importers/evolution-gnomecard-importer.c b/importers/evolution-gnomecard-importer.c
index e910a10426..d4cc1244f6 100644
--- a/importers/evolution-gnomecard-importer.c
+++ b/importers/evolution-gnomecard-importer.c
@@ -34,7 +34,7 @@
#include <bonobo/bonobo-moniker-util.h>
#include <bonobo-conf/bonobo-config-database.h>
-#include <e-book.h>
+#include <ebook/e-book.h>
#include <importer/evolution-intelligent-importer.h>
#include <importer/GNOME_Evolution_Importer.h>
diff --git a/importers/pine-importer.c b/importers/pine-importer.c
index f2c812ddca..8ef539409d 100644
--- a/importers/pine-importer.c
+++ b/importers/pine-importer.c
@@ -48,8 +48,8 @@
#include <importer/evolution-importer-client.h>
#include <importer/GNOME_Evolution_Importer.h>
-#include <e-book.h>
-#include <e-card-simple.h>
+#include <ebook/e-book.h>
+#include <ebook/e-card-simple.h>
#define PINE_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Pine_Intelligent_Importer_Factory"
#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer"