amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-28 22:55:25 +00:00
Code Issues Projects Releases Wiki Activity

merge of '1e0a79aada7e74e97b4db2b274c9fdbfef57d745'

Browse Source 
and 'fc6feb618c03b6dfa0bfcd2661ee4657b47b0759'

Monotone-Parent: 1e0a79aada7e74e97b4db2b274c9fdbfef57d745
Monotone-Parent: fc6feb618c03b6dfa0bfcd2661ee4657b47b0759
Monotone-Revision: 3da6b32037cdcb0fdb7d0c857d09a40ae7c4238e

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-04-21T19:27:19
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-04-21 19:27:19 +00:00
parent cc1c765cd9 bdc88a6c5c
commit d8efdc3436
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MailerUI/UIxMailAccountActions.m
+4 -3
View File
@@ -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];
[pathComponents removeObjectsInRange: NSMakeRange(0,1)];
fullName = [userManager getCNForUID: login];
[pathComponents removeObjectsInRange: NSMakeRange(0,3)];
currentDisplayName = [NSString stringWithFormat: @"/%@/%@/%@",
[self labelForKey: @"OtherUsersFolderName"],
[userManager getCNForUID: login],
(fullName != nil ? fullName : login),
[pathComponents componentsJoinedByString: @"/"]];
}