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

merge of '344c60c460c2ec1cb8f2adfd4f4e2af9da772e4a' 

and '90e0a15d1fa7861aebb988530cf5503d63b9b9c0'

Monotone-Parent: 344c60c460c2ec1cb8f2adfd4f4e2af9da772e4a
Monotone-Parent: 90e0a15d1fa7861aebb988530cf5503d63b9b9c0
Monotone-Revision: 00a98c9420d949b7f4dccea479d8d3d83154bdf4

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-07-24T18:48:15
maint-2.0.2
Francis Lachapelle 2012-07-24 18:48:15 +00:00
parent 0a2201d7e5 dbdba16168
commit 7d5f8665c8
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SoObjects/Appointments/SOGoCalendarComponent.m
View File

@ -289,6 +289,7 @@
iCalCalendar *calendar;
NSCalendarDate *recDate;
NSTimeZone *timeZone;
iCalPerson *organizer;
recDate = [NSCalendarDate dateWithTimeIntervalSince1970: [recID intValue]];
masterOccurence = [self component: NO secure: NO];
@ -298,11 +299,17 @@
if ([masterOccurence doesOccurOnDate: recDate])
{
newOccurence = [masterOccurence mutableCopy];
organizer = [masterOccurence organizer];
[newOccurence autorelease];
[newOccurence removeAllRecurrenceRules];
[newOccurence removeAllExceptionRules];
[newOccurence removeAllExceptionDates];
[newOccurence setOrganizer: nil];
// It is important to set the organizer as some DAV clients (iCal
// and Thunderbird 10/Lightning 1.2) will prompt the event "edition"
// dialog instead of the event "invitation" (for accept/decline/tentative)
// if the organizer isn't found in a specific recurrence
[newOccurence setOrganizer: organizer];
[newOccurence setRecurrenceId: recDate];
calendar = [masterOccurence parent];