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

Monotone-Parent: 004c96fa075fbca45fa523b3bb73737aa0ce34a1 

Monotone-Revision: 1892d22bfa9e855fd8c40d3f7f4b97d3637cb141

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-03-19T15:42:58
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2009-03-19 15:42:58 +00:00
parent f980e65087
commit 578f01bd5e
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2009-03-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoUser.m ([SOGoUser
-homeFolderInContext:context]): no longer put the home folder in
cache, since it uses an context that is freed and invalidated
afterwards, which can cause crashes.
2009-03-19 Ludovic Marcotte <lmarcotte@inverse.ca>
* Updated the sope.spec file wrt to changes

11
Main/SOGo.m
View File

@ -296,11 +296,16 @@ static BOOL debugObjectAllocation = NO;
user = [SOGoUser userWithLogin: _key roles: nil];
if (user)
userFolder = [$(@"SOGoUserFolder") objectWithName: _key
inContainer: self];
{
userFolder = [$(@"SOGoUserFolder")
objectWithName: _key
inContainer: self];
}
else
userFolder = nil;
NSLog (@"userFolder: %p (%@)", userFolder, _key);
return userFolder;
}
@ -349,6 +354,8 @@ static BOOL debugObjectAllocation = NO;
}
}
NSLog (@"SOGo: lookup: %p (%@)", obj, _key);
return obj;
}

3
SoObjects/SOGo/SOGoObject.m
View File

@ -270,6 +270,7 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
if ((self = [self init]))
{
context = [[WOApplication application] context];
NSLog (@"init [%p] context = %p", self, context);
nameInContainer = [_name copy];
container = _container;
if ([self doesRetainContainer])
@ -1165,6 +1166,8 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
NSString *baseURL, *urlMethod, *fullHost;
NSNumber *port;
NSLog (@"url [%p] context = %p", self, context);
serverURL = [context serverURL];
baseURL = [[self baseURLInContext: context] stringByUnescapingURL];
path = [NSMutableArray arrayWithArray: [baseURL componentsSeparatedByString:

14
SoObjects/SOGo/SOGoUser.m
View File

@ -263,7 +263,6 @@ _timeValue (NSString *key)
{
allEmails = nil;
currentPassword = nil;
homeFolder = nil;
cn = nil;
mailAccounts = nil;
}
@ -281,7 +280,6 @@ _timeValue (NSString *key)
{
[allEmails release];
[currentPassword release];
[homeFolder release];
[cn release];
[mailAccounts release];
[super dealloc];
@ -855,15 +853,9 @@ _timeValue (NSString *key)
- (SOGoUserFolder *) homeFolderInContext: (id) context
{
if (!homeFolder)
{
homeFolder = [[WOApplication application] lookupName: [self login]
inContext: context
acquire: NO];
[homeFolder retain];
}
return homeFolder;
return [[WOApplication application] lookupName: [self login]
inContext: context
acquire: NO];
}
- (SOGoAppointmentFolders *) calendarsFolderInContext: (WOContext *) context