From 1cddd94359ad49ce965b65c174a418e15268d8ee Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 8 Aug 2011 18:52:17 +0000 Subject: [PATCH] Monotone-Parent: e41874875e49863ccd11d5bd0c7107d5d2a253a6 Monotone-Revision: f0ddaa98c894655eb2beb4809a2b6040a25ebf27 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-08-08T18:52:17 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Appointments/SOGoAppointmentFolder.m | 16 +++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b1ebe5f3..9291ee6fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-08-08 Wolfgang Sourdeau + * SoObjects/Appointments/SOGoAppointmentFolder.m + (-lookupCalendarFoldersForUID:): make use of -[SOGoUser + lookupCalendarFoldersForUID:]. + * SoObjects/Appointments/SOGoAppointmentObject.m (_handleAttendee:withDelegate:ownerUser:statusChange:inEvent:): enable updating the attendee's calendar when a WORequest is not diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 814d2d50f..95c81a274 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -2442,22 +2442,20 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir - (NSArray *) lookupCalendarFoldersForUID: (NSString *) theUID { NSArray *aFolders; + SOGoUser *theUser; NSEnumerator *e; NSMutableArray *aUserFolders; SOGoAppointmentFolders *aParent; - SOGoFolder *aContainer, *aFolder; + SOGoFolder *aFolder; aUserFolders = [NSMutableArray arrayWithCapacity: 16]; - aContainer = [[container container] container]; - aContainer = [aContainer lookupName: theUID - inContext: context - acquire: NO]; - aParent = [aContainer lookupName: @"Calendar" - inContext: context - acquire: NO]; + + theUser = [SOGoUser userWithLogin: theUID]; + aParent = [theUser calendarsFolderInContext: context]; + aFolders = [aParent subFolders]; e = [aFolders objectEnumerator]; - while ( (aFolder = [e nextObject]) ) + while ((aFolder = [e nextObject])) { if (![aFolder isSubscription]) [aUserFolders addObject: aFolder];