Monotone-Parent: 7e0e7f16482ee3ae19401f5ff1f7b42154de45a5

Monotone-Revision: 641127c41cfee5608e04c80873154e605d00e178

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-17T03:38:42
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-09-17 03:38:42 +00:00
parent 8e481d1407
commit 3556365e47
2 changed files with 13 additions and 6 deletions
+4
View File
@@ -1,5 +1,9 @@
2007-09-16 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoObject.m ([SOGoObject
-pathArrayToSOGoObject]): do not reorder the paths if the third
element is an instance of NSNull.
* SoObjects/SOGo/SOGoParentFolder.m ([SOGoParentFolder
-subFolders]): returns a sorted array using the "compare:"
selector.
+9 -6
View File
@@ -492,13 +492,16 @@ static BOOL kontactGroupDAV = YES;
if ([realPathArray count] > 2)
{
objectName = [realPathArray objectAtIndex: 2];
objectDescription = [objectName componentsSeparatedByString: @"_"];
if ([objectDescription count] > 1)
if ([objectName isKindOfClass: [NSString class]])
{
[realPathArray replaceObjectAtIndex: 0
withObject: [objectDescription objectAtIndex: 0]];
[realPathArray replaceObjectAtIndex: 2
withObject: [objectDescription objectAtIndex: 1]];
objectDescription = [objectName componentsSeparatedByString: @"_"];
if ([objectDescription count] > 1)
{
[realPathArray replaceObjectAtIndex: 0
withObject: [objectDescription objectAtIndex: 0]];
[realPathArray replaceObjectAtIndex: 2
withObject: [objectDescription objectAtIndex: 1]];
}
}
}