merge of 'a9673b6b7feb76572f80c31fe67ba936ed709f8f'

and 'b246c3979cba84d0c46cb39e0141ae390baaea7a'

Monotone-Parent: a9673b6b7feb76572f80c31fe67ba936ed709f8f
Monotone-Parent: b246c3979cba84d0c46cb39e0141ae390baaea7a
Monotone-Revision: dfb0905a14bcb6b22ea2b02eb9910b1e098aeaa9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-10-14T12:48:55
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -29,6 +29,20 @@
 
 2009-10-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxComponentEditor.m (-setComponent:): we invoke
+	_loadAttendee only when "jsonAttendees" is not set, even though
+	that condition should always be true.
+
+	* UI/PreferencesUI/UIxPreferences.m (-setCategoriesValue): we use
+	[self errorWithFormat:] rather than NSLog to output
+	deserialization errors.
+
+	* UI/Scheduler/UIxAppointmentEditor.m (-delegateAction): same as
+	below.
+
+	* UI/MailPartViewers/UIxMailPartICalActions.m (-delegateAction):
+	delegatedAttendee is autoreleased to avoid a leak.
+
 	* SoObjects/SOGo/LDAPSource.m (-dealloc): we release the
 	"searchAttributes" ivar, even though LDAPSource instances are
 	never deallocated.

UI/MailPartViewers/UIxMailPartICalActions.m

@@ -264,6 +264,7 @@
     {
       user = [context activeUser];
       delegatedAttendee = [iCalPerson new];
+      [delegatedAttendee autorelease];
       [delegatedAttendee setEmail: delegatedEmail];
       delegatedUid = [delegatedAttendee uid];
       if (delegatedUid)
@@ -272,7 +273,6 @@
 	  delegatedUser = [SOGoUser userWithLogin: delegatedUid];
 	  [delegatedAttendee setCn: [delegatedUser cn]];
 	}
-      
       [delegatedAttendee setRole: @"REQ-PARTICIPANT"];
       [delegatedAttendee setRsvp: @"TRUE"];
       [delegatedAttendee setParticipationStatus: iCalPersonPartStatNeedsAction];

UI/MainUI/SOGoUserHomePage.m

@@ -323,7 +323,7 @@ static NSString *LDAPContactInfoAttribute = nil;
   [response setHeader: @"text/plain; charset=utf-8"
 	    forKey: @"Content-Type"];
 
-  responseString = [NSMutableString new];
+  responseString = [NSMutableString string];
 
   // We sort our array - this is pretty useful for the Web
   // interface of SOGo.
@@ -353,7 +353,6 @@ static NSString *LDAPContactInfoAttribute = nil;
         }
     }
   [response appendContentString: responseString];
-  [responseString release];
 
   return response;
 }

UI/PreferencesUI/UIxPreferences.m

@@ -30,6 +30,8 @@
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest.h>
 
+#import <NGExtensions/NSObject+Logs.h>
+
 #import <SoObjects/SOGo/NSArray+Utilities.h>
 #import <SoObjects/SOGo/NSDictionary+Utilities.h>
 #import <SoObjects/SOGo/NSString+Utilities.h>
@@ -369,8 +371,7 @@ static BOOL forwardEnabled = NO;
   NSMutableArray *daysList;
   unsigned int currentDay;
 
-  daysList = [NSMutableArray new];
-  [daysList autorelease];
+  daysList = [NSMutableArray array];
   for (currentDay = 0; currentDay < 7; currentDay++)
     [daysList addObject: [NSString stringWithFormat: @"%d", currentDay]];
 
@@ -751,8 +752,7 @@ static BOOL forwardEnabled = NO;
   addressesList = [vacationOptions objectForKey: @"autoReplyEmailAddresses"];
   if (!addressesList)
     {
-      newAddressesList = [NSMutableArray new];
-      [newAddressesList autorelease];
+      newAddressesList = [NSMutableArray array];
       addressesList = [NSMutableArray arrayWithArray: [user allEmails]];
       for (i = 0; i < [addressesList count]; i++)
 	{
@@ -1031,10 +1031,10 @@ static BOOL forwardEnabled = NO;
                                            mutabilityOption: NSPropertyListImmutable
                                                      format: &format
                                            errorDescription: &error];
-  
-  if(!plist)
+  if (!plist)
     {
-      NSLog(error);
+      [self errorWithFormat: @"an error occured during deserialization"
+                             @" of categories: %@", error];
       [error release];
     }
   else
@@ -1044,7 +1044,6 @@ static BOOL forwardEnabled = NO;
       [userDefaults setObject: [plist objectAtIndex: 1] 
                        forKey: @"CalendarCategoriesColors"];
     }
-  
 }
 
 - (NSArray *) languages

UI/SOGoUI/SOGoAptFormatter.m

@@ -240,8 +240,7 @@
   NSCalendarDate *startDate;
   NSTimeZone *dtz;
 
-  title = [NSMutableString new];
-  [title autorelease];
+  title = [NSMutableString string];
 
   dtz        = [self displayTZ];
   startDate  = [_apt valueForKey: @"startDate"];

UI/Scheduler/UIxAppointmentEditor.m

@@ -547,6 +547,7 @@
     {
       user = [context activeUser];
       delegatedAttendee = [iCalPerson new];
+      [delegatedAttendee autorelease];
       [delegatedAttendee setEmail: delegatedEmail];
       delegatedUid = [delegatedAttendee uid];
       if (delegatedUid)

UI/Scheduler/UIxComponentEditor.m

@@ -550,7 +550,8 @@ iRANGE(2);
 	  ASSIGN (organizer, [component organizer]);
 	  
 	  [self _loadCategories];
-	  [self _loadAttendees];
+          if (!jsonAttendees)
+            [self _loadAttendees];
 	  [self _loadRRules];
 	  [self _loadAlarms];
 

UI/Scheduler/UIxTimeDateControl.m

@@ -176,9 +176,7 @@
   NSMutableArray *hours;
   unsigned int h;
 
-  hours = [NSMutableArray new];
-  [hours autorelease];
-
+  hours = [NSMutableArray array];
   for (h = startHour; h < (endHour + 1); h++)
     [hours addObject: [NSNumber numberWithInt: h]];
 
@@ -210,9 +208,7 @@
   NSMutableArray *minutes;
   unsigned int m;
 
-  minutes = [NSMutableArray new];
-  [minutes autorelease];
-
+  minutes = [NSMutableArray array];
   for (m = 0; m < 60; m += 15)
     [minutes addObject: [NSNumber numberWithInt: m]];