merge of '392bdd6ba9c324042c23ae3d8e26d2d328da895f'

and '41bb79702e5e49315aa6313331d91aaf5357ff5f'

Monotone-Parent: 392bdd6ba9c324042c23ae3d8e26d2d328da895f
Monotone-Parent: 41bb79702e5e49315aa6313331d91aaf5357ff5f
Monotone-Revision: 4e80269c9a4c19167cb40423b5d143cad86c7adf

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-02-17T22:37:16
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-02-17 22:37:16 +00:00
2 changed files with 16 additions and 9 deletions
+4 -3
View File
@@ -1,6 +1,6 @@
/* NSObject+CardDAV.m - this file is part of SOGo
*
* Copyright (C) 2007-2009 Inverse inc.
* Copyright (C) 2007-2011 Inverse inc.
*
* Author: Ludovic Marcotte <ludovic@inverse.ca>
*
@@ -30,6 +30,7 @@
#import <NGExtensions/NSObject+Logs.h>
#import <NGExtensions/NSString+misc.h>
#import <DOM/DOMProtocols.h>
#import <DOM/DOMNode.h>
#import <SaxObjC/SaxObjC.h>
#import <SaxObjC/XMLNamespaces.h>
@@ -142,8 +143,8 @@
&& [(NSArray *) [[ranges objectAtIndex: 0] childNodes] count])
{
filterData = [NSMutableDictionary dictionary];
[filterData setObject: [[(NSArray *)[[ranges objectAtIndex: 0] childNodes] lastObject] data]
forKey: [filterElement attribute: @"name"]];
[filterData setObject: [(NGDOMNode *)[ranges objectAtIndex: 0] textValue]
forKey: [filterElement attribute: @"name"]];
}
}