[evolution-mapi] camel/camel-i18n.h and other headers gone, adapt to it properly

[Milan Crha <mcrha src gnome org>]

commit aaaec435506c39d907e0ccf7c1f3fdf0e07a22b6
Author: Milan Crha <mcrha redhat com>
Date:   Thu Apr 1 12:57:14 2010 +0200

    camel/camel-i18n.h and other headers gone, adapt to it properly

 .../exchange-mapi-account-listener.c               |    2 +-
 src/camel/camel-mapi-notifications.c               |    2 +-
 src/camel/camel-mapi-provider.c                    |    2 +-
 src/camel/camel-mapi-store-summary.c               |    1 -
 src/camel/camel-mapi-store.c                       |    2 +-
 src/camel/camel-mapi-store.h                       |    3 ++-
 src/camel/camel-mapi-transport.c                   |    3 ++-
 src/camel/camel-mapi-utils.c                       |    3 ++-
 src/camel/camel-private.h                          |    1 -
 9 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/src/account-setup-eplugin/exchange-mapi-account-listener.c b/src/account-setup-eplugin/exchange-mapi-account-listener.c
index b243570..235b079 100644
--- a/src/account-setup-eplugin/exchange-mapi-account-listener.c
+++ b/src/account-setup-eplugin/exchange-mapi-account-listener.c
@@ -28,7 +28,7 @@
 #include "exchange-mapi-account-listener.h"
 #include "exchange-mapi-account-setup.h"
 #include <string.h>
-#include <camel/camel-i18n.h>
+#include <glib/gi18n.h>
 #include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-account.h>
 #include <libecal/e-cal.h>
diff --git a/src/camel/camel-mapi-notifications.c b/src/camel/camel-mapi-notifications.c
index f61bca8..58aac0d 100644
--- a/src/camel/camel-mapi-notifications.c
+++ b/src/camel/camel-mapi-notifications.c
@@ -31,11 +31,11 @@
 #include <errno.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 
 #include <camel/camel-private.h>
-#include <camel/camel-i18n.h>
 #include <camel/camel-net-utils.h>
 #include <camel/camel-debug.h>
 
diff --git a/src/camel/camel-mapi-provider.c b/src/camel/camel-mapi-provider.c
index c0945d1..e2c0d31 100644
--- a/src/camel/camel-mapi-provider.c
+++ b/src/camel/camel-mapi-provider.c
@@ -27,6 +27,7 @@
 
 #include <sys/types.h>
 #include <string.h>
+#include <glib/gi18n.h>
 
 #include <gmodule.h>
 
@@ -34,7 +35,6 @@
 #include <camel/camel-session.h>
 #include <camel/camel-url.h>
 #include <camel/camel-sasl.h>
-#include <camel/camel-i18n.h>
 
 #include "camel-mapi-store.h"
 #include "camel-mapi-transport.h"
diff --git a/src/camel/camel-mapi-store-summary.c b/src/camel/camel-mapi-store-summary.c
index 9cbcff5..8321da2 100644
--- a/src/camel/camel-mapi-store-summary.c
+++ b/src/camel/camel-mapi-store-summary.c
@@ -33,7 +33,6 @@
 #include <glib.h>
 
 #include <libedataserver/e-memory.h>
-#include <libedataserver/md5-utils.h>
 
 #include <camel/camel-file-utils.h>
 #include <camel/camel-utf8.h>
diff --git a/src/camel/camel-mapi-store.c b/src/camel/camel-mapi-store.c
index ee6a3ee..50efcfa 100644
--- a/src/camel/camel-mapi-store.c
+++ b/src/camel/camel-mapi-store.c
@@ -30,6 +30,7 @@
 #include <ctype.h>
 #include <errno.h>
 
+#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
 #include <camel/camel-sasl.h>
@@ -44,7 +45,6 @@
 #include <camel/camel-session.h>
 #include <camel/camel-service.h>
 #include <camel/camel-store-summary.h>
-#include <camel/camel-i18n.h>
 #include <camel/camel-net-utils.h>
 
 #include "camel-mapi-store.h"
diff --git a/src/camel/camel-mapi-store.h b/src/camel/camel-mapi-store.h
index c464703..2c96905 100644
--- a/src/camel/camel-mapi-store.h
+++ b/src/camel/camel-mapi-store.h
@@ -24,11 +24,12 @@
 #ifndef __CAMEL_MAPI_STORE_H__
 #define __CAMEL_MAPI_STORE_H__
 
+#include <glib/gi18n.h>
+
 #include <camel/camel-store.h>
 #include <camel/camel-offline-store.h>
 #include <camel-mapi-store-summary.h>
 #include <camel/camel-net-utils.h>
-#include <camel/camel-i18n.h>
 
 #include <exchange-mapi-folder.h>
 
diff --git a/src/camel/camel-mapi-transport.c b/src/camel/camel-mapi-transport.c
index 83330e3..9de4159 100644
--- a/src/camel/camel-mapi-transport.c
+++ b/src/camel/camel-mapi-transport.c
@@ -27,6 +27,8 @@
 
 #include <string.h>
 
+#include <glib/gi18n.h>
+
 #include <libmapi/libmapi.h>
 #include <gen_ndr/exchange.h>
 
@@ -57,7 +59,6 @@
 
 
 #include <camel/camel-private.h>
-#include <camel/camel-i18n.h>
 #include <camel/camel-net-utils.h>
 #include "camel-mapi-store.h"
 #include "camel-mapi-folder.h"
diff --git a/src/camel/camel-mapi-utils.c b/src/camel/camel-mapi-utils.c
index 4209aba..7d45da0 100644
--- a/src/camel/camel-mapi-utils.c
+++ b/src/camel/camel-mapi-utils.c
@@ -28,6 +28,8 @@
 #include <ctype.h>
 #include <errno.h>
 
+#include <glib/gi18n.h>
+
 #include <libmapi/libmapi.h>
 #include <gen_ndr/exchange.h>
 
@@ -41,7 +43,6 @@
 #include <camel/camel-stream-mem.h>
 
 #include <camel/camel-private.h>
-#include <camel/camel-i18n.h>
 #include <camel/camel-net-utils.h>
 #include <camel/camel-seekable-stream.h>
 #include <camel/camel-sasl.h>
diff --git a/src/camel/camel-private.h b/src/camel/camel-private.h
index 3425f93..e4d56b0 100644
--- a/src/camel/camel-private.h
+++ b/src/camel/camel-private.h
@@ -32,7 +32,6 @@
 #endif
 
 #include <pthread.h>
-#include <libedataserver/e-msgport.h>
 
 G_BEGIN_DECLS