merge of '5510a075ff0317a22da3bd5c546abb2ce9386a21'

and '8a165a32a6a836849e62e7fa408d15b5ce3c7a25'

Monotone-Parent: 5510a075ff0317a22da3bd5c546abb2ce9386a21
Monotone-Parent: 8a165a32a6a836849e62e7fa408d15b5ce3c7a25
Monotone-Revision: aac6a8a6798d9e703464623588abec8ba095b7e3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-10-25T15:29:13
Monotone-Branch: ca.inverse.sogo

UI/Scheduler/UIxComponentEditor.m

@@ -363,13 +363,13 @@
   return [calendars componentsJoinedByString: @","];
 }
 
-- (NSString *) componentCalendar
+- (SOGoAppointmentFolder *) componentCalendar
 {
   SOGoAppointmentFolder *calendar;
 
   calendar = [[self clientObject] container];
   
-  return [calendar nameInContainer];
+  return calendar;
 }
 
 /* priorities */