Monotone-Parent: eff15e29771ade513bbfeb9c50f15c3845ab5ebe

Monotone-Revision: 6c5162d633983a0315c4a43f2114c333d5df86cd

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-17T14:20:22
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-09-17 14:20:22 +00:00
parent fc9ccc21b0
commit aef4c87c39
2 changed files with 14 additions and 7 deletions

View File

@@ -1,3 +1,9 @@
2007-09-17 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoParentFolder.m ([SOGoParentFolder
-appendPersonalSources]): make sure the value of the "c_path4" of
the returned rows are not NSNull, otherwise, discard them.
2007-09-16 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Contacts/SOGoContactGCSFolder.m ([SOGoContactGCSFolder

View File

@@ -99,14 +99,15 @@
row = [fc fetchAttributes: attrs withZone: NULL];
while (row)
{
folder
= [subFolderClass objectWithName: [row objectForKey: @"c_path4"]
inContainer: self];
key = [row objectForKey: @"c_path4"];
hasPersonal = (hasPersonal || [key isEqualToString: @"personal"]);
[folder setOCSPath: [NSString stringWithFormat: @"%@/%@",
OCSPath, key]];
[subFolders setObject: folder forKey: key];
if ([key isKindOfClass: [NSString class]])
{
folder = [subFolderClass objectWithName: key inContainer: self];
hasPersonal = (hasPersonal || [key isEqualToString: @"personal"]);
[folder setOCSPath: [NSString stringWithFormat: @"%@/%@",
OCSPath, key]];
[subFolders setObject: folder forKey: key];
}
row = [fc fetchAttributes: attrs withZone: NULL];
}