Monotone-Parent: 40771f087f196edd3af10cf4202e2ce91e3c9f58

Monotone-Revision: 0d6d08f519f87a48faf11bb5cac050269622c10c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-12-19T17:02:15
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2006-12-19 17:02:15 +00:00
parent 3cc1c13e82
commit d912af1007
3 changed files with 13 additions and 7 deletions

View File

@@ -1,3 +1,9 @@
2006-12-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
([SOGoAppointmentFolder
-fetchFields:_fieldsfromFolder:_folderfrom:_startDateto:_endDatecomponent:_component]): no longer set the owner of elements here.
2006-12-15 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoUserFolder.m: same as for SOGoContactFolders

View File

@@ -22,8 +22,6 @@
#ifndef __Appointments_SOGoAppointmentFolder_H__
#define __Appointments_SOGoAppointmentFolder_H__
#include <SOGo/SOGoFolder.h>
/*
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;

View File

@@ -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;
}