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

Monotone-Parent: 1bc2d8d548fc0f35aa2c0bb3364da716249afeaa

Browse Source 
Monotone-Revision: 2b60f97c4d2741a2c88de56088329c326bed2aa1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-12-17T14:53:16
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-12-17 14:53:16 +00:00
parent 85dfb16e7a
commit 019e6ec6a9
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoParentFolder.m
+21 -16
View File
@@ -107,7 +107,7 @@ static SoSecurityManager *sm = nil;
subFolders = nil;
OCSPath = nil;
subFolderClass = Nil;
hasSubscribedSources = NO;
// hasSubscribedSources = NO;
}
return self;
@@ -318,23 +318,28 @@ static SoSecurityManager *sm = nil;
- (void) initSubFolders
{
NSString *login;
if (!subFolders)
{
subFolders = [NSMutableDictionary new];
[self appendPersonalSources];
[self appendSystemSources];
login = [[context activeUser] login];
if ([login isEqualToString: owner])
[self appendSubscribedSources];
}
}
- (void) _appendSubscribedSourcesIfNeeded
{
NSString *login;
// - (void) _appendSubscribedSourcesIfNeeded
// {
// NSString *login;
login = [[context activeUser] login];
if ([login isEqualToString: owner])
[self appendSubscribedSources];
hasSubscribedSources = YES;
}
// login = [[context activeUser] login];
// if ([login isEqualToString: owner])
// [self appendSubscribedSources];
// hasSubscribedSources = YES;
// }
- (id) lookupName: (NSString *) name
inContext: (WOContext *) lookupContext
@@ -350,11 +355,11 @@ static SoSecurityManager *sm = nil;
[self initSubFolders];
obj = [subFolders objectForKey: name];
if (!obj && !hasSubscribedSources)
{
[self _appendSubscribedSourcesIfNeeded];
obj = [subFolders objectForKey: name];
}
// if (!obj && !hasSubscribedSources)
// {
// [self _appendSubscribedSourcesIfNeeded];
// obj = [subFolders objectForKey: name];
// }
}
return obj;
@@ -364,8 +369,8 @@ static SoSecurityManager *sm = nil;
{
if (!subFolders)
[self initSubFolders];
if (!!hasSubscribedSources)
[self _appendSubscribedSourcesIfNeeded];
// if (!!hasSubscribedSources)
// [self _appendSubscribedSourcesIfNeeded];
return [[subFolders allValues]
sortedArrayUsingSelector: @selector (compare:)];