[evolution-mapi] Bug 581424 – Personal folder tree appears besides Public folder in subscription editor.

[Johnny Jacob <jjohnny src gnome org>]

commit 16c6979cfe9c8f61c38b47e5ee4ff1a968a11cf8
Author: Johnny Jacob <jjohnny novell com>
Date:   Thu May 7 10:49:02 2009 +0530

    Bug 581424 â?? Personal folder tree appears besides Public folder in subscription editor.
    
    CAMEL_STORE_FOLDER_INFO_FAST is deprecated. Use CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST for public folder heirarchy fetch.
---
 src/camel/camel-mapi-store.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/camel/camel-mapi-store.c b/src/camel/camel-mapi-store.c
index 62d00e7..e33e25e 100644
--- a/src/camel/camel-mapi-store.c
+++ b/src/camel/camel-mapi-store.c
@@ -893,11 +893,10 @@ mapi_get_folder_info_offline (CamelStore *store, const char *top,
 	GPtrArray *folders;
 	char *path, *name;
 	int i;
-	gboolean recursive, subscribed, info_fast, favourites = false;
+	gboolean subscribed, favourites , subscription_list = false;
 
-	recursive = (flags & CAMEL_STORE_FOLDER_INFO_RECURSIVE);
+	subscription_list = (flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST);
 	subscribed = (flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED);
-	info_fast = (flags & CAMEL_STORE_FOLDER_INFO_FAST);
 
 	folders = g_ptr_array_new ();
 
@@ -922,8 +921,8 @@ mapi_get_folder_info_offline (CamelStore *store, const char *top,
 		if (si == NULL) 
 			continue;
 
-		/* Based on exchange connector. Allow only All Public Folders heirarchy */
-		if ((!subscribed) && info_fast) 
+		/* Allow only All Public Folders heirarchy */
+		if (subscription_list)
 			if (!(si->flags & CAMEL_MAPI_FOLDER_PUBLIC)) continue;
 
 		/*Allow Mailbox and Favourites (Subscribed public folders)*/
@@ -965,8 +964,7 @@ mapi_get_folder_info_offline (CamelStore *store, const char *top,
 		camel_store_summary_info_free((CamelStoreSummary *)mapi_store->summary, si);
 	}
 
-	/*FIXME*/
-	if (!((!subscribed) && info_fast) && top[0] == '\0') {
+	if (!(subscription_list) && top[0] == '\0') {
 		fi = mapi_build_folder_info(mapi_store, NULL, DISPLAY_NAME_FAVOURITES);
 		fi->flags |= CAMEL_FOLDER_NOSELECT;
 		fi->flags |= CAMEL_FOLDER_SYSTEM;