See ChangeLog.

Monotone-Parent: 4822220bb92ce7ebcbd47af90d5aad37bb750ed0
Monotone-Revision: a7e7282f1911ceaff2a7f4f96320407cba1085cc

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-10-03T19:32:37
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-10-03 19:32:37 +00:00
parent 3234ee9a92
commit 10e3850d49
11 changed files with 234 additions and 34 deletions
+21 -10
View File
@@ -461,7 +461,8 @@
NSTimeZone *timeZone;
SOGoUserDefaults *ud;
SOGoCalendarComponent *co;
BOOL resetAlarm;
BOOL resetAlarm;
unsigned int snoozeAlarm;
[self event];
@@ -480,17 +481,27 @@
[componentCalendar retain];
}
resetAlarm = [[[context request] formValueForKey: @"resetAlarm"] boolValue];
if (resetAlarm && [event hasAlarms] && ![event hasRecurrenceRules])
if ([event hasAlarms] && ![event hasRecurrenceRules])
{
iCalAlarm *anAlarm;
iCalTrigger *aTrigger;
anAlarm = [[event alarms] objectAtIndex: 0];
aTrigger = [anAlarm trigger];
[aTrigger setValue: 0 ofAttribute: @"x-webstatus" to: @"triggered"];
[co saveComponent: event];
resetAlarm = [[[context request] formValueForKey: @"resetAlarm"] boolValue];
snoozeAlarm = [[[context request] formValueForKey: @"snoozeAlarm"] intValue];
if (resetAlarm)
{
iCalTrigger *aTrigger;
anAlarm = [[event alarms] objectAtIndex: 0];
aTrigger = [anAlarm trigger];
[aTrigger setValue: 0 ofAttribute: @"x-webstatus" to: @"triggered"];
[co saveComponent: event];
}
else if (snoozeAlarm)
{
anAlarm = [[event alarms] objectAtIndex: 0];
if ([[anAlarm action] caseInsensitiveCompare: @"DISPLAY"] == NSOrderedSame)
[co snoozeAlarm: snoozeAlarm];
}
}
data = [NSDictionary dictionaryWithObjectsAndKeys: