merge of '31bc4f6b49316e2603b7496cfee3b18fdd5e490f'

and '5244339e45ef9095573b10733228f85b81a17377'

Monotone-Parent: 31bc4f6b49316e2603b7496cfee3b18fdd5e490f
Monotone-Parent: 5244339e45ef9095573b10733228f85b81a17377
Monotone-Revision: 4437a82e041d016710ea3a45d8b7cf5b6341afff

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-13T21:08:25
Monotone-Branch: ca.inverse.sogo

SoObjects/Appointments/SOGoAppointmentObject.m

@@ -813,7 +813,7 @@
       
       if (removeDelegate)
 	{
-	  delegates = [NSMutableArray new];
+	  delegates = [NSMutableArray array];
 
 	  while (otherDelegate)
 	    {
@@ -846,7 +846,6 @@
 	  [self sendReceiptEmailUsingTemplateNamed: @"Deletion"
 					 forObject: event
 						to: delegates];
-	  [delegates release];
 	}
 
       if (addDelegate)
@@ -939,7 +938,7 @@
   NSMutableArray *element;
   NSDictionary *code;
 
-  element = [NSMutableArray new];
+  element = [NSMutableArray array];
   [element addObject: davElementWithContent (@"recipient", XMLNS_CALDAV,
 					     recipient)];
   [element addObject: davElementWithContent (@"request-status",
@@ -947,7 +946,6 @@
 					     @"2.0;Success")];
   code = davElementWithContent (@"response", XMLNS_CALDAV,
 				element);
-  [element release];
 
   return code;
 }

SoObjects/Appointments/SOGoUserFolder+Appointments.m

@@ -327,10 +327,10 @@
   NSMutableArray *response, *props;
   NSDictionary *keyTuple;
 
-  response = [NSMutableArray new];
+  response = [NSMutableArray array];
   [response addObject: davElementWithContent (@"href", XMLNS_WEBDAV,
 					      [collection davURL])];
-  props = [NSMutableArray new];
+  props = [NSMutableArray array];
   max = [properties count];
   for (count = 0; count < max; count++)
     {
@@ -360,8 +360,6 @@
 					       props))];
   [responses addObject: davElementWithContent (@"response", XMLNS_WEBDAV,
 					       response)];
-  [props release];
-  [response release];
 }
 
 - (void) _appendProperties: (NSArray *) properties
@@ -396,16 +394,14 @@
   document = [[context request] contentAsDOMDocument];
   documentElement = [document documentElement];
 
-  matches = [NSMutableDictionary new];
-  properties = [NSMutableArray new];
+  matches = [NSMutableDictionary dictionary];
+  properties = [NSMutableArray array];
   [self _fillPrincipalMatches: matches andProperties: properties
 	fromElement: documentElement];
   collections = [self _principalCollectionsMatching: matches];
   r = [self _prepareResponseFromContext: queryContext];
   [self _appendProperties: properties ofCollections: collections
 	toResponse: r];
-  [properties release];
-  [matches release];
 
   return r;
 //        @"<D:response><D:href>/SOGo/dav/wsourdeau/</D:href>"

SoObjects/Contacts/SOGoFolder+CardDAV.m

@@ -94,8 +94,7 @@
       if ([(NSArray *) ranges count]
 	  && [(NSArray *) [[ranges objectAtIndex: 0] childNodes] count])
 	{
-	  filterData = [NSMutableDictionary new];
-	  [filterData autorelease];
+	  filterData = [NSMutableDictionary dictionary];
 	  [filterData setObject: [[(NSArray *)[[ranges objectAtIndex: 0] childNodes] lastObject] data]
 		      forKey: [filterElement attribute: @"name"]];
 	}

SoObjects/Mailer/SOGoDraftObject.m

@@ -263,7 +263,7 @@ static BOOL        showTextAttachmentsInline  = NO;
 
   if ([self _ensureDraftFolderPath])
     {
-      infos = [NSMutableDictionary new];		
+      infos = [NSMutableDictionary dictionary];
       [infos setObject: headers forKey: @"headers"];
       if (text)
 	[infos setObject: text forKey: @"text"];
@@ -287,8 +287,6 @@ static BOOL        showTextAttachmentsInline  = NO;
 	  error = [NSException exceptionWithHTTPStatus:500 /* server error */
 			       reason: @"could not write draft info!"];
 	}
-
-      [infos release];
     }
   else
     {
@@ -470,13 +468,13 @@ static BOOL        showTextAttachmentsInline  = NO;
   NSMutableArray *to, *addrs, *allRecipients;
   NSArray *envelopeAddresses, *userEmails;
 
-  allRecipients = [NSMutableArray new];
+  allRecipients = [NSMutableArray array];
   userEmails = [[context activeUser] allEmails];
   [allRecipients addObjectsFromArray: userEmails];
 
   to = [NSMutableArray arrayWithCapacity: 2];
 
-  addrs = [NSMutableArray new];
+  addrs = [NSMutableArray array];
   envelopeAddresses = [_envelope replyTo];
   if ([envelopeAddresses count])
     [addrs setArray: envelopeAddresses];
@@ -530,9 +528,6 @@ static BOOL        showTextAttachmentsInline  = NO;
 
       [to release];
     }
-
-  [allRecipients release];
-  [addrs release];
 }
 
 - (NSArray *) _attachmentBodiesFromPaths: (NSArray *) paths

SoObjects/Mailer/SOGoMailFolder.m

@@ -213,8 +213,7 @@ static NSString *spoolFolder = nil;
   NSArray *result;
   NSString *currentFolderName, *prefix;
 
-  deepSubfolders = [NSMutableArray new];
-  [deepSubfolders autorelease];
+  deepSubfolders = [NSMutableArray array];
 
   prefix = [self absoluteImap4Name];
 
@@ -1174,12 +1173,12 @@ static NSString *spoolFolder = nil;
 
 - (NSArray *) _sortOrderingsFromSortElement: (DOMElement *) sortElement
 {
+  static NSMutableDictionary *criteriasMap = nil;
   NSArray *davSortCriterias;
   NSMutableArray *sortOrderings;
   SEL sortOrderingOrder;
   NSString *davSortVerb, *imapSortVerb;
   EOSortOrdering *currentOrdering;
-  static NSMutableDictionary *criteriasMap = nil;
   int count, max;
 
   if (!criteriasMap)

SoObjects/Mailer/SOGoMailObject+Draft.m

@@ -155,7 +155,7 @@
 
   acceptedTypes
     = [NSArray arrayWithObjects: @"text/plain", @"text/html", nil];
-  keys = [NSMutableArray new];
+  keys = [NSMutableArray array];
   [self addRequiredKeysOfStructure: [self bodyStructure]
 	path: @"" toArray: keys acceptedTypes: acceptedTypes];
 

SoObjects/SOGo/LDAPSource.m

@@ -196,6 +196,7 @@ static NSLock *lock;
   [sourceID release];
   [modulesConstraints release];
   [_scope release];
+  [searchAttributes release];
   [super dealloc];
 }
 

SoObjects/SOGo/NSArray+Utilities.m

@@ -185,7 +185,7 @@
     }
   representation = [NSString stringWithFormat: @"[%@]",
 			     [jsonElements componentsJoinedByString: @", "]];
-  [jsonElements release];
+  [jsonElements autorelease];
 
   return representation;
 }

SoObjects/SOGo/SOGoGCSFolder.m

@@ -444,6 +444,7 @@ static NSArray *childRecordFields = nil;
   NSURL *folderLocation;
   NSString *sql;
 
+#warning SOGoFolder should have the corresponding method
   [displayName release];
   displayName = nil;