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

merge of '9e9ae5751a1a008c8b1986bd933c97f02aa65760' 

and 'c87ee0c01e17a1a47680ed6ca858c1e5bdcac411'

Monotone-Parent: 9e9ae5751a1a008c8b1986bd933c97f02aa65760
Monotone-Parent: c87ee0c01e17a1a47680ed6ca858c1e5bdcac411
Monotone-Revision: 7e6b126157fe6364467c441181458934b7c93347

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-02T20:03:25
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-04-02 20:03:25 +00:00
parent af23614cef 5a8b97d270
commit 31bd407c54
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,15 @@
2010-04-02 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Appointments/SOGoCalendarComponent.m
(-sendEMailUsingTemplateNamed:forObject:previousObject:toAttendees:):
when looking for the organizer email, we now rely on the previous
event when the organizer is not defined in the new event. This is
important when the organizer is deleting the only attendee of an event.
* UI/WebServerResources/SchedulerUI.js (onClickableCellsDblClick):
hack to ignore double-click in the scrollbar in the month view &
fix for Firefox.
2010-04-02 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Scheduler/UIxCalListingActions.m
@ -5,12 +17,6 @@
length of an event would happen after the period covered by the
freebusy.
2010-04-02 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/SchedulerUI.js (onClickableCellsDblClick):
hack to ignore double-click in the scrollbar in the month view &
fix for Firefox.
2010-03-31 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Tools/sogo-slapd-sockd.m, Tools/SOGoSockDOperation.m,

2
SoObjects/Appointments/SOGoCalendarComponent.m
View File

@ -677,6 +677,8 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence, NSStr
// senderEmail = [NSString stringWithFormat: @"%@ <%@>",
// [ownerUser cn], shortSenderEmail];
shortSenderEmail = [[object organizer] rfc822Email];
if (![shortSenderEmail length])
shortSenderEmail = [[previousObject organizer] rfc822Email];
senderEmail = [[object organizer] mailAddress];
// NSLog (@"sending '%@' from %@",
// [(iCalCalendar *) [object parent] method], senderEmail);