[evolution-exchange] ** BUGFIX: 581424 - Folder > Subscription broken

[Bharath Acharya <abharath src gnome org>]

commit 7b927831a34203310a95bf5932844cceef6f92d4
Author: Bharath Acharya <abharath novell com>
Date:   Tue May 26 15:37:08 2009 +0530

    ** BUGFIX: 581424 - Folder > Subscription broken
    
    Personal folder tree appears besides Public folder when you go to Folder > Subscription
---
 camel/camel-exchange-store.c |    4 ++--
 camel/camel-stub-constants.h |    5 ++++-
 mail/mail-stub-exchange.c    |    8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/camel/camel-exchange-store.c b/camel/camel-exchange-store.c
index 7ca6bd0..8f079b8 100644
--- a/camel/camel-exchange-store.c
+++ b/camel/camel-exchange-store.c
@@ -742,8 +742,8 @@ exchange_get_folder_info (CamelStore *store, const char *top, guint32 flags, Cam
 		store_flags |= CAMEL_STUB_STORE_FOLDER_INFO_RECURSIVE;
 	if (flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED)
 		store_flags |= CAMEL_STUB_STORE_FOLDER_INFO_SUBSCRIBED;
-	if (flags & CAMEL_STORE_FOLDER_INFO_FAST)
-		store_flags |= CAMEL_STUB_STORE_FOLDER_INFO_FAST;
+	if (flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST)
+		store_flags |= CAMEL_STUB_STORE_FOLDER_INFO_SUBSCRIPTION_LIST;
 
 	if (!camel_stub_send (exch->stub, ex, CAMEL_STUB_CMD_GET_FOLDER_INFO,
 			      CAMEL_STUB_ARG_STRING, top,
diff --git a/camel/camel-stub-constants.h b/camel/camel-stub-constants.h
index fd03051..a210e92 100644
--- a/camel/camel-stub-constants.h
+++ b/camel/camel-stub-constants.h
@@ -86,10 +86,13 @@ typedef enum {
 } CamelStubFolderFlags;
 
 typedef enum {
+#ifndef CAMEL_DISABLE_DEPRECATED
 	CAMEL_STUB_STORE_FOLDER_INFO_FAST	= (1<<0),
+#endif /* CAMEL_DISABLE_DEPRECATED */
 	CAMEL_STUB_STORE_FOLDER_INFO_RECURSIVE	= (1<<1),
 	CAMEL_STUB_STORE_FOLDER_INFO_SUBSCRIBED	= (1<<2),
-	CAMEL_STUB_STORE_FOLDER_INFO_NO_VIRTUAL	= (1<<3)
+	CAMEL_STUB_STORE_FOLDER_INFO_NO_VIRTUAL	= (1<<3),
+	CAMEL_STUB_STORE_FOLDER_INFO_SUBSCRIPTION_LIST	= (1<<4)
 } CamelStubStoreFlags ;
 
 #ifdef __cplusplus
diff --git a/mail/mail-stub-exchange.c b/mail/mail-stub-exchange.c
index ffff55f..060e470 100644
--- a/mail/mail-stub-exchange.c
+++ b/mail/mail-stub-exchange.c
@@ -2779,16 +2779,16 @@ get_folder_info_data (MailStub *stub, const char *top, guint32 store_flags,
 	const char *type, *name, *uri, *inbox_uri = NULL, *trash_uri = NULL, *sent_items_uri = NULL;
 	int unread_count, i, toplen = top ? strlen (top) : 0;
 	guint32 folder_flags = 0;
-	gboolean recursive, subscribed, info_fast;
+	gboolean recursive, subscribed, subscription_list;
 	int mode = -1;
 	char *full_path;
 
 	recursive = (store_flags & CAMEL_STUB_STORE_FOLDER_INFO_RECURSIVE);
 	subscribed = (store_flags & CAMEL_STUB_STORE_FOLDER_INFO_SUBSCRIBED);
-	info_fast = (store_flags & CAMEL_STUB_STORE_FOLDER_INFO_FAST);
+	subscription_list = (store_flags & CAMEL_STUB_STORE_FOLDER_INFO_SUBSCRIPTION_LIST);
 
 	exchange_account_is_offline (mse->account, &mode);
-	if (!subscribed && info_fast) {
+	if (!subscribed && subscription_list) {
 		ExchangeAccountResult result = -1;
 
 		d(g_print ("%s(%d):%s: NOT SUBSCRIBED top = [%s]\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, top));
@@ -2843,7 +2843,7 @@ get_folder_info_data (MailStub *stub, const char *top, guint32 store_flags,
 				    hier->type != EXCHANGE_HIERARCHY_FAVORITES &&
 				    hier->type != EXCHANGE_HIERARCHY_FOREIGN)
 					continue;
-			} else if (info_fast) {
+			} else if (subscription_list) {
 				if (hier->type != EXCHANGE_HIERARCHY_PUBLIC)
 					continue;
 			}