Monotone-Parent: f1b87d4db17a8caa13d51a72ad2dfbc796ac7d8f

Monotone-Revision: f584f3f14a5068b2832a02797f1f2468d9232033

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-12-05T21:05:04
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoUserFolder.m

@@ -131,27 +131,27 @@
   return filter;
 }
 
-#warning UIxContactsFoldersView should use these methods\
-         instead from now on...
-
 - (NSArray *) _subFoldersFromFolder: (SOGoParentFolder *) parentFolder
 {
   NSMutableArray *folders;
   NSEnumerator *subfolders;
   SOGoFolder *currentFolder;
-  NSString *folderName;
+  NSString *folderName, *folderOwner;
   NSMutableDictionary *currentDictionary;
   SoSecurityManager *securityManager;
 
+  folderOwner = [parentFolder ownerInContext: context];
   securityManager = [SoSecurityManager sharedSecurityManager];
-   
+
   folders = [NSMutableArray array];
 
   subfolders = [[parentFolder subFolders] objectEnumerator];
   while ((currentFolder = [subfolders nextObject]))
     {
       if (![securityManager validatePermission: SOGoPerm_AccessObject
-			    onObject: currentFolder inContext: context])
+			    onObject: currentFolder inContext: context]
+	  && [[currentFolder ownerInContext: context]
+	       isEqualToString: folderOwner])
 	{
 	  folderName = [NSString stringWithFormat: @"/%@/%@",
 				 [parentFolder nameInContainer],