Monotone-Parent: d128523a11c890ea68c1606ab37270a6740d6e8e

Monotone-Revision: 730f0c170d5aeba0b485facb0222c81f6499d298

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-12-21T19:10:18
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-12-21 19:10:18 +00:00
parent aba2773d6c
commit 2e15c455f5
2 changed files with 10 additions and 6 deletions

View File

@@ -1,3 +1,9 @@
2009-12-21 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoUserFolder.m (-fetchContentObjectNames):
fixed a potential crash by removing the "static" attribute of the
"cos" local variable.
2009-12-19 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/Appointments/SOGoUserFolder+Appointments.m

View File

@@ -603,16 +603,14 @@
{
SOGoSystemDefaults *sd;
SOGoUser *currentUser;
static NSArray *cos = nil;
NSArray *cos;
sd = [SOGoSystemDefaults sharedSystemDefaults];
currentUser = [context activeUser];
if ((![[context request] isSoWebDAVRequest] || [sd isCalendarDAVAccessEnabled])
if ((![[context request] isSoWebDAVRequest]
|| [sd isCalendarDAVAccessEnabled])
&& [currentUser canAccessModule: @"Calendar"])
{
if (!cos)
cos = [[NSArray alloc] initWithObjects: @"freebusy.ifb", nil];
}
cos = [NSArray arrayWithObject: @"freebusy.ifb"];
else
cos = [NSArray array];