Monotone-Parent: 1f459bf5c352f45ee6179088dda845fed84878af

Monotone-Revision: 9831fe16221b26d01357cd8dc0a4a0a9d3f418ed

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-08-20T12:50:15
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-08-20 12:50:15 +00:00
parent f653ca8c4b
commit 2e271ba1fa
2 changed files with 6 additions and 2 deletions

View File

@ -1,5 +1,9 @@
2010-08-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoParentFolder.m (-appendPersonalSources): we
now that "owner" is always set properly from the init methods, no
need to invoke ownerInContext: anymore.
* SoObjects/SOGo/WORequest+SOGo.m (-isMacOSXAddressBookApp):
renamed from "isAddressBookApp".
(-isIPhoneAddressBookApp): new method to detect whether the

View File

@ -230,7 +230,7 @@ static SoSecurityManager *sm = nil;
@" WHERE c_path2 = '%@'"
@" AND c_folder_type = '%@'"),
[folderLocation gcsTableName],
[self ownerInContext: context],
owner,
gcsFolderType];
error = [self _fetchPersonalFolders: sql withChannel: fc];
[cm releaseChannel: fc];
@ -276,7 +276,7 @@ static SoSecurityManager *sm = nil;
error = nil; /* we ignore non-DB errors at this time... */
ownerUser = [SOGoUser userWithLogin: [self ownerInContext: context]];
ownerUser = [SOGoUser userWithLogin: owner];
settings = [ownerUser userSettings];
subscribedReferences = [[settings objectForKey: nameInContainer]
objectForKey: @"SubscribedFolders"];