LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 42442283d6d0a521a03631d44c951065a424bb90 

Monotone-Revision: 285b0bf17b6ea471398e5206f488b3358f436b62

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-06-17T13:30:51
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2009-06-17 13:30:51 +00:00
parent 377aa84d38
commit 94f0101a28
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2009-06-17 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoParentFolder.m (-initSubFoldersMatching:):
renamed from "initSubFolders". Take a string argument that, if
specified, will stop the search of folders when the name can be
found in the folders list.
2009-06-16 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m

12
SoObjects/SOGo/SOGoParentFolder.m
View File

@ -336,7 +336,7 @@ static SoSecurityManager *sm = nil;
return error;
}
- (NSException *) initSubFolders
- (NSException *) initSubFoldersMatching: (NSString *) folderName
{
NSString *login;
NSException *error;
@ -345,10 +345,12 @@ static SoSecurityManager *sm = nil;
{
subFolders = [NSMutableDictionary new];
error = [self appendPersonalSources];
if (!error)
if (!error
&& !(folderName && [subFolders objectForKey: folderName]))
{
error = [self appendSystemSources];
if (!error)
if (!error
&& !(folderName && [subFolders objectForKey: folderName]))
{
login = [[context activeUser] login];
if ([login isEqualToString: owner])
@ -394,7 +396,7 @@ static SoSecurityManager *sm = nil;
if (!obj)
{
if (!subFolders)
error = [self initSubFolders];
error = [self initSubFoldersMatching: name];
else
error = nil;
@ -421,7 +423,7 @@ static SoSecurityManager *sm = nil;
if (!subFolders)
{
error = [self initSubFolders];
error = [self initSubFoldersMatching: nil];
if (error)
{
/* We exceptionnally raise the exception here because doPROPFIND: