merge of '4133aa51d99944a0881e6439951b7325553c5309'

and '787fab4426e6ea6fab09ccfcc61ecc658e06ed5e'

Monotone-Parent: 4133aa51d99944a0881e6439951b7325553c5309
Monotone-Parent: 787fab4426e6ea6fab09ccfcc61ecc658e06ed5e
Monotone-Revision: 075df52db5284515c4b7994dd7a105a4399e3e3d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-06-13T18:51:19
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-06-13 18:51:19 +00:00
4 changed files with 11 additions and 4 deletions
+4 -3
View File
@@ -186,9 +186,10 @@
while (currentFolder)
{
if ([currentFolder isEqual: folder] ||
![sm validatePermission: SoPerm_AddDocumentsImagesAndFiles
onObject: currentFolder
inContext: context])
([currentFolder isKindOfClass: [SOGoContactGCSFolder class]] &&
![sm validatePermission: SoPerm_AddDocumentsImagesAndFiles
onObject: currentFolder
inContext: context]))
[addressBooksList addObject: currentFolder];
currentFolder = [folders nextObject];
}