From 339d4b8e180a1c7c91632c602ac2f91895c360fe Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 18 Jan 2008 22:59:43 +0000 Subject: [PATCH] Monotone-Parent: 0b8453c1e1ca97f10acca6a72c72e8f6b29907d6 Monotone-Revision: 08e8d0fb761a61568f208c502269083b0b66bb25 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-01-18T22:59:43 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/Contacts/SOGoFolder+CardDAV.m | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b2992c8c..413fc320f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-01-18 Wolfgang Sourdeau + + * SoObjects/Contacts/SOGoFolder+CardDAV.m ([SOGoFolder + -davAddressbookQuery:queryContext]): when empty values are fed to + SOGo, their dictionary should be explicitly set to nil. + 2008-01-16 Wolfgang Sourdeau * SoObjects/SOGo/SOGoCache.m ([SOGoCache diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.m b/SoObjects/Contacts/SOGoFolder+CardDAV.m index 18b739de2..b8d83bb05 100644 --- a/SoObjects/Contacts/SOGoFolder+CardDAV.m +++ b/SoObjects/Contacts/SOGoFolder+CardDAV.m @@ -95,14 +95,17 @@ [self _isValidFilter: [filterElement attribute: @"name"]]) { ranges = [filterElement getElementsByTagName: @"text-match"]; - - if ([(NSArray *)ranges count] && [(NSArray *)[[ranges objectAtIndex: 0] childNodes] count]) + + if ([(NSArray *)ranges count] + && [(NSArray *)[[ranges objectAtIndex: 0] childNodes] count]) { filterData = [NSMutableDictionary new]; [filterData autorelease]; [filterData setObject: [[(NSArray *)[[ranges objectAtIndex: 0] childNodes] lastObject] data] forKey: [filterElement attribute: @"name"]]; } + else + filterData = nil; } else filterData = nil;