merge of '84411b8b6fbff010342ea44749d83a4f521e3ad7'

and 'ed796ed4ba5a6027433e3f18b4431d54833aeef8'

Monotone-Parent: 84411b8b6fbff010342ea44749d83a4f521e3ad7
Monotone-Parent: ed796ed4ba5a6027433e3f18b4431d54833aeef8
Monotone-Revision: 461db977780298f484dd530f71ae963e7dde1fc4

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-03-22T15:00:41
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2009-03-22 15:00:41 +00:00
commit a30758a22e

View file

@ -56,6 +56,7 @@ static NSString *uidColumnName = @"c_uid";
fieldName = [theFieldName copy]; fieldName = [theFieldName copy];
url = [theURL copy]; url = [theURL copy];
uid = [theUID copy]; uid = [theUID copy];
defFlags.ready = YES;
} }
else else
{ {
@ -355,7 +356,7 @@ static NSString *uidColumnName = @"c_uid";
{ {
id old; id old;
if (![self fetchProfile]) if (!defFlags.ready || ![self fetchProfile])
return; return;
/* check whether the value is actually modified */ /* check whether the value is actually modified */