Monotone-Parent: d89d3072bd33911f4a6a49b5e91f9afa1094a1b9
Monotone-Revision: e1d9c79bd6c5862141ce684d5c07afe5be283b15 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-11-30T14:54:41maint-2.0.2
parent
8aadb43711
commit
4e81565817
|
@ -44,6 +44,7 @@
|
|||
#import "NSString+Utilities.h"
|
||||
#import "SOGoPermissions.h"
|
||||
#import "SOGoWebDAVAclManager.h"
|
||||
#import "WORequest+SOGo.h"
|
||||
#import "WOResponse+SOGo.h"
|
||||
|
||||
#import "SOGoFolder.h"
|
||||
|
@ -232,14 +233,16 @@
|
|||
{
|
||||
comparison = [self _compareByNameInContainer: otherFolder];
|
||||
if (comparison == NSOrderedSame)
|
||||
if ([self displayName] == nil)
|
||||
comparison = NSOrderedAscending;
|
||||
else if ([otherFolder displayName] == nil)
|
||||
comparison = NSOrderedDescending;
|
||||
else
|
||||
comparison
|
||||
= [[self displayName]
|
||||
localizedCaseInsensitiveCompare: [otherFolder displayName]];
|
||||
{
|
||||
if ([self displayName] == nil)
|
||||
comparison = NSOrderedAscending;
|
||||
else if ([otherFolder displayName] == nil)
|
||||
comparison = NSOrderedDescending;
|
||||
else
|
||||
comparison
|
||||
= [[self displayName]
|
||||
localizedCaseInsensitiveCompare: [otherFolder displayName]];
|
||||
}
|
||||
}
|
||||
|
||||
return comparison;
|
||||
|
|
Loading…
Reference in New Issue