mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-03-29 01:52:45 +00:00
Monotone-Parent: 6a4ca400c5002f16d1bc1a5c29569fd895195891
Monotone-Revision: e29f563ab0cd9f47da56070fa528af4b9c253e7a Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-05-10T16:15:24 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
2007-05-10 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* SoObjects/SOGo/AgenorUserDefaults.m ([AgenorUserDefaults
|
||||
-primaryFetchProfile]): check that the value returned is not null
|
||||
before interpreting it.
|
||||
|
||||
* SoObjects/SOGo/LDAPUserManager.m ([LDAPUserManager
|
||||
-contactInfosForUserWithUIDorEmail:uid]): check that uid is not empty.
|
||||
([LDAPUserManager -_fillContactMailRecords:contact]): if the
|
||||
|
||||
@@ -104,12 +104,11 @@ static NSString *uidColumnName = @"uid";
|
||||
{
|
||||
GCSChannelManager *cm;
|
||||
EOAdaptorChannel *channel;
|
||||
NSDictionary *row, *oldValues;
|
||||
NSDictionary *row;
|
||||
NSException *ex;
|
||||
NSString *sql;
|
||||
NSString *sql, *value;
|
||||
NSArray *attrs;
|
||||
BOOL rc;
|
||||
id column;
|
||||
|
||||
rc = NO;
|
||||
|
||||
@@ -143,12 +142,9 @@ static NSString *uidColumnName = @"uid";
|
||||
[channel cancelFetch];
|
||||
|
||||
/* remember values */
|
||||
column = [row objectForKey: fieldName];
|
||||
if ([column isNotNull])
|
||||
{
|
||||
oldValues = [column propertyList];
|
||||
[values setDictionary: oldValues];
|
||||
}
|
||||
value = [row objectForKey: fieldName];
|
||||
if ([value isNotNull])
|
||||
[values setDictionary: [value propertyList]];
|
||||
|
||||
ASSIGN (lastFetch, [NSCalendarDate date]);
|
||||
defFlags.modified = NO;
|
||||
|
||||
Reference in New Issue
Block a user