From 2e271ba1fa196973773998fbae5b0aa91dce90da Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 20 Aug 2010 12:50:15 +0000 Subject: [PATCH] Monotone-Parent: 1f459bf5c352f45ee6179088dda845fed84878af Monotone-Revision: 9831fe16221b26d01357cd8dc0a4a0a9d3f418ed Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-08-20T12:50:15 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/SOGo/SOGoParentFolder.m | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index de12aaf4e..587378a53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-08-20 Wolfgang Sourdeau + * 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 diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m index 52982439a..dafee4a8f 100644 --- a/SoObjects/SOGo/SOGoParentFolder.m +++ b/SoObjects/SOGo/SOGoParentFolder.m @@ -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"];