From 4e81565817f89d6e9fb1dddcb1e2ae5eea007458 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 30 Nov 2011 14:54:41 +0000 Subject: [PATCH] Monotone-Parent: d89d3072bd33911f4a6a49b5e91f9afa1094a1b9 Monotone-Revision: e1d9c79bd6c5862141ce684d5c07afe5be283b15 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-11-30T14:54:41 --- SoObjects/SOGo/SOGoFolder.m | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m index 26a82a32d..5587f18b8 100644 --- a/SoObjects/SOGo/SOGoFolder.m +++ b/SoObjects/SOGo/SOGoFolder.m @@ -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;