From 0cf607076dfc2c481ca1164a04cecdb0661e6bd0 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 26 May 2009 10:58:25 -0400
Subject: Fix compiler warnings in mail.

---
 mail/importers/Makefile.am     | 2 --
 mail/importers/mail-importer.h | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'mail/importers')

diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 25b5648949..9029d705a0 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -8,8 +8,6 @@ INCLUDES = -I.. 					\
 	-I$(srcdir)/..					\
 	-I$(top_srcdir)					\
 	-DG_LOG_DOMAIN=\"evolution-mail-importer\"	\
-	-I$(top_srcdir)/addressbook/backend             \
-	-I$(top_builddir)/addressbook/backend           \
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	$(IMPORTERS_CFLAGS)
 
diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h
index 4144deba98..c01c3ab51f 100644
--- a/mail/importers/mail-importer.h
+++ b/mail/importers/mail-importer.h
@@ -85,7 +85,7 @@ int mail_importer_import_mbox(const char *path, const char *folderuri, struct _C
 void mail_importer_import_mbox_sync(const char *path, const char *folderuri, struct _CamelOperation *cancel);
 
 struct _MailImporterSpecial {
-	char *orig, *new;
+	const gchar *orig, *new;
 };
 typedef struct _MailImporterSpecial MailImporterSpecial;
 
-- 
cgit