Monotone-Parent: 97b95195a7611cd2eef64b51a69ae3a2308cef6a

Monotone-Revision: 2c4979aac05ff59d2bca154679eb3ebc8df8cd8f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-10-11T18:54:10
Monotone-Branch: ca.inverse.sogo

UI/Scheduler/UIxCalDayTable.m

@@ -204,7 +204,7 @@
   end = [start dateByAddingYears: 0 months: 0 days: 0
                hours: 0 minutes: 59 seconds: 59];
 
-  apts     = [self fetchCoreInfos];
+  apts = [self fetchCoreAppointmentsInfos];
   filtered = [NSMutableArray new];
   [filtered autorelease];
 

UI/Scheduler/UIxCalDayView.m

@@ -181,7 +181,7 @@
 
 - (NSArray *) appointments
 {
-  return [self fetchCoreInfos];
+  return [self fetchCoreAppointmentsInfos];
 }
 
 - (NSArray *)aptsForCurrentDate {

UI/Scheduler/UIxCalMonthOverview.m

@@ -97,7 +97,7 @@
 
 
 - (NSArray *)appointments {
-  return [self fetchCoreInfos];
+  return [self fetchCoreAppointmentsInfos];
 }
 
 @end /* UIxCalMonthOverview */

UI/Scheduler/UIxCalScheduleOverview.m

@@ -296,7 +296,7 @@
   return self->foreignApts;
 }
 
-- (void)fetchInfos {
+- (void) fetchInfos {
   static NSArray *orders = nil;
   id       aptFolder;
   NSArray  *apts;
@@ -311,8 +311,9 @@
   }
 
   aptFolder = [self clientObject];
-  apts      = [aptFolder fetchCoreInfosFrom:[self startDate]
-                         to:[self endDate]];
+  apts      = [aptFolder fetchCoreInfosFrom: [self startDate]
+                         to: [self endDate]
+                         component: @"vevent"];
   userEmail = [self emailForUser];
   count     = [apts count];
 

UI/Scheduler/UIxCalWeekListview.m

@@ -52,18 +52,18 @@
 /* NOTE: this fetches coreInfos instead of overviewInfos
  * as is done in the superclass!
  */
-- (NSArray *)fetchCoreInfos {
-  if (!self->appointments) {
-    id             folder;
-    NSCalendarDate *sd, *ed;
+// - (NSArray *)fetchCoreInfos {
+//   if (!self->appointments) {
+//     id             folder;
+//     NSCalendarDate *sd, *ed;
     
-    folder             = [self clientObject];
-    sd                 = [self startDate];
-    ed                 = [self endDate];
-    [self setAppointments:[folder fetchCoreInfosFrom:sd to:ed]];
-  }
-  return self->appointments;
-}
+//     folder             = [self clientObject];
+//     sd                 = [self startDate];
+//     ed                 = [self endDate];
+//     [self setAppointments: [folder fetchCoreAppointmentsInfos]];
+//   }
+//   return self->appointments;
+// }
 
 /* accessors */
 

UI/Scheduler/UIxCalWeekView.m

@@ -54,7 +54,7 @@
 
 - (NSArray *) appointments
 {
-  return [self fetchCoreInfos];
+  return [self fetchCoreAppointmentsInfos];
 }
 
 /* URLs */