Add a "parent" field to CamelFolderInfo.

	* camel-store.h: Add a "parent" field to CamelFolderInfo.

	* camel-store.c (camel_folder_info_build): Deal with "parent"
	(camel_store_folder_subscribed, camel_store_subscribe_folder,
	camel_store_unsubscribe_folder): Add g_return_if_fails checking
	that the folder supports subscriptions.

	* providers/imap/camel-imap-store.c (folder_subscribed,
	subscribe_folder, unsubscribe_folder): Remove "+ 1"s since the
	mail subscribe UI won't prepend / to the folder names now.
	(get_folder_info): Clear the "parent" field of the folderinfos
	when removing an empty top level.

	* providers/nntp/camel-nntp-store.c (nntp_store_folder_subscribed,
	nntp_store_subscribe_folder, nntp_store_unsubscribe_folder):
	Remove "+ 1"s since the mail subscribe UI won't prepend / to the
	folder names now.

svn path=/trunk/; revision=6167

1 files changed, 5 insertions, 0 deletions

diff --git a/camel/camel-store.c b/camel/camel-store.c
index 706ade9b97..ac6337acac 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -557,9 +557,11 @@ camel_folder_info_build (GPtrArray *folders, CamelFolderInfo *top,
 				g_ptr_array_add (folders, pfi);
 			}
 			fi->sibling = pfi->child;
+			fi->parent = pfi;
 			pfi->child = fi;
 		} else {
 			fi->sibling = top->child;
+			fi->parent = top;
 			top->child = fi;
 		}
 	}
@@ -591,6 +593,7 @@ camel_store_folder_subscribed (CamelStore *store,
 			       const char *folder_name)
 {
 	g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE);
+	g_return_val_if_fail (store->flags & CAMEL_STORE_SUBSCRIPTIONS, FALSE);
 
 	return CS_CLASS (store)->folder_subscribed (store, folder_name);
 }
@@ -613,6 +616,7 @@ camel_store_subscribe_folder (CamelStore *store,
 			      CamelException *ex)
 {
 	g_return_if_fail (CAMEL_IS_STORE (store));
+	g_return_if_fail (store->flags & CAMEL_STORE_SUBSCRIPTIONS);
 
 	CS_CLASS (store)->subscribe_folder (store, folder_name, ex);
 }
@@ -636,6 +640,7 @@ camel_store_unsubscribe_folder (CamelStore *store,
 				CamelException *ex)
 {
 	g_return_if_fail (CAMEL_IS_STORE (store));
+	g_return_if_fail (store->flags & CAMEL_STORE_SUBSCRIPTIONS);
 
 	CS_CLASS (store)->unsubscribe_folder (store, folder_name, ex);
 }