Monotone-Parent: 0e8b32d9c70c2ce26b1625a032639e96a5e907a9

Monotone-Revision: 3edbc90046db007b2cea7d85505ba6bcecec6dd7 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-07-04T16:06:09 Monotone-Branch: ca.inverse.sogo
2008-07-04 16:06:09 +00:00 · 2008-07-04 16:06:09 +00:00 · acfedae126
parent fc88f88fff
commit acfedae126
44 changed files with 81 additions and 10 deletions
--- a/Main/SOGo.m
+++ b/Main/SOGo.m
@ -22,6 +22,7 @@
 #import <Foundation/NSDebug.h>
 #import <Foundation/NSData.h>
 #import <Foundation/NSDate.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSProcessInfo.h>
 #import <Foundation/NSRunLoop.h>
 #import <Foundation/NSURL.h>
--- a/OGoContentStore/test_quick_extract.m
+++ b/OGoContentStore/test_quick_extract.m
@ -21,6 +21,7 @@


 #import <Foundation/NSArray.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSObject.h>
 #import <Foundation/NSProcessInfo.h>
--- a/SOPE/NGCards/CardElement.m
+++ b/SOPE/NGCards/CardElement.m
@ -22,6 +22,7 @@

 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSRange.h>
 #import <Foundation/NSString.h>

--- a/SOPE/NGCards/CardGroup.m
+++ b/SOPE/NGCards/CardGroup.m
@ -22,7 +22,9 @@

 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
+
 #import <SaxObjC/SaxXMLReader.h>
 #import <SaxObjC/SaxXMLReaderFactory.h>

--- a/SOPE/NGCards/CardVersitRenderer.m
+++ b/SOPE/NGCards/CardVersitRenderer.m
@ -21,6 +21,7 @@
 */

 #import <Foundation/NSArray.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>

--- a/SOPE/NGCards/NGCardsSaxHandler.m
+++ b/SOPE/NGCards/NGCardsSaxHandler.m
@ -21,6 +21,8 @@

 #import <string.h>
 #import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>

 #import "NSString+NGCards.h"
--- a/SOPE/NGCards/NSArray+NGCards.m
+++ b/SOPE/NGCards/NSArray+NGCards.m
@ -20,6 +20,7 @@
 * Boston, MA 02111-1307, USA.
 */

+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>

 #import "CardElement.h"
--- a/SOPE/NGCards/NSString+NGCards.m
+++ b/SOPE/NGCards/NSString+NGCards.m
@ -22,8 +22,10 @@

 #import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSRange.h>
 #import <Foundation/NSTimeZone.h>
+
 #import <NGExtensions/NSObject+Logs.h>

 #import <ctype.h>
--- a/SOPE/NGCards/iCalRecurrenceCalculator.m
+++ b/SOPE/NGCards/iCalRecurrenceCalculator.m
@ -19,6 +19,8 @@
  02111-1307, USA.
 */

+#import <Foundation/NSEnumerator.h>
+
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NGCalendarDateRange.h>
 #import <NGExtensions/NSNull+misc.h>
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@ -20,6 +20,7 @@
 */

 #import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSURL.h>
 #import <Foundation/NSUserDefaults.h>
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@ -19,6 +19,8 @@
  02111-1307, USA.
 */

+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSCalendarDate.h>

 #import <NGObjWeb/NSException+HTTP.h>
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@ -20,6 +20,8 @@
 * Boston, MA 02111-1307, USA.
 */

+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h>

@ -267,7 +269,7 @@ static BOOL sendEMailNotifications = NO;
  NGMimeBodyPart *bodyPart;
  NGMimeMultipartBody *body;

