From acfedae126cffbca597c8c6cb0a3741ad17c8011 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 4 Jul 2008 16:06:09 +0000 Subject: [PATCH] Monotone-Parent: 0e8b32d9c70c2ce26b1625a032639e96a5e907a9 Monotone-Revision: 3edbc90046db007b2cea7d85505ba6bcecec6dd7 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-07-04T16:06:09 Monotone-Branch: ca.inverse.sogo --- Main/SOGo.m | 1 + OGoContentStore/test_quick_extract.m | 1 + SOPE/NGCards/CardElement.m | 1 + SOPE/NGCards/CardGroup.m | 2 ++ SOPE/NGCards/CardVersitRenderer.m | 1 + SOPE/NGCards/NGCardsSaxHandler.m | 2 ++ SOPE/NGCards/NSArray+NGCards.m | 1 + SOPE/NGCards/NSString+NGCards.m | 2 ++ SOPE/NGCards/iCalRecurrenceCalculator.m | 2 ++ SoObjects/Appointments/SOGoAppointmentFolder.m | 1 + SoObjects/Appointments/SOGoAppointmentObject.m | 2 ++ SoObjects/Appointments/SOGoCalendarComponent.m | 4 +++- SoObjects/Appointments/SOGoUserFolder+Appointments.h | 12 ++++++------ SoObjects/Appointments/SOGoUserFolder+Appointments.m | 9 +++++++++ SoObjects/Appointments/iCalEntityObject+SOGo.m | 1 + SoObjects/Contacts/SOGoContactGCSFolder.m | 1 + SoObjects/Contacts/SOGoContactLDAPFolder.m | 1 + SoObjects/Contacts/SOGoFolder+CardDAV.m | 2 ++ SoObjects/Mailer/SOGoMailFolder.m | 1 + SoObjects/Mailer/SOGoMailObject+Draft.m | 2 ++ SoObjects/SOGo/LDAPUserManager.m | 1 + SoObjects/SOGo/NSArray+DAV.m | 3 +++ SoObjects/SOGo/NSArray+Utilities.m | 2 ++ SoObjects/SOGo/NSDictionary+Utilities.m | 1 + SoObjects/SOGo/SOGoCache.m | 2 ++ SoObjects/SOGo/SOGoFolder.m | 2 ++ SoObjects/SOGo/SOGoGCSFolder.m | 5 ++--- SoObjects/SOGo/SOGoParentFolder.m | 1 + SoObjects/SOGo/SOGoUser.m | 2 ++ SoObjects/SOGo/SOGoUserFolder.m | 1 + SoObjects/SOGo/SOGoWebDAVAclManager.m | 1 + UI/Common/UIxAclEditor.m | 2 ++ UI/Common/common.h | 3 +++ UI/Contacts/UIxContactFoldersView.m | 2 ++ UI/MailPartViewers/UIxMailPartHTMLViewer.m | 1 + UI/MailPartViewers/UIxMailPartViewer.m | 1 + UI/MailerUI/UIxMailListView.m | 1 + UI/MailerUI/UIxMailMainFrame.m | 1 + UI/MailerUI/UIxMailToSelection.m | 3 +++ UI/MainUI/SOGoUserHomePage.m | 1 + UI/SOGoUI/UIxComponent.m | 1 + UI/Scheduler/NSArray+Scheduler.m | 3 +++ UI/Scheduler/UIxCalMulticolumnDayView.m | 1 + UI/Scheduler/UIxComponentEditor.m | 1 + 44 files changed, 81 insertions(+), 10 deletions(-) diff --git a/Main/SOGo.m b/Main/SOGo.m index 700f01103..c730785a4 100644 --- a/Main/SOGo.m +++ b/Main/SOGo.m @@ -22,6 +22,7 @@ #import #import #import +#import #import #import #import diff --git a/OGoContentStore/test_quick_extract.m b/OGoContentStore/test_quick_extract.m index eb728f833..8032b7b66 100644 --- a/OGoContentStore/test_quick_extract.m +++ b/OGoContentStore/test_quick_extract.m @@ -21,6 +21,7 @@ #import +#import #import #import #import diff --git a/SOPE/NGCards/CardElement.m b/SOPE/NGCards/CardElement.m index b3ccea5d4..5cc2e8c55 100644 --- a/SOPE/NGCards/CardElement.m +++ b/SOPE/NGCards/CardElement.m @@ -22,6 +22,7 @@ #import #import +#import #import #import diff --git a/SOPE/NGCards/CardGroup.m b/SOPE/NGCards/CardGroup.m index 330634964..d4e92de7a 100644 --- a/SOPE/NGCards/CardGroup.m +++ b/SOPE/NGCards/CardGroup.m @@ -22,7 +22,9 @@ #import #import +#import #import + #import #import diff --git a/SOPE/NGCards/CardVersitRenderer.m b/SOPE/NGCards/CardVersitRenderer.m index 523fddde5..d70b2db8e 100644 --- a/SOPE/NGCards/CardVersitRenderer.m +++ b/SOPE/NGCards/CardVersitRenderer.m @@ -21,6 +21,7 @@ */ #import +#import #import #import diff --git a/SOPE/NGCards/NGCardsSaxHandler.m b/SOPE/NGCards/NGCardsSaxHandler.m index 22aedebc3..dac998c94 100644 --- a/SOPE/NGCards/NGCardsSaxHandler.m +++ b/SOPE/NGCards/NGCardsSaxHandler.m @@ -21,6 +21,8 @@ #import #import +#import +#import #import #import "NSString+NGCards.h" diff --git a/SOPE/NGCards/NSArray+NGCards.m b/SOPE/NGCards/NSArray+NGCards.m index 694362174..12ea0d9d4 100644 --- a/SOPE/NGCards/NSArray+NGCards.m +++ b/SOPE/NGCards/NSArray+NGCards.m @@ -20,6 +20,7 @@ * Boston, MA 02111-1307, USA. */ +#import #import #import "CardElement.h" diff --git a/SOPE/NGCards/NSString+NGCards.m b/SOPE/NGCards/NSString+NGCards.m index 2c96e2bdc..24114cf20 100644 --- a/SOPE/NGCards/NSString+NGCards.m +++ b/SOPE/NGCards/NSString+NGCards.m @@ -22,8 +22,10 @@ #import #import +#import #import #import + #import #import diff --git a/SOPE/NGCards/iCalRecurrenceCalculator.m b/SOPE/NGCards/iCalRecurrenceCalculator.m index b946bdbca..b22bc45c8 100644 --- a/SOPE/NGCards/iCalRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalRecurrenceCalculator.m @@ -19,6 +19,8 @@ 02111-1307, USA. */ +#import + #import #import #import diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 6113fb50c..be529fc51 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -20,6 +20,7 @@ */ #import +#import #import #import #import diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index 71863150c..a09df057f 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -19,6 +19,8 @@ 02111-1307, USA. */ +#import +#import #import #import diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 4f68fac22..636193bb0 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -20,6 +20,8 @@ * Boston, MA 02111-1307, USA. */ +#import +#import #import #import @@ -267,7 +269,7 @@ static BOOL sendEMailNotifications = NO; NGMimeBodyPart *bodyPart; NGMimeMultipartBody *body; - if (sendEMailNotifications + if (sendEMailNotifications && [_newObject isStillRelevant]) { count = [_attendees count]; diff --git a/SoObjects/Appointments/SOGoUserFolder+Appointments.h b/SoObjects/Appointments/SOGoUserFolder+Appointments.h index d1edfa284..454499c72 100644 --- a/SoObjects/Appointments/SOGoUserFolder+Appointments.h +++ b/SoObjects/Appointments/SOGoUserFolder+Appointments.h @@ -24,18 +24,18 @@ #define SOGOUSERFOLDER_APPOINTMENTS_H @class NSArray; +@class NSString; #import @interface SOGoUserFolder (SOGoCalDAVSupport) - (NSArray *) davCalendarUserAddressSet; - -// - (NSArray *) davCalendarHomeSet -// - (NSArray *) davCalendarScheduleInboxURL -// - (NSString *) davCalendarScheduleOutboxURL -// - (NSString *) davDropboxHomeURL -// - (NSString *) davNotificationsURL +- (NSArray *) davCalendarHomeSet; +- (NSArray *) davCalendarScheduleInboxURL; +- (NSString *) davCalendarScheduleOutboxURL; +- (NSString *) davDropboxHomeURL; +- (NSString *) davNotificationsURL; @end diff --git a/SoObjects/Appointments/SOGoUserFolder+Appointments.m b/SoObjects/Appointments/SOGoUserFolder+Appointments.m index 3eacc3acc..8c2bea876 100644 --- a/SoObjects/Appointments/SOGoUserFolder+Appointments.m +++ b/SoObjects/Appointments/SOGoUserFolder+Appointments.m @@ -21,12 +21,21 @@ */ #import +#import + #import #import #import "SOGoUserFolder+Appointments.h" +@interface SOGoUserFolder (private) + +- (SOGoAppointmentFolders *) privateCalendars: (NSString *) key + inContext: (WOContext *) localContext; + +@end + @implementation SOGoUserFolder (SOGoCalDAVSupport) - (NSArray *) davCalendarUserAddressSet diff --git a/SoObjects/Appointments/iCalEntityObject+SOGo.m b/SoObjects/Appointments/iCalEntityObject+SOGo.m index 83cd25a58..faa0425fc 100644 --- a/SoObjects/Appointments/iCalEntityObject+SOGo.m +++ b/SoObjects/Appointments/iCalEntityObject+SOGo.m @@ -22,6 +22,7 @@ #import #import +#import #import #import diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m index ba2ed5e05..92814703a 100644 --- a/SoObjects/Contacts/SOGoContactGCSFolder.m +++ b/SoObjects/Contacts/SOGoContactGCSFolder.m @@ -20,6 +20,7 @@ */ #import +#import #import #import diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m index e01d08af5..3e28d9230 100644 --- a/SoObjects/Contacts/SOGoContactLDAPFolder.m +++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m @@ -22,6 +22,7 @@ #import #import +#import #import #import diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.m b/SoObjects/Contacts/SOGoFolder+CardDAV.m index bc2518a90..1b943916e 100644 --- a/SoObjects/Contacts/SOGoFolder+CardDAV.m +++ b/SoObjects/Contacts/SOGoFolder+CardDAV.m @@ -21,6 +21,8 @@ */ #import +#import +#import #import #import diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m index 41ef8c725..ba44d771a 100644 --- a/SoObjects/Mailer/SOGoMailFolder.m +++ b/SoObjects/Mailer/SOGoMailFolder.m @@ -20,6 +20,7 @@ */ #import +#import #import #import diff --git a/SoObjects/Mailer/SOGoMailObject+Draft.m b/SoObjects/Mailer/SOGoMailObject+Draft.m index ee5425613..31e5080e7 100644 --- a/SoObjects/Mailer/SOGoMailObject+Draft.m +++ b/SoObjects/Mailer/SOGoMailObject+Draft.m @@ -21,6 +21,8 @@ */ #import +#import +#import #import #import diff --git a/SoObjects/SOGo/LDAPUserManager.m b/SoObjects/SOGo/LDAPUserManager.m index 2bf442fce..f0668f386 100644 --- a/SoObjects/SOGo/LDAPUserManager.m +++ b/SoObjects/SOGo/LDAPUserManager.m @@ -22,6 +22,7 @@ #import #import +#import #import #import #import diff --git a/SoObjects/SOGo/NSArray+DAV.m b/SoObjects/SOGo/NSArray+DAV.m index ae70ad7f5..885f1294b 100644 --- a/SoObjects/SOGo/NSArray+DAV.m +++ b/SoObjects/SOGo/NSArray+DAV.m @@ -20,6 +20,9 @@ * Boston, MA 02111-1307, USA. */ +#import +#import + #import "NSObject+DAV.h" #import "NSArray+DAV.h" diff --git a/SoObjects/SOGo/NSArray+Utilities.m b/SoObjects/SOGo/NSArray+Utilities.m index 389b2a363..a2b212d3a 100644 --- a/SoObjects/SOGo/NSArray+Utilities.m +++ b/SoObjects/SOGo/NSArray+Utilities.m @@ -20,6 +20,8 @@ * Boston, MA 02111-1307, USA. */ +#import +#import #import #import diff --git a/SoObjects/SOGo/NSDictionary+Utilities.m b/SoObjects/SOGo/NSDictionary+Utilities.m index 485b9dfb2..ea604a8ed 100644 --- a/SoObjects/SOGo/NSDictionary+Utilities.m +++ b/SoObjects/SOGo/NSDictionary+Utilities.m @@ -22,6 +22,7 @@ #import #import +#import #import #import diff --git a/SoObjects/SOGo/SOGoCache.m b/SoObjects/SOGo/SOGoCache.m index 8a33c76cf..d956ccd2d 100644 --- a/SoObjects/SOGo/SOGoCache.m +++ b/SoObjects/SOGo/SOGoCache.m @@ -21,6 +21,8 @@ */ #import +#import +#import #import diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m index 3dbbcd551..ee66d7acb 100644 --- a/SoObjects/SOGo/SOGoFolder.m +++ b/SoObjects/SOGo/SOGoFolder.m @@ -21,6 +21,8 @@ */ #import +#import +#import #import #import diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index 728f39284..c32cec58e 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -24,6 +24,7 @@ #import #import #import +#import #import #import #import @@ -837,8 +838,7 @@ static NSArray *childRecordFields = nil; folder = [self ocsFolder]; channel = [folder acquireAclChannel]; userRoles = [roles objectEnumerator]; - currentRole = [userRoles nextObject]; - while (currentRole) + while ((currentRole = [userRoles nextObject])) { SQL = [NSString stringWithFormat: @"INSERT INTO %@" @" (c_object, c_uid, c_role)" @@ -846,7 +846,6 @@ static NSArray *childRecordFields = nil; [folder aclTableName], objectPath, uid, currentRole]; [channel evaluateExpressionX: SQL]; - currentRole = [userRoles nextObject]; } [folder releaseChannel: channel]; diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m index 58214cf3d..fc813b8a8 100644 --- a/SoObjects/SOGo/SOGoParentFolder.m +++ b/SoObjects/SOGo/SOGoParentFolder.m @@ -21,6 +21,7 @@ */ #import +#import #import #import diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m index cfefd1dd4..f09f18cf8 100644 --- a/SoObjects/SOGo/SOGoUser.m +++ b/SoObjects/SOGo/SOGoUser.m @@ -20,6 +20,8 @@ */ #import +#import +#import #import #import #import diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m index 38ea2a446..6c1360ca7 100644 --- a/SoObjects/SOGo/SOGoUserFolder.m +++ b/SoObjects/SOGo/SOGoUserFolder.m @@ -20,6 +20,7 @@ */ #import +#import #import #import diff --git a/SoObjects/SOGo/SOGoWebDAVAclManager.m b/SoObjects/SOGo/SOGoWebDAVAclManager.m index ad576d710..9ef388c2b 100644 --- a/SoObjects/SOGo/SOGoWebDAVAclManager.m +++ b/SoObjects/SOGo/SOGoWebDAVAclManager.m @@ -21,6 +21,7 @@ */ #import +#import #import #import diff --git a/UI/Common/UIxAclEditor.m b/UI/Common/UIxAclEditor.m index f5ae49976..eeb2a909e 100644 --- a/UI/Common/UIxAclEditor.m +++ b/UI/Common/UIxAclEditor.m @@ -22,7 +22,9 @@ #import #import +#import #import + #import #import #import diff --git a/UI/Common/common.h b/UI/Common/common.h index 2a816fbb1..84e6333dc 100644 --- a/UI/Common/common.h +++ b/UI/Common/common.h @@ -19,6 +19,9 @@ 02111-1307, USA. */ +#import +#import + #import #import #import diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m index ed7a4e193..f6a2d1393 100644 --- a/UI/Contacts/UIxContactFoldersView.m +++ b/UI/Contacts/UIxContactFoldersView.m @@ -20,6 +20,8 @@ * Boston, MA 02111-1307, USA. */ +#import +#import #import #import diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m index 9123ca868..e9dbe7dec 100644 --- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m +++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m @@ -22,6 +22,7 @@ #import #import +#import #import #import diff --git a/UI/MailPartViewers/UIxMailPartViewer.m b/UI/MailPartViewers/UIxMailPartViewer.m index 4f3a177fb..9b5a9ff87 100644 --- a/UI/MailPartViewers/UIxMailPartViewer.m +++ b/UI/MailPartViewers/UIxMailPartViewer.m @@ -21,6 +21,7 @@ #import #import +#import #import #import diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m index 0fd7c291c..fb3f331d5 100644 --- a/UI/MailerUI/UIxMailListView.m +++ b/UI/MailerUI/UIxMailListView.m @@ -28,6 +28,7 @@ #import #import +#import #import #import diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m index dfd45ea48..691a2cfd7 100644 --- a/UI/MailerUI/UIxMailMainFrame.m +++ b/UI/MailerUI/UIxMailMainFrame.m @@ -19,6 +19,7 @@ 02111-1307, USA. */ +#import #import #import diff --git a/UI/MailerUI/UIxMailToSelection.m b/UI/MailerUI/UIxMailToSelection.m index 8e53fa40a..83aa7174b 100644 --- a/UI/MailerUI/UIxMailToSelection.m +++ b/UI/MailerUI/UIxMailToSelection.m @@ -19,6 +19,9 @@ 02111-1307, USA. */ +#import +#import + #import #import #import diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m index 7dac5b558..e67241118 100644 --- a/UI/MainUI/SOGoUserHomePage.m +++ b/UI/MainUI/SOGoUserHomePage.m @@ -23,6 +23,7 @@ #import #import #import +#import #import #import #import diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m index 9a29fe562..b64b5f02b 100644 --- a/UI/SOGoUI/UIxComponent.m +++ b/UI/SOGoUI/UIxComponent.m @@ -21,6 +21,7 @@ #import #import +#import #import #import #import diff --git a/UI/Scheduler/NSArray+Scheduler.m b/UI/Scheduler/NSArray+Scheduler.m index 5f24b7e2f..7508cda8a 100644 --- a/UI/Scheduler/NSArray+Scheduler.m +++ b/UI/Scheduler/NSArray+Scheduler.m @@ -21,8 +21,11 @@ */ #import +#import +#import #import #import + #import #import "NSArray+Scheduler.h" diff --git a/UI/Scheduler/UIxCalMulticolumnDayView.m b/UI/Scheduler/UIxCalMulticolumnDayView.m index 833f33e08..4d4bd4a7d 100644 --- a/UI/Scheduler/UIxCalMulticolumnDayView.m +++ b/UI/Scheduler/UIxCalMulticolumnDayView.m @@ -22,6 +22,7 @@ #import #import +#import #import #import #import diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m index c53b8d7d1..d9e136b1e 100644 --- a/UI/Scheduler/UIxComponentEditor.m +++ b/UI/Scheduler/UIxComponentEditor.m @@ -22,6 +22,7 @@ #import #import +#import #import #import #import