aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/Makefile.am5
-rw-r--r--mail/mail-tools.c2
-rw-r--r--mail/mail-vtrash.c2
4 files changed, 10 insertions, 7 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index dea9a29bff..9bc9d72992 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,13 @@
2001-02-22 Not Zed <NotZed@Ximian.com>
+ * Makefile.am (CAMEL_OBJS_EXTRA): Removed, no longer link with
+ libcamelvee.
+ (evolution_mail_LDADD): Ditto.
+
+ * mail-vtrash.c: Moved camel-vee-store header ot camel levle.
+
+ * mail-tools.c: Moved camel-vee-folder header to camel.
+
* mail-local.c (local_storage_new_folder_cb): started hack for
progress reporting, which is currently to the console.
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 57b5defac2..28def11cd0 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -39,10 +39,6 @@ EVOLUTION_MAIL_CORBA_GENERATED = \
Mail-skels.c \
Mail-stubs.c
-# FIXME Is there any way around having to do this?
-CAMEL_OBJS_EXTRA = \
- $(top_builddir)/camel/providers/vee/libcamelvee.la
-
evolution_mail_SOURCES = \
$(EVOLUTION_MAIL_CORBA_GENERATED) \
component-factory.c \
@@ -112,7 +108,6 @@ evolution_mail_LDADD = \
$(top_builddir)/shell/libeshell.a \
$(top_builddir)/composer/libcomposer.a \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
- $(CAMEL_OBJS_EXTRA) \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/e-util/ename/libename.la \
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 87a8872ffc..06efcd4a2f 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -29,7 +29,7 @@
#include <ctype.h>
#include <errno.h>
#include "camel/camel.h"
-#include "camel/providers/vee/camel-vee-folder.h"
+#include "camel/camel-vee-folder.h"
#include "mail-vfolder.h"
#include "mail-vtrash.h"
#include "filter/vfolder-rule.h"
diff --git a/mail/mail-vtrash.c b/mail/mail-vtrash.c
index 217a1f6eeb..134ce558f5 100644
--- a/mail/mail-vtrash.c
+++ b/mail/mail-vtrash.c
@@ -36,7 +36,7 @@
#include "mail-mt.h"
#include "camel/camel.h"
-#include "camel/providers/vee/camel-vee-store.h"
+#include "camel/camel-vee-store.h"
#include "filter/vfolder-rule.h"
#include "filter/filter-part.h"