From 6c2f247d5e506d4ba43e95c365dd83e7bfc09362 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Sun, 31 Jan 2010 00:46:14 +0000 Subject: [PATCH] Monotone-Parent: 0c195c70628cb4eca82c718f84cfcc3ea2af76f9 Monotone-Revision: 480019f7fbb2f5372b3caf4b1f0781edd7716532 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-01-31T00:46:14 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/SOGo/SOGoObject.m | 2 -- SoObjects/SOGo/SOGoUserFolder.m | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 452780cd7..70b1607fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-01-30 Wolfgang Sourdeau + * SoObjects/SOGo/SOGoUserFolder.m (-ownerInContext:): invoke + setOwner: to retain user. + + * SoObjects/SOGo/SOGoObject.m (-initWithName:inContainer:): + ownerInContext: already retains "owner". + * Main/SOGoProductLoader.m (-loadProducts): attempt to free some memory after "loadAllProducts" is invoked, which consumes a lot of RAM. diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m index 35ec06c85..4537897df 100644 --- a/SoObjects/SOGo/SOGoObject.m +++ b/SoObjects/SOGo/SOGoObject.m @@ -182,8 +182,6 @@ if ([self doesRetainContainer]) [_container retain]; owner = [self ownerInContext: context]; - if (owner) - [owner retain]; } return self; diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m index 5dee4dc37..a69b48a1d 100644 --- a/SoObjects/SOGo/SOGoUserFolder.m +++ b/SoObjects/SOGo/SOGoUserFolder.m @@ -108,7 +108,7 @@ if (!owner) { ownerUser = [SOGoUser userWithLogin: nameInContainer roles: nil]; - owner = [ownerUser login]; + [self setOwner: [ownerUser login]]; } return owner;