merge of '2b398c7917c2665525f315c4a078f13665aeea62'

and '9808a0781250c62da6dbd16dbd959fef199ace09'

Monotone-Parent: 2b398c7917c2665525f315c4a078f13665aeea62
Monotone-Parent: 9808a0781250c62da6dbd16dbd959fef199ace09
Monotone-Revision: 9718b3ccbc149f9b4b497423af72e8271ec7b624

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-14T19:27:54
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -10,6 +10,12 @@
 	(-_toolbarForOwner:andClientObject:): no toolbar should appear
 	when dealing with web calendars.
 
+2009-10-14  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* UI/Scheduler/UIxCalMainActions.m
+	We store the string value of the URL in our
+	prefs, not the NSURL instance.
+
 2009-10-13  Ludovic Marcotte  <lmarcotte@inverse.ca>
  
 	* SoObjects/SOGo/NSDictionary+BSJSONAdditions.m
@@ -41,6 +47,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.