Fix for time offsets in month view (DST related).

Monotone-Parent: c1c4f8fa1e677ec974e669c16ee667a5040a4f0a
Monotone-Revision: 139de259dfc247ae1f4819f5700da66891c36157

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-07T17:40:02
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2009-10-07 17:40:02 +00:00
parent cea6118182
commit 52bc9fce36
2 changed files with 13 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2009-10-07 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxCalListingActions.m
(-_fetchFields:forComponentOfType:): the _fixDate method must not
be called when in the month view.
2009-10-07 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolders.m

View File

@ -60,8 +60,8 @@
static NSArray *eventsFields = nil;
static NSArray *tasksFields = nil;
#define dayLength 86400
#define quarterLength 900
#define dayLength 86400
#define quarterLength 900
#define intervalSeconds 900
#define offsetHours 24 * 5
@ -354,7 +354,8 @@ static NSArray *tasksFields = nil;
[self _fixComponentTitle: newInfo withType: component];
// Possible improvement: only call _fixDates if event is recurrent
// or the view range span a daylight saving time change
[self _fixDates: newInfo];
if (dayBasedView)
[self _fixDates: newInfo];
[infos addObject: [newInfo objectsForKeys: fields
notFoundMarker: marker]];
}
@ -918,6 +919,7 @@ _computeBlocksPosition (NSArray *blocks)
NSArray *events, *event, *eventsBlocks;
NSMutableArray *allDayBlocks, *blocks, *currentDay;
NSNumber *eventNbr;
BOOL isAllDay;
[self _setupContext];
@ -931,7 +933,8 @@ _computeBlocksPosition (NSArray *blocks)
{
event = [events objectAtIndex: count];
eventNbr = [NSNumber numberWithUnsignedInt: count];
if (dayBasedView && [[event objectAtIndex: 7] boolValue])
isAllDay = [[event objectAtIndex: 7] boolValue];
if (dayBasedView && isAllDay)
[self _fillBlocks: allDayBlocks withEvent: event withNumber: eventNbr];
else
[self _fillBlocks: blocks withEvent: event withNumber: eventNbr];