[evolution-groupwise] Adapt to Evolution API changes.

[Matthew Barnes <mbarnes src gnome org>]

commit 53c7c50c72b783187ada13588bbe051158e46fd7
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Dec 10 22:06:23 2011 -0500

    Adapt to Evolution API changes.

 src/plugins/proxy-login.c         |   13 ++++++++-----
 src/plugins/share-folder-common.c |   12 +++++++++---
 2 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/src/plugins/proxy-login.c b/src/plugins/proxy-login.c
index 42020c2..6a8a061 100644
--- a/src/plugins/proxy-login.c
+++ b/src/plugins/proxy-login.c
@@ -423,15 +423,16 @@ proxy_login_add_new_store (CamelStore *store,
 {
 	EShell *shell;
 	EShellBackend *shell_backend;
-	EMailBackend *mail_backend;
-	EMailSession *mail_session;
+	EMailBackend *backend;
+	EMailSession *session;
+	EMailAccountStore *account_store;
 	gint permissions = GPOINTER_TO_INT(g_object_get_data ((GObject *)account, "permissions"));
 
 	shell = e_shell_get_default ();
 	shell_backend = e_shell_get_backend_by_name (shell, "mail");
 
-	mail_backend = E_MAIL_BACKEND (shell_backend);
-	mail_session = e_mail_backend_get_session (mail_backend);
+	backend = E_MAIL_BACKEND (shell_backend);
+	session = e_mail_backend_get_session (backend);
 
 	if (store == NULL)
 		return;
@@ -440,7 +441,9 @@ proxy_login_add_new_store (CamelStore *store,
 		store->mode &= !CAMEL_STORE_WRITE;
 
 	store->flags |= CAMEL_STORE_PROXY;
-	e_mail_store_add (mail_session, store);
+
+	account_store = e_mail_session_get_account_store (session);
+	e_mail_account_store_add_service (account_store, CAMEL_SERVICE (store));
 }
 
 static void
diff --git a/src/plugins/share-folder-common.c b/src/plugins/share-folder-common.c
index a5aa323..d3e9f35 100644
--- a/src/plugins/share-folder-common.c
+++ b/src/plugins/share-folder-common.c
@@ -92,12 +92,18 @@ shared_folder_commit (EPlugin *ep,
 	CamelStore *parent_store;
 	EMFolderTreeModel *model;
 	EShell *shell;
-	EMailBackend *mail_backend;
+	EShellBackend *shell_backend;
+	EMailBackend *backend;
+	EMailSession *session;
 
 	shell = e_shell_get_default ();
-	mail_backend = E_MAIL_BACKEND (e_shell_get_backend_by_name (shell, "mail"));
+	shell_backend = e_shell_get_backend_by_name (shell, "mail");
+
+	backend = E_MAIL_BACKEND (shell_backend);
+	session = e_mail_backend_get_session (backend);
+
 	model = em_folder_tree_model_new ();
-	em_folder_tree_model_set_backend (model, mail_backend);
+	em_folder_tree_model_set_session (model, session);
 
 	parent_store = camel_folder_get_parent_store (target->folder);