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

merge of '0750a53ed5f3840d792633c143fd51e07040d486' 

and 'c7ad331417d6c2767578747a293dae8820497511'

Monotone-Parent: 0750a53ed5f3840d792633c143fd51e07040d486
Monotone-Parent: c7ad331417d6c2767578747a293dae8820497511
Monotone-Revision: 5f797d0ee49e0c4a8db09057f193305ea618291c

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-26T18:30:28
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2009-10-26 18:30:28 +00:00
parent c38cb5200d daba82aa37
commit 98c0419a24
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -12,6 +12,8 @@
* Updated the Mobile Device Configuration Guide
in order to document the iPhone OS 3.x configuration
settings (iPhone / iPod)
* UI/Scheduler/UIxComponentEditor.m (_handleCustomRRule:)
Improved the robustness of the code.
2009-10-24 Ludovic Marcotte <lmarcotte@inverse.ca>

31
UI/Scheduler/UIxComponentEditor.m
View File

@ -1639,22 +1639,23 @@ RANGE(2);
//
case 0:
{
if ([[self repeat2] intValue] > 0)
[theRule setFrequency: iCalRecurrenceFrequenceDaily];
if ([[self repeat1] intValue] > 0)
{
[theRule setFrequency: iCalRecurrenceFrequenceDaily];
if ([[self repeat1] intValue] == 0)
{
[theRule setInterval: [self repeat2]];
}
else
{
[theRule setByDayMask: (iCalWeekDayMonday
|iCalWeekDayTuesday
|iCalWeekDayWednesday
|iCalWeekDayThursday
|iCalWeekDayFriday)];
}
[theRule setByDayMask: (iCalWeekDayMonday
|iCalWeekDayTuesday
|iCalWeekDayWednesday
|iCalWeekDayThursday
|iCalWeekDayFriday)];
}
else
{
// Make sure we haven't received any junk....
if ([[self repeat2] intValue] < 1)
[self setRepeat2: @"1"];
[theRule setInterval: [self repeat2]];
}
}
break;