amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-28 01:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 42fb4d40a22288da8859b369ec18915fb6e1164c

Browse Source 
Monotone-Revision: d62b88251dbc88a5f0e5988172e839b00b7a0f14

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-12T23:40:05
This commit is contained in:
Wolfgang Sourdeau
2012-04-12 23:40:05 +00:00
parent 50e160f895
commit 902db62ec8
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2012-04-12 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
(-davCalendarComponentSet): componentSet is now an ivar. Include
VTODO only with showCalendarTasks returns YES.
* UI/Scheduler/UIxCalListingActions.m
(_fetchFields:forComponentOfType:): do not check for
"showCalendarTasks" since it is now handled at the

2
SoObjects/Appointments/SOGoAppointmentFolder.h
View File

@@ -49,6 +49,7 @@
@class NSTimeZone;
@class GCSFolder;
@class iCalCalendar;
@class SOGoWebDAVValue;
typedef enum {
SOGoAppointmentProxyPermissionNone = 0,
@@ -66,6 +67,7 @@ typedef enum {
int davTimeLimitSeconds;
int davTimeHalfLimitSeconds;
BOOL userCanAccessObjectsClassifiedAs[iCalAccessClassCount];
SOGoWebDAVValue *componentSet;
}
- (BOOL) isActive;

13
SoObjects/Appointments/SOGoAppointmentFolder.m
View File

@@ -263,6 +263,7 @@ static NSNumber *sharedYes = nil;
/* 86400 / 2 = 43200. We hardcode that value in order to avoid
integer and float confusion. */
davTimeHalfLimitSeconds = davCalendarStartTimeLimit * 43200;
componentSet = nil;
}
return self;
@@ -273,6 +274,7 @@ static NSNumber *sharedYes = nil;
[aclMatrix release];
[stripFields release];
[uidToFilename release];
[componentSet release];
[super dealloc];
}
@@ -2037,27 +2039,28 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
- (SOGoWebDAVValue *) davCalendarComponentSet
{
static SOGoWebDAVValue *componentSet = nil;
NSMutableArray *components;
if (!componentSet)
{
components = [NSMutableArray array];
components = [[NSMutableArray alloc] initWithCapacity: 2];
/* Totally hackish.... we use the "n1" prefix because we know our
extensions will assign that one to ..:caldav but we really need to
handle element attributes */
[components addObject: [SOGoWebDAVValue
valueForObject: @"<n1:comp name=\"VEVENT\"/>"
attributes: nil]];
[components addObject: [SOGoWebDAVValue
valueForObject: @"<n1:comp name=\"VTODO\"/>"
attributes: nil]];
if ([self showCalendarTasks])
[components addObject: [SOGoWebDAVValue
valueForObject: @"<n1:comp name=\"VTODO\"/>"
attributes: nil]];
componentSet
= [davElementWithContent (@"supported-calendar-component-set",
XMLNS_CALDAV,
components)
asWebDAVValue];
[componentSet retain];
[components release];
}
return componentSet;