Monotone-Parent: e89a46b719b80b6d34d9e7a110754e60344dd669

Monotone-Revision: bc440bc0c22c32437dc043e9566760ddd30fea67

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-26T19:56:24
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,10 @@
 2012-01-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFolder.m (supportsSubFolders): new
+	overridable method that returns whether the current folder can
+	contain subfolders, nowithstanding the right of the current user
+	to create or access them.
+
 	* OpenChange/MAPIStoreSOGo.m (sogo_backend_list_contexts): new
 	backend method.
 

OpenChange/MAPIStoreFSFolder.m

@@ -295,4 +295,9 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
   return [self _testRoleForActiveUser: MAPIStoreRightCreateSubfolders];
 }
 
+- (BOOL) supportsSubFolders
+{
+  return YES;
+}
+
 @end

OpenChange/MAPIStoreFolder.m

@@ -1141,7 +1141,8 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
     access |= 0x02;
   if (userIsOwner || [self subscriberCanDeleteMessages])
     access |= 0x04;
-  if (userIsOwner || [self subscriberCanCreateSubFolders])
+  if ((userIsOwner || [self subscriberCanCreateSubFolders])
+      && [self supportsSubFolders])
     access |= 0x08;
   if (userIsOwner || [self subscriberCanCreateMessages])
     access |= 0x10;
@@ -1595,4 +1596,9 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
   return NO;
 }
 
+- (BOOL) supportsSubFolders
+{
+  return NO;
+}
+
 @end

OpenChange/MAPIStoreMailFolder.m

@@ -1179,6 +1179,11 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
   return childFolder;
 }
 
+- (BOOL) supportsSubFolders
+{
+  return !usesAltNameSpace;
+}
+
 @end
 
 @implementation MAPIStoreSentItemsFolder : MAPIStoreMailFolder