evolution-data-server r9495 - in branches/EXCHANGE_MAPI_BRANCH: camel/providers/mapi servers/mapi

[jjohnny svn gnome org]

Author: jjohnny
Date: Mon Sep  8 11:16:13 2008
New Revision: 9495
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9495&view=rev

Log:
Mark folder leaf nodes with CAMEL_FOLDER_NOCHILDREN. Renamed Public Folders to All Public Folders


Modified:
   branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/ChangeLog
   branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.c
   branches/EXCHANGE_MAPI_BRANCH/servers/mapi/ChangeLog
   branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-connection.c

Modified: branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.c	Mon Sep  8 11:16:13 2008
@@ -954,6 +954,9 @@
 		fi->flags |= CAMEL_MAPI_FOLDER_PERSONAL;
 	else if (folder->category == MAPI_FAVOURITE_FOLDER)
 		fi->flags |= CAMEL_MAPI_FOLDER_PUBLIC;
+
+	if (folder->child_count <=0)
+		fi->flags |= CAMEL_FOLDER_NOCHILDREN;
 	/*
 	   parent_hash contains the "parent id <-> folder id" combination. So we form
 	   the path for the full name in camelfolder info by looking up the hash table until

Modified: branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-connection.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-connection.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/servers/mapi/exchange-mapi-connection.c	Mon Sep  8 11:16:13 2008
@@ -2712,7 +2712,7 @@
 	}
 
 	/*  TODO : Localized string */
-	folder = exchange_mapi_folder_new ("Public Folders", NULL, IPF_NOTE, MAPI_FAVOURITE_FOLDER, id_mailbox, 0, 0, 0 ,0); 
+	folder = exchange_mapi_folder_new ("All Public Folders", NULL, IPF_NOTE, MAPI_FAVOURITE_FOLDER, id_mailbox, 0, 0, 0 ,0); 
 	*mapi_folders = g_slist_prepend (*mapi_folders, folder);
 
 	get_child_folders_pf(mem_ctx, &obj_store, id_mailbox, mapi_folders);