[evolution-mapi] Do not use deprecated EBook/ECal API

[Milan Crha <mcrha src gnome org>]

commit 7c02f11150a85846a8440a2d50889f5de8eccd7f
Author: Milan Crha <mcrha redhat com>
Date:   Tue Jun 14 08:57:11 2011 +0200

    Do not use deprecated EBook/ECal API

 configure.ac                                       |    6 ++----
 .../exchange-mapi-account-listener.c               |    2 +-
 .../exchange-mapi-account-setup.c                  |   12 ++++++------
 3 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bf07c1f..dac8fe1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,8 @@ AS_COMPILER_FLAGS(WARNING_FLAGS,
 	-DGTK_DISABLE_DEPRECATED
 	-DGNOME_DISABLE_DEPRECATED
 	-DGSEAL_ENABLE
+	-DE_BOOK_DISABLE_DEPRECATED
+	-DE_CAL_DISABLE_DEPRECATED
 	-Wall -Wextra
 	-Wno-missing-field-initializers
 	-Wno-sign-compare
@@ -72,10 +74,6 @@ AS_COMPILER_FLAGS(WARNING_FLAGS,
 	-Wundef -Wwrite-strings")
 AC_SUBST(WARNING_FLAGS)
 
-dnl Disable these later
-dnl	-DE_BOOK_DISABLE_DEPRECATED
-dnl	-DE_CAL_DISABLE_DEPRECATED
-dnl
 dnl Other useful compiler warnings for test builds only.
 dnl These may produce warnings we have no control over.
 dnl
diff --git a/src/account-setup-eplugin/exchange-mapi-account-listener.c b/src/account-setup-eplugin/exchange-mapi-account-listener.c
index 31e2db5..65e8c34 100644
--- a/src/account-setup-eplugin/exchange-mapi-account-listener.c
+++ b/src/account-setup-eplugin/exchange-mapi-account-listener.c
@@ -32,7 +32,7 @@
 #include <camel/camel.h>
 #include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-account.h>
-#include <libecal/e-cal.h>
+#include <libecal/e-cal-client.h>
 #include <libedataserver/e-account-list.h>
 #include <libedataserver/e-source.h>
 #include <libedataserver/e-source-list.h>
diff --git a/src/account-setup-eplugin/exchange-mapi-account-setup.c b/src/account-setup-eplugin/exchange-mapi-account-setup.c
index 088908f..c8dcf31 100644
--- a/src/account-setup-eplugin/exchange-mapi-account-setup.c
+++ b/src/account-setup-eplugin/exchange-mapi-account-setup.c
@@ -708,13 +708,13 @@ exchange_mapi_create_calendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 	ExchangeMAPIFolderType folder_type;
 
 	switch (t->source_type) {
-	case E_CAL_SOURCE_TYPE_EVENT:
+	case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
 		folder_type = MAPI_FOLDER_TYPE_APPOINTMENT;
 		break;
-	case E_CAL_SOURCE_TYPE_TODO:
+	case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
 		folder_type = MAPI_FOLDER_TYPE_TASK;
 		break;
-	case E_CAL_SOURCE_TYPE_JOURNAL:
+	case E_CAL_CLIENT_SOURCE_TYPE_MEMOS:
 		folder_type = MAPI_FOLDER_TYPE_MEMO;
 		break;
 	default:
@@ -861,13 +861,13 @@ exchange_mapi_cal_commit (EPlugin *epl, EConfigTarget *target)
 	g_free (uri_text);
 
 	switch (t->source_type) {
-		case E_CAL_SOURCE_TYPE_EVENT:
+		case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
 			type = olFolderCalendar;
 			break;
-		case E_CAL_SOURCE_TYPE_TODO:
+		case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
 			type = olFolderTasks;
 			break;
-		case E_CAL_SOURCE_TYPE_JOURNAL:
+		case E_CAL_CLIENT_SOURCE_TYPE_MEMOS:
 			type = olFolderNotes;
 			break;
 		default: