merge of '7ee0c1dd084226bd61d44f69428903723aac6bbc'

and 'd740c679cf1cefcedfad26e298c71bde54a6286d'

Monotone-Parent: 7ee0c1dd084226bd61d44f69428903723aac6bbc
Monotone-Parent: d740c679cf1cefcedfad26e298c71bde54a6286d
Monotone-Revision: 8a165a32a6a836849e62e7fa408d15b5ce3c7a25

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-10-25T14:05:29
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 */