Monotone-Parent: 2093fd32a32150f9c5060bac5619eea2dbc2f08d
Monotone-Revision: 6a3c0d744d66748f11759bba747978f5e50b85d5 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-07-20T18:46:08 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
e6d7792536
commit
3d698d0f91
|
@ -1,3 +1,8 @@
|
||||||
|
2010-07-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* UI/Contacts/UIxContactFoldersView.m (_subFoldersFromFolder:):
|
||||||
|
removed unused method.
|
||||||
|
|
||||||
2010-07-16 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2010-07-16 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
* UI/Contacts/UIxContactEditor.m (-photosURL): copy of the method
|
* UI/Contacts/UIxContactEditor.m (-photosURL): copy of the method
|
||||||
|
|
|
@ -246,42 +246,6 @@
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSArray *) _subFoldersFromFolder: (SOGoParentFolder *) parentFolder
|
|
||||||
{
|
|
||||||
NSMutableArray *folders;
|
|
||||||
NSEnumerator *subfolders;
|
|
||||||
SOGoGCSFolder *subfolder;
|
|
||||||
NSString *folderName;
|
|
||||||
NSMutableDictionary *currentDictionary;
|
|
||||||
SoSecurityManager *securityManager;
|
|
||||||
|
|
||||||
securityManager = [SoSecurityManager sharedSecurityManager];
|
|
||||||
|
|
||||||
folders = [NSMutableArray array];
|
|
||||||
|
|
||||||
subfolders = [[parentFolder subFolders] objectEnumerator];
|
|
||||||
while ((subfolder = [subfolders nextObject]))
|
|
||||||
{
|
|
||||||
if (![securityManager validatePermission: SOGoPerm_AccessObject
|
|
||||||
onObject: subfolder inContext: context])
|
|
||||||
{
|
|
||||||
folderName = [NSString stringWithFormat: @"/%@/%@",
|
|
||||||
[parentFolder nameInContainer],
|
|
||||||
[subfolder nameInContainer]];
|
|
||||||
currentDictionary
|
|
||||||
= [NSMutableDictionary dictionaryWithCapacity: 3];
|
|
||||||
[currentDictionary setObject: [subfolder displayName]
|
|
||||||
forKey: @"displayName"];
|
|
||||||
[currentDictionary setObject: folderName forKey: @"name"];
|
|
||||||
[currentDictionary setObject: [subfolder folderType]
|
|
||||||
forKey: @"type"];
|
|
||||||
[folders addObject: currentDictionary];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return folders;
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void) checkDefaultModulePreference
|
- (void) checkDefaultModulePreference
|
||||||
{
|
{
|
||||||
SOGoUserDefaults *ud;
|
SOGoUserDefaults *ud;
|
||||||
|
|
Loading…
Reference in New Issue