Monotone-Parent: 64241052c164949118642194441e9a30cbdc3d58

Monotone-Revision: 53ba3739a8b7ce64040a91695b40bad1a7d7e1aa

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-22T14:44:22
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2012-02-22 14:44:22 +00:00
parent bdc5e5a6c0
commit 3274bd1f4c
2 changed files with 7 additions and 1 deletions

View File

@@ -1,3 +1,9 @@
2012-02-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SQLSource.m (_lookupContactEntry:considerEmail:):
make sure the value of column pointer to by _kindField is not nil,
nor an NSNull instance before treating it like a string.
2012-02-21 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoSQLUserProfile.m (-fetchJSONProfileFromDB):

View File

@@ -552,7 +552,7 @@
// We check if it's a resource of not
if (_kindField)
{
if ((value = [response objectForKey: _kindField]))
if ((value = [response objectForKey: _kindField]) && [value isNotNull])
{
if ([value caseInsensitiveCompare: @"location"] == NSOrderedSame ||
[value caseInsensitiveCompare: @"thing"] == NSOrderedSame ||