-  if (sendEMailNotifications 
+  if (sendEMailNotifications
      && [_newObject isStillRelevant])
    {
      count = [_attendees count];
--- 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 <SOGo/SOGoUserFolder.h>

@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

--- a/SoObjects/Appointments/SOGoUserFolder+Appointments.m
+++ b/SoObjects/Appointments/SOGoUserFolder+Appointments.m
@ -21,12 +21,21 @@
 */

 #import <Foundation/NSArray.h>
+#import <Foundation/NSEnumerator.h>
+
 #import <NGObjWeb/WOContext+SoObjects.h>

 #import <SOGo/SOGoUser.h>

 #import "SOGoUserFolder+Appointments.h"

+@interface SOGoUserFolder (private)
+
+- (SOGoAppointmentFolders *) privateCalendars: (NSString *) key
+				    inContext: (WOContext *) localContext;
+
+@end
+
@implementation SOGoUserFolder (SOGoCalDAVSupport)

 - (NSArray *) davCalendarUserAddressSet
--- a/SoObjects/Appointments/iCalEntityObject+SOGo.m
+++ b/SoObjects/Appointments/iCalEntityObject+SOGo.m
@ -22,6 +22,7 @@

 #import <Foundation/NSArray.h>
 #import <Foundation/NSEnumerator.h>
+#import <Foundation/NSString.h>

 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalPerson.h>
--- a/SoObjects/Contacts/SOGoContactGCSFolder.m
+++ b/SoObjects/Contacts/SOGoContactGCSFolder.m
@ -20,6 +20,7 @@
 */

 #import <Foundation/NSArray.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>

 #import <NGObjWeb/NSException+HTTP.h>
--- a/SoObjects/Contacts/SOGoContactLDAPFolder.m
+++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m
@ -22,6 +22,7 @@

 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>

 #import <NGObjWeb/NSException+HTTP.h>
--- a/SoObjects/Contacts/SOGoFolder+CardDAV.m
+++ b/SoObjects/Contacts/SOGoFolder+CardDAV.m
@ -21,6 +21,8 @@
 */

 #import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>

 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest.h>
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@ -20,6 +20,7 @@
 */

 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSURL.h>
 #import <Foundation/NSUserDefaults.h>

--- a/SoObjects/Mailer/SOGoMailObject+Draft.m
+++ b/SoObjects/Mailer/SOGoMailObject+Draft.m
@ -21,6 +21,8 @@
 */

 #import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>

 #import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOResponse.h>
--- a/SoObjects/SOGo/LDAPUserManager.m
+++ b/SoObjects/SOGo/LDAPUserManager.m
@ -22,6 +22,7 @@

 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSTimer.h>
 #import <Foundation/NSUserDefaults.h>
--- a/SoObjects/SOGo/NSArray+DAV.m
+++ b/SoObjects/SOGo/NSArray+DAV.m
@ -20,6 +20,9 @@
 * Boston, MA 02111-1307, USA.
 */

+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSString.h>
+
 #import "NSObject+DAV.h"

 #import "NSArray+DAV.h"
--- a/SoObjects/SOGo/NSArray+Utilities.m
+++ b/SoObjects/SOGo/NSArray+Utilities.m
@ -20,6 +20,8 @@
 * Boston, MA 02111-1307, USA.
 */

+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSNull.h>
 #import <Foundation/NSString.h>

--- a/SoObjects/SOGo/NSDictionary+Utilities.m
+++ b/SoObjects/SOGo/NSDictionary+Utilities.m
@ -22,6 +22,7 @@

 #import <Foundation/NSArray.h>
 #import <Foundation/NSData.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSNull.h>
 #import <Foundation/NSString.h>

--- a/SoObjects/SOGo/SOGoCache.m
+++ b/SoObjects/SOGo/SOGoCache.m
@ -21,6 +21,8 @@
 */

 #import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>

 #import <NGObjWeb/SoObject.h>

--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@ -21,6 +21,8 @@
 */

 #import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>

--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@ -24,6 +24,7 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSException.h>
 #import <Foundation/NSKeyValueCoding.h>
 #import <Foundation/NSURL.h>
@ -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];
--- a/SoObjects/SOGo/SOGoParentFolder.m
+++ b/SoObjects/SOGo/SOGoParentFolder.m
@ -21,6 +21,7 @@
 */

 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h>

--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@ -20,6 +20,8 @@
 */

 #import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSNull.h>
 #import <Foundation/NSTimeZone.h>
 #import <Foundation/NSUserDefaults.h>
--- a/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SoObjects/SOGo/SOGoUserFolder.m
@ -20,6 +20,7 @@
 */

 #import <Foundation/NSArray.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>

--- a/SoObjects/SOGo/SOGoWebDAVAclManager.m
+++ b/SoObjects/SOGo/SOGoWebDAVAclManager.m
@ -21,6 +21,7 @@
 */

 #import <Foundation/NSArray.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>

--- a/UI/Common/UIxAclEditor.m
+++ b/UI/Common/UIxAclEditor.m
@ -22,7 +22,9 @@

 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSKeyValueCoding.h>
+
 #import <NGObjWeb/SoUser.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/SoSecurityManager.h>
--- a/UI/Common/common.h
+++ b/UI/Common/common.h
@ -19,6 +19,9 @@
  02111-1307, USA.
 */

+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
+
 #import <NGObjWeb/WOAssociation.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WODynamicElement.h>
--- a/UI/Contacts/UIxContactFoldersView.m
+++ b/UI/Contacts/UIxContactFoldersView.m
@ -20,6 +20,8 @@
 * Boston, MA 02111-1307, USA.
 */

+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h>

--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@ -22,6 +22,7 @@

 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSKeyValueCoding.h>
 #import <Foundation/NSValue.h>

--- a/UI/MailPartViewers/UIxMailPartViewer.m
+++ b/UI/MailPartViewers/UIxMailPartViewer.m
@ -21,6 +21,7 @@

 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>

 #import <NGExtensions/NGBase64Coding.h>
 #import <NGExtensions/NSNull+misc.h>
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@ -28,6 +28,7 @@

 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSTimeZone.h>
 #import <Foundation/NSValue.h>

--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@ -19,6 +19,7 @@
  02111-1307, USA.
 */

+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSValue.h>

--- a/UI/MailerUI/UIxMailToSelection.m
+++ b/UI/MailerUI/UIxMailToSelection.m
@ -19,6 +19,9 @@
 02111-1307, USA.
 */

+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
+
 #import <NGObjWeb/WORequest.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGMail/NGMailAddress.h>
--- a/UI/MainUI/SOGoUserHomePage.m
+++ b/UI/MainUI/SOGoUserHomePage.m
@ -23,6 +23,7 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSURL.h>
 #import <Foundation/NSTimeZone.h>
 #import <Foundation/NSUserDefaults.h>
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@ -21,6 +21,7 @@

 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSException.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSKeyValueCoding.h>
 #import <Foundation/NSPathUtilities.h>
--- a/UI/Scheduler/NSArray+Scheduler.m
+++ b/UI/Scheduler/NSArray+Scheduler.m
@ -21,8 +21,11 @@
 */

 #import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSNull.h>
 #import <Foundation/NSValue.h>
+
 #import <NGExtensions/NGCalendarDateRange.h>

 #import "NSArray+Scheduler.h"
--- a/UI/Scheduler/UIxCalMulticolumnDayView.m
+++ b/UI/Scheduler/UIxCalMulticolumnDayView.m
@ -22,6 +22,7 @@

 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSValue.h>
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@ -22,6 +22,7 @@

 #import <Foundation/NSArray.h>
 #import <Foundation/NSBundle.h>
+#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSException.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSKeyValueCoding.h>