merge of '3d5669e86bbeab76360e6a880abf55736dec22e1'

and 'fa3da496f8fda4380291c10cbb009ed34be0c475'

Monotone-Parent: 3d5669e86bbeab76360e6a880abf55736dec22e1
Monotone-Parent: fa3da496f8fda4380291c10cbb009ed34be0c475
Monotone-Revision: 8dae20e5ee74408ab84e7a8148f380c92b636521

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-04-07T15:36:26
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle committed 2010-04-07 15:36:26 +00:00
commit 19f531c9f8
5 files changed
+118 -88

No files matched your search

+16 -11
View File
@@ -79,24 +79,29 @@
SOGoAppointmentObject *eventObject;
NSArray *folders;
NSEnumerator *e;
NSString *cname;
NSString *cname, *userLogin;
eventObject = nil;
userLogin = [user login];
folders = [[user calendarsFolderInContext: context] subFolders];
e = [folders objectEnumerator];
while ( eventObject == nil && (folder = [e nextObject]) )
while (eventObject == nil && (folder = [e nextObject]))
{
cname = [folder resourceNameForEventUID: uid];
if (cname)
{
eventObject = [folder lookupName: cname
inContext: context acquire: NO];
if (![eventObject isKindOfClass: [SOGoAppointmentObject class]])
eventObject = nil;
}
if ([[folder ownerInContext: nil] isEqualToString: userLogin])
{
cname = [folder resourceNameForEventUID: uid];
if (cname)
{
eventObject = [folder lookupName: cname inContext: context
acquire: NO];
if (![eventObject isKindOfClass: [NSException class]])
eventObject = nil;
}
}
}
if (!eventObject)
{
folder = [user personalCalendarFolderInContext: context];