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

Monotone-Parent: 59c3c57568af9cf49ee2644db4b869f2bedea64c

Browse Source 
Monotone-Revision: 399ddcc3b0b509af5a4d05cd434475774187e48c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-30T16:43:55
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-11-30 16:43:55 +00:00
parent 2fbc2674c4
commit 1bbd867cbe
3 changed files with 52 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoGCSFolder.m
+20 -17
View File
@@ -93,7 +93,6 @@ static NSString *defaultUserID = @"<default>";
ocsPath = nil;
ocsFolder = nil;
aclCache = [NSMutableDictionary new];
[self _fetchDisplayName];
}
return self;
@@ -104,7 +103,6 @@ static NSString *defaultUserID = @"<default>";
[ocsFolder release];
[ocsPath release];
[aclCache release];
[displayName release];
[super dealloc];
}
@@ -116,23 +114,25 @@ static NSString *defaultUserID = @"<default>";
NSDictionary *ownerIdentity;
primaryDN = [row objectForKey: @"c_foldername"];
displayName = [NSMutableString string];
if ([primaryDN isEqualToString: [container defaultFolderName]])
[displayName appendString: [self labelForKey: primaryDN]];
else
[displayName appendString: primaryDN];
currentLogin = [[context activeUser] login];
ownerLogin = [self ownerInContext: context];
if (![currentLogin isEqualToString: ownerLogin])
if ([primaryDN length])
{
ownerIdentity = [[SOGoUser userWithLogin: ownerLogin roles: nil]
primaryIdentity];
[displayName
appendString: [ownerIdentity keysWithFormat:
@" (%{fullName} <%{email}>)"]];
displayName = [NSMutableString new];
if ([primaryDN isEqualToString: [container defaultFolderName]])
[displayName appendString: [self labelForKey: primaryDN]];
else
[displayName appendString: primaryDN];
currentLogin = [[context activeUser] login];
ownerLogin = [self ownerInContext: context];
if (![currentLogin isEqualToString: ownerLogin])
{
ownerIdentity = [[SOGoUser userWithLogin: ownerLogin roles: nil]
primaryIdentity];
[displayName
appendString: [ownerIdentity keysWithFormat:
@" (%{fullName} <%{email}>)"]];
}
}
[displayName retain];
}
- (void) _fetchDisplayName
@@ -166,6 +166,9 @@ static NSString *defaultUserID = @"<default>";
- (NSString *) displayName
{
if (!displayName)
[self _fetchDisplayName];
return displayName;
}