Monotone-Parent: 25630ef22852aad3a540cf9873929b9324dcb479

Monotone-Revision: 33d6ed4d81ea69479070eeecb494de1a86f32771

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-03T15:12:51
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-05-03 15:12:51 +00:00
parent 35b97087f6
commit 63224612e3
2 changed files with 16 additions and 13 deletions
+7
View File
@@ -1,3 +1,10 @@
2007-05-03 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/AgenorUserDefaults.m ([AgenorUserDefaults
-primaryFetchProfile]): the values returned from the database are
converted to a put dictionary first, since the dictionary returned
is actually an immutable one, which can cause a crash afterwards.
2007-04-27 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoPermissions.m: added "SOGoRole_ObjectViewer"
+9 -13
View File
@@ -104,7 +104,7 @@ static NSString *uidColumnName = @"uid";
{
GCSChannelManager *cm;
EOAdaptorChannel *channel;
NSDictionary *row;
NSDictionary *row, *oldValues;
NSException *ex;
NSString *sql;
NSArray *attrs;
@@ -122,15 +122,15 @@ static NSString *uidColumnName = @"uid";
@" WHERE %@ = '%@'"),
fieldName, [[self tableURL] gcsTableName],
uidColumnName, [self uid]];
[values release];
values = [NSMutableDictionary new];
/* run SQL */
ex = [channel evaluateExpressionX: sql];
if (ex)
{
[self errorWithFormat:@"could not run SQL '%@': %@", sql, ex];
values = [NSMutableDictionary new];
}
[self errorWithFormat:@"could not run SQL '%@': %@", sql, ex];
else
{
/* fetch schema */
@@ -142,14 +142,10 @@ static NSString *uidColumnName = @"uid";
[channel cancelFetch];
/* remember values */
[values release];
values = [[row objectForKey: fieldName] propertyList];
if (values)
[values retain];
else
values = [NSMutableDictionary new];
oldValues = [[row objectForKey: fieldName] propertyList];
[values setDictionary: oldValues];
ASSIGN(lastFetch, [NSCalendarDate date]);
ASSIGN (lastFetch, [NSCalendarDate date]);
defFlags.modified = NO;
rc = YES;
}