14 files changed, 31 insertions, 13 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 3a5698895e..d1c68b26ac 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,21 @@
+2006-01-06  Simon Zheng <simon.zheng@sun.com>
+
+	* em-account-editor.c:
+	* em-account-prefs.c:
+	* em-composer-utils.c:
+	* em-folder-tree-model.h:
+	* em-migrate.c:
+	* em-subscribe-editor.c:
+	* em-utils.c:
+	* importers/netscape-importer.c:
+	* mail-config.c:
+	* mail-crypto.c:
+	* mail-ops.h:
+	* mail-send-recv.c:
+	* mail-vfolder.c:
+	use libedataserver/e-account-list.h instead of e-util/e-account-list.h.
+	use libedataserver/e-account.h instead of e-util/e-account.h.
+
 2006-01-04  Srinivasa Ragavan  <sragavan@novell.com>
 
 	* mail-tools.c: Uncommented mail_tool_get_local_movemail_path for
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 4dda9a9f05..ed747e8b49 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -68,7 +68,7 @@
 #include <libgnomeui/gnome-druid.h>
 #include <libgnomeui/gnome-druid-page-standard.h>
 
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account-list.h>
 #include <e-util/e-signature-list.h>
 
 #include "e-util/e-error.h"
diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c
index 0f9f37e7ee..4207a66455 100644
--- a/mail/em-account-prefs.c
+++ b/mail/em-account-prefs.c
@@ -40,7 +40,7 @@
 #include "mail-ops.h"
 #include "mail-send-recv.h"
 
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 #include "e-util/e-error.h"
 #include "e-util/e-util-private.h"
 
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index a17d0f166b..8e3f4ca8fd 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -47,7 +47,7 @@
 #include "em-format-quote.h"
 #include "em-event.h"
 
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 
 #include <camel/camel-multipart.h>
 #include <camel/camel-string-utils.h>
diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h
index db46741657..1938e84095 100644
--- a/mail/em-folder-tree-model.h
+++ b/mail/em-folder-tree-model.h
@@ -31,7 +31,7 @@
 
 #include <camel/camel-store.h>
 
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account-list.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index 72071e3edc..6ac7445ea4 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -61,7 +61,7 @@
 #include <e-util/e-xml-utils.h>
 
 #include "e-util/e-bconf-map.h"
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 #include "e-util/e-signature-list.h"
 #include "e-util/e-error.h"
 #include "e-util/e-util-private.h"
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index 51dd4a2404..71e52a5e29 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -36,7 +36,7 @@
 #include "camel/camel-exception.h"
 #include "camel/camel-store.h"
 #include "camel/camel-session.h"
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 #include "e-util/e-util-private.h"
 
 #include "em-subscribe-editor.h"
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 0ea8caf442..96095dcc40 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -71,7 +71,7 @@
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
 #include "e-util/e-mktemp.h"
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-error.h"
 
diff --git a/mail/importers/netscape-importer.c b/mail/importers/netscape-importer.c
index 518ca2fd4c..5bd1377d5c 100644
--- a/mail/importers/netscape-importer.c
+++ b/mail/importers/netscape-importer.c
@@ -57,7 +57,7 @@
 #include "mail/em-filter-folder-element.h"
 #include <filter/filter-int.h>
 
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 #include "e-util/e-signature-list.h"
 
 #include "mail/mail-mt.h"
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 8900295ad4..ef695e1597 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -58,7 +58,7 @@
 #include <e-util/e-util.h>
 #include <misc/e-gui-utils.h>
 
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account-list.h>
 #include <e-util/e-signature-list.h>
 
 #include <camel/camel-service.h>
diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c
index 4cc1fe9ae0..c07c2f4cb6 100644
--- a/mail/mail-crypto.c
+++ b/mail/mail-crypto.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include <camel/camel-gpg-context.h>
-#include <e-util/e-account.h>
+#include <libedataserver/e-account.h>
 
 #include "mail-crypto.h"
 #include "mail-session.h"
diff --git a/mail/mail-ops.h b/mail/mail-ops.h
index 7ae91131b3..075aa748c5 100644
--- a/mail/mail-ops.h
+++ b/mail/mail-ops.h
@@ -37,7 +37,7 @@ extern "C" {
 #include "camel/camel-operation.h"
 
 #include "libedataserver/e-msgport.h"
-#include "e-util/e-account.h"
+#include "libedataserver/e-account.h"
 
 void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info,
 		       void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok,
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 99e5492587..5ca2449f96 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -41,7 +41,7 @@
 #include <libgnome/gnome-i18n.h>
 
 #include "e-util/e-gtk-utils.h"
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 
 #include "misc/e-clipped-label.h"
 #include "em-filter-rule.h"
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 1f06bd121c..b258355c57 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -32,7 +32,7 @@
 #include <camel/camel-vee-store.h>
 #include <camel/camel-vtrash-folder.h>
 
-#include "e-util/e-account-list.h"
+#include "libedataserver/e-account-list.h"
 #include "e-util/e-error.h"
 #include "e-util/e-util-private.h"