7 files changed, 18 insertions, 7 deletions
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index ed8d1751c9..ffdfd880b8 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-06  Simon Zheng <simon.zheng@sun.com>
+
+	* junk-mail-settings.c:
+	* mail-send-options.c:
+	* proxy-login.c:
+	* proxy.c:
+	* proxy.h:
+	* send-options.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.
+
 2005-12-30  Andre Klapper <a9016009@gmx.de>
 
 	* evolution/plugins/groupwise-features/properties.glade:
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index c5d1dc1529..9a3d7b0085 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -35,7 +35,7 @@
 #include <mail/em-folder-view.h>
 #include <e-gw-connection.h>
 #include "mail/em-account-editor.h"
-#include "e-util/e-account.h"
+#include "libedataserver/e-account.h"
 #include "mail/em-config.h"
 #include "share-folder.h"
 #include "junk-settings.h"
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 19b48608de..48a7b026c1 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -35,7 +35,7 @@
 #include "mail/em-utils.h"
 
 #include "composer/e-msg-composer.h"
-#include "e-util/e-account.h"
+#include "libedataserver/e-account.h"
 
 #include "misc/e-send-options.h"
 
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index 9c6eebfffd..416ce86e04 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -53,7 +53,7 @@
 #include <camel/camel-url.h>
 #include <camel/camel-store.h>
 #include <mail/mail-ops.h>
-#include <e-util/e-account.h>
+#include <libedataserver/e-account.h>
 #include <e-util/e-error.h>
 #include <e-util/e-icon-factory.h>
 #include <e-util/e-util-private.h>
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index db1f2d6199..8522a550e8 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -56,8 +56,8 @@
 #include <mail/mail-component.h>
 #include <mail/mail-ops.h>
 #include <mail/mail-session.h>
-#include <e-util/e-account.h>
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account.h>
+#include <libedataserver/e-account-list.h>
 #include <e-util/e-icon-factory.h>
 
 #include <camel/camel-url.h>
diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h
index fb2f6c6453..5dfcc9dc04 100644
--- a/plugins/groupwise-features/proxy.h
+++ b/plugins/groupwise-features/proxy.h
@@ -22,7 +22,7 @@
  */
 
 #include <gtk/gtkwidget.h>
-#include <e-util/e-account.h>
+#include <libedataserver/e-account.h>
 #include <gtk/gtk.h>
 
 #define TYPE_PROXY_DIALOG       (proxy_dialog_get_type ())
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index 1fd53bd99f..3eb9dec8bf 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -28,7 +28,7 @@
 #include <gtk/gtk.h>
 #include "mail/em-account-editor.h"
 #include "mail/em-config.h"
-#include "e-util/e-account.h"
+#include "libedataserver/e-account.h"
 #include <misc/e-send-options.h>
 #include <mail/em-config.h>
 #include <e-gw-connection.h>