;

Monotone-Parent: fc267c7dc09cc05decc140411d1facce3f441866
Monotone-Revision: c2a5265bbdaf7810309bda5f2f3dd5f2c67b15ed

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-11T18:43:46
Monotone-Branch: ca.inverse.sogo

UI/Scheduler/UIxCalendarProperties.m

@@ -177,24 +177,6 @@
   [calendar setShowCalendarTasks: new];
 }
 
-- (NSString *) webCalendarURL
-{
-  SOGoUserSettings *settings;
-  NSMutableDictionary *calendarSettings;
-  NSMutableDictionary *webCalendars;
-  NSString *rc;
-
-  settings = [[context activeUser] userSettings];
-  calendarSettings = [settings objectForKey: @"Calendar"];
-  webCalendars = [calendarSettings objectForKey: @"WebCalendars"];
-  if (webCalendars)
-    rc = [webCalendars objectForKey: [calendar nameInContainer]];
-  else
-    rc = nil;
-
-  return rc;
-}
-
 - (BOOL) userIsOwner
 {
   NSString *userLogin;
@@ -209,6 +191,11 @@
   return ([calendar isKindOfClass: [SOGoWebAppointmentFolder class]]);
 }
 
+- (NSString *) webCalendarURL
+{
+  return [calendar folderPropertyValueInCategory: @"WebCalendars"];
+}
+
 - (void) setReloadOnLogin: (BOOL) newReloadOnLogin
 {
   if ([calendar respondsToSelector: @selector (setReloadOnLogin:)])