[evolution-groupwise] Adapt to libemail-engine.

[Matthew Barnes <mbarnes src gnome org>]

commit 835ddfb6002cf57f67112e5d7715dc425dbd1c0c
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Jan 18 23:48:16 2012 -0500

    Adapt to libemail-engine.

 src/plugins/camel-gw-listener.c       |    2 +-
 src/plugins/groupwise-account-setup.c |    2 +-
 src/plugins/gw-ui.c                   |    1 -
 src/plugins/install-shared.c          |    4 ++--
 src/plugins/proxy-login.c             |    6 +++---
 src/plugins/proxy.c                   |    1 -
 src/plugins/share-folder-common.c     |    5 ++---
 7 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/src/plugins/camel-gw-listener.c b/src/plugins/camel-gw-listener.c
index 8188569..fd4d68b 100644
--- a/src/plugins/camel-gw-listener.c
+++ b/src/plugins/camel-gw-listener.c
@@ -34,7 +34,7 @@
 #include "e-util/e-alert-dialog.h"
 #include <libecal/e-cal-client.h>
 #include <shell/e-shell.h>
-#include <e-util/e-account-utils.h>
+#include <libemail-utils/e-account-utils.h>
 
 /*stores some info about all currently existing groupwise accounts
   list of GwAccountInfo structures */
diff --git a/src/plugins/groupwise-account-setup.c b/src/plugins/groupwise-account-setup.c
index 7fa8bd9..85f80b4 100644
--- a/src/plugins/groupwise-account-setup.c
+++ b/src/plugins/groupwise-account-setup.c
@@ -27,7 +27,7 @@
 #include <gconf/gconf-client.h>
 #include "shell/es-event.h"
 #include <string.h>
-#include <e-util/e-account-utils.h>
+#include <libemail-utils/e-account-utils.h>
 
 #define GROUPWISE_BASE_URI "groupwise://"
 
diff --git a/src/plugins/gw-ui.c b/src/plugins/gw-ui.c
index 2896f46..4277b8b 100644
--- a/src/plugins/gw-ui.c
+++ b/src/plugins/gw-ui.c
@@ -24,7 +24,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <e-util/e-account-utils.h>
 #include <e-util/e-util.h>
 
 #include <shell/e-shell-view.h>
diff --git a/src/plugins/install-shared.c b/src/plugins/install-shared.c
index 403f50d..f81ef32 100644
--- a/src/plugins/install-shared.c
+++ b/src/plugins/install-shared.c
@@ -30,10 +30,10 @@
 #include <glib/gi18n-lib.h>
 #include <gconf/gconf-client.h>
 #include <e-util/e-config.h>
-#include <e-util/e-account-utils.h>
+#include <libemail-utils/e-account-utils.h>
+#include <libemail-engine/e-mail-folder-utils.h>
 #include <shell/e-shell.h>
 #include <mail/e-mail-backend.h>
-#include <mail/e-mail-folder-utils.h>
 #include <mail/em-config.h>
 #include <mail/em-event.h>
 #include <mail/em-folder-tree.h>
diff --git a/src/plugins/proxy-login.c b/src/plugins/proxy-login.c
index 9c76625..2956a09 100644
--- a/src/plugins/proxy-login.c
+++ b/src/plugins/proxy-login.c
@@ -29,16 +29,16 @@
 #include <glib/gi18n-lib.h>
 
 #include <libedataserverui/e-passwords.h>
+#include <libemail-utils/e-account-utils.h>
 #include <mail/em-folder-tree.h>
 #include <mail/e-mail-backend.h>
+#include <mail/e-mail-ui-session.h>
 #include <mail/em-folder-selector.h>
 #include <mail/em-account-editor.h>
-#include <mail/mail-ops.h>
 #include <libedataserver/e-account.h>
 #include <e-util/e-util.h>
 #include <e-util/e-alert-dialog.h>
 #include <e-util/e-icon-factory.h>
-#include <e-util/e-account-utils.h>
 #include <shell/e-shell-view.h>
 #include <calendar/gui/itip-utils.h>
 
@@ -441,7 +441,7 @@ proxy_login_add_new_store (CamelStore *store,
 
 	store->flags |= CAMEL_STORE_PROXY;
 
-	account_store = e_mail_session_get_account_store (session);
+	account_store = e_mail_ui_session_get_account_store (E_MAIL_UI_SESSION (session));
 	e_mail_account_store_add_service (account_store, CAMEL_SERVICE (store));
 }
 
diff --git a/src/plugins/proxy.c b/src/plugins/proxy.c
index 11be50c..fcfc969 100644
--- a/src/plugins/proxy.c
+++ b/src/plugins/proxy.c
@@ -38,7 +38,6 @@
 
 #include <mail/em-account-editor.h>
 #include <mail/em-config.h>
-#include <mail/mail-ops.h>
 #include <mail/e-mail-backend.h>
 #include <shell/e-shell.h>
 #include <libedataserver/e-account.h>
diff --git a/src/plugins/share-folder-common.c b/src/plugins/share-folder-common.c
index e5f4cff..31c0336 100644
--- a/src/plugins/share-folder-common.c
+++ b/src/plugins/share-folder-common.c
@@ -30,15 +30,14 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <e-util/e-config.h>
-#include <e-util/e-account-utils.h>
+#include <libemail-utils/e-account-utils.h>
+#include <libemail-utils/mail-mt.h>
 #include <mail/e-mail-backend.h>
-#include <mail/e-mail-folder-utils.h>
 #include <mail/em-config.h>
 #include <mail/em-folder-properties.h>
 #include <mail/em-folder-tree.h>
 #include <mail/em-folder-tree-model.h>
 #include <mail/em-folder-selector.h>
-#include <mail/mail-mt.h>
 #include <mail/mail-vfolder.h>
 #include <mail/em-utils.h>
 #include <mail/em-vfolder-rule.h>