From d912af1007f0a5832e4bed5fd8c8de396644fbcd Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 19 Dec 2006 17:02:15 +0000 Subject: [PATCH] Monotone-Parent: 40771f087f196edd3af10cf4202e2ce91e3c9f58 Monotone-Revision: 0d6d08f519f87a48faf11bb5cac050269622c10c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-12-19T17:02:15 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/Appointments/SOGoAppointmentFolder.h | 4 ++-- SoObjects/Appointments/SOGoAppointmentFolder.m | 10 +++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ccbac434..da7ac9b03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-12-19 Wolfgang Sourdeau + + * SoObjects/Appointments/SOGoAppointmentFolder.m + ([SOGoAppointmentFolder + -fetchFields:_fieldsfromFolder:_folderfrom:_startDateto:_endDatecomponent:_component]): no longer set the owner of elements here. + 2006-12-15 Wolfgang Sourdeau * SoObjects/SOGo/SOGoUserFolder.m: same as for SOGoContactFolders diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.h b/SoObjects/Appointments/SOGoAppointmentFolder.h index bfa7b51f2..4d609ab23 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.h +++ b/SoObjects/Appointments/SOGoAppointmentFolder.h @@ -22,8 +22,6 @@ #ifndef __Appointments_SOGoAppointmentFolder_H__ #define __Appointments_SOGoAppointmentFolder_H__ -#include - /* SOGoAppointmentFolder Parent object: the SOGoUserFolder @@ -38,6 +36,8 @@ create two different vevent-files with the same uid in the store. */ +#import "SOGo/SOGoFolder.h" + @class NSString, NSArray, NSCalendarDate, NSException, NSMutableDictionary; @class GCSFolder; diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index e15d78cf1..47e7b0498 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -674,7 +674,7 @@ static NSNumber *sharedYes = nil; EOQualifier *qualifier; NSMutableArray *fields, *ma = nil; NSArray *records; - NSString *sql, *dateSqlString, *componentSqlString, *owner; + NSString *sql, *dateSqlString, *componentSqlString; /* , *owner; */ NGCalendarDateRange *r; if (_folder == nil) { @@ -742,7 +742,7 @@ static NSNumber *sharedYes = nil; if (!ma) ma = [NSMutableArray arrayWithCapacity: [records count]]; - owner = [self ownerInContext: nil]; +// owner = [self ownerInContext: nil]; [ma addObjectsFromArray: records]; } else if (!ma) @@ -760,9 +760,9 @@ static NSNumber *sharedYes = nil; if (logger) [self debugWithFormat:@"returning %i records", [ma count]]; - [ma makeObjectsPerform: @selector (setObject:forKey:) - withObject: owner - withObject: @"owner"]; +// [ma makeObjectsPerform: @selector (setObject:forKey:) +// withObject: owner +// withObject: @"owner"]; return ma; }