Monotone-Parent: 945fc1b3d54b7fde38f1c0b7d2a3452ba800e91a

Monotone-Revision: eaaf9169ecb212d4b9b5ba9600d50e92f8d9e14e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-08-07T19:49:02
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2007-08-07 19:49:02 +00:00
parent bab7f19cfd
commit 2842122c58
2 changed files with 17 additions and 8 deletions

View File

@ -1,3 +1,9 @@
2007-08-07 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView
-_gcsFoldersFromFolder:): ignore the personal folders who are
returned but don't really exist.
2007-08-02 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView _responseForResults:]):

View File

@ -205,15 +205,18 @@
if ([currentContactFolder
isKindOfClass: [SOGoContactGCSFolder class]])
{
folderName = [NSString stringWithFormat: @"/Contacts/%@",
[currentContactFolder nameInContainer]];
currentDictionary = [NSMutableDictionary new];
[currentDictionary autorelease];
displayName = [[currentContactFolder ocsFolder] folderName];
[currentDictionary setObject: displayName forKey: @"displayName"];
[currentDictionary setObject: folderName forKey: @"name"];
[currentDictionary setObject: @"contact" forKey: @"type"];
[gcsFolders addObject: currentDictionary];
if (displayName)
{
folderName = [NSString stringWithFormat: @"/Contacts/%@",
[currentContactFolder nameInContainer]];
currentDictionary
= [NSMutableDictionary dictionaryWithCapacity: 3];
[currentDictionary setObject: displayName forKey: @"displayName"];
[currentDictionary setObject: folderName forKey: @"name"];
[currentDictionary setObject: @"contact" forKey: @"type"];
[gcsFolders addObject: currentDictionary];
}
}
currentContactFolder = [contactSubfolders nextObject];
}