From d9df05f4b21b49062001e96e26dc68675912c560 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 21 Apr 2011 16:07:03 +0000 Subject: [PATCH 1/3] minor improvement from previous commit Monotone-Parent: 5b741965d2e2101564907ff80f19b932fae6f8d1 Monotone-Revision: 9133720ea3f2757b19bd8237339c0ee204f7f485 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-04-21T16:07:03 Monotone-Branch: ca.inverse.sogo --- UI/MailerUI/UIxMailAccountActions.m | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/UI/MailerUI/UIxMailAccountActions.m b/UI/MailerUI/UIxMailAccountActions.m index 725302e3d..3c9b95a69 100644 --- a/UI/MailerUI/UIxMailAccountActions.m +++ b/UI/MailerUI/UIxMailAccountActions.m @@ -115,7 +115,7 @@ - (NSArray *) _jsonFolders: (NSEnumerator *) rawFolders { - NSString *currentFolder, *currentDisplayName, *currentFolderType, *login; + NSString *currentFolder, *currentDisplayName, *currentFolderType, *login, *fullName; NSMutableArray *pathComponents; SOGoUserManager *userManager; NSDictionary *folderData; @@ -135,11 +135,12 @@ pathComponents = [NSMutableArray arrayWithArray: [currentFolder pathComponents]]; login = [pathComponents objectAtIndex: 2]; userManager = [SOGoUserManager sharedUserManager]; + fullName = [userManager getCNForUID: login]; [pathComponents removeObjectsInRange: NSMakeRange(0,1)]; currentDisplayName = [NSString stringWithFormat: @"/%@/%@/%@", [self labelForKey: @"OtherUsersFolderName"], - [userManager getCNForUID: login], + (fullName != nil ? fullName : login), [pathComponents componentsJoinedByString: @"/"]]; } From 91f7b3521d087235b5927a10ea830828dde0cb49 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 21 Apr 2011 16:23:54 +0000 Subject: [PATCH 2/3] one more minor improvement from previous commit Monotone-Parent: 9133720ea3f2757b19bd8237339c0ee204f7f485 Monotone-Revision: f2fce50e9b31ecb2ebe2346c6c5dfceaf3680e36 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-04-21T16:23:54 Monotone-Branch: ca.inverse.sogo --- UI/MailerUI/UIxMailAccountActions.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/MailerUI/UIxMailAccountActions.m b/UI/MailerUI/UIxMailAccountActions.m index 3c9b95a69..84b9d3ff7 100644 --- a/UI/MailerUI/UIxMailAccountActions.m +++ b/UI/MailerUI/UIxMailAccountActions.m @@ -136,7 +136,7 @@ login = [pathComponents objectAtIndex: 2]; userManager = [SOGoUserManager sharedUserManager]; fullName = [userManager getCNForUID: login]; - [pathComponents removeObjectsInRange: NSMakeRange(0,1)]; + [pathComponents removeObjectsInRange: NSMakeRange(0,2)]; currentDisplayName = [NSString stringWithFormat: @"/%@/%@/%@", [self labelForKey: @"OtherUsersFolderName"], From bdc88a6c5c4ad34026aed53462c83aa93dcfda91 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 21 Apr 2011 16:27:22 +0000 Subject: [PATCH 3/3] one more minor improvement from previous commit Monotone-Parent: f2fce50e9b31ecb2ebe2346c6c5dfceaf3680e36 Monotone-Revision: fc6feb618c03b6dfa0bfcd2661ee4657b47b0759 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-04-21T16:27:22 Monotone-Branch: ca.inverse.sogo --- UI/MailerUI/UIxMailAccountActions.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/MailerUI/UIxMailAccountActions.m b/UI/MailerUI/UIxMailAccountActions.m index 84b9d3ff7..594bf2bc5 100644 --- a/UI/MailerUI/UIxMailAccountActions.m +++ b/UI/MailerUI/UIxMailAccountActions.m @@ -136,7 +136,7 @@ login = [pathComponents objectAtIndex: 2]; userManager = [SOGoUserManager sharedUserManager]; fullName = [userManager getCNForUID: login]; - [pathComponents removeObjectsInRange: NSMakeRange(0,2)]; + [pathComponents removeObjectsInRange: NSMakeRange(0,3)]; currentDisplayName = [NSString stringWithFormat: @"/%@/%@/%@", [self labelForKey: @"OtherUsersFolderName"],