amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-23 19:04:18 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 0dc509f442891adef0778315e5f3971fb4576203

Browse Source 
Monotone-Revision: dd017bbdddea8d5340182a7bc5439bfd1c8fd312

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-16T21:45:19
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-04-16 21:45:19 +00:00
parent 7d131982d0
commit 696108bc77
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+4
View File
@@ -1,5 +1,9 @@
2010-04-16 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoCalendarComponent.m
(-lookupOccurence:): the looked up occurrence might be the master
event.
* UI/WebServerResources/UIxMailPopupView.js (initPopupMailer): we
assign window.messageUID from here now (by concatenating
"mailboxName" and "messageName", as it will disappear if the
SoObjects/Appointments/SOGoCalendarComponent.m
+5 -1
View File
@@ -257,7 +257,8 @@
return iCalString;
}
static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID)
static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence,
NSString *recID)
{
unsigned int seconds, recSeconds;
@@ -290,6 +291,9 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence, NSStr
count++;
}
}
else if (_occurenceHasID (component, recID))
/* The "master" event could be that occurrence. */
occurence = component;
return occurence;
}