See ChangeLog

Monotone-Parent: 8e6238fb5afca88582d8e5b9645e8f690b18ddd8
Monotone-Revision: 9485d114a246f06ae3df1b188de52f46783459ec

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-10-07T21:29:50
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
C Robert 2009-10-07 21:29:50 +00:00
parent 9a54276a37
commit c31e3f9d24
2 changed files with 14 additions and 3 deletions

View File

@ -8,6 +8,8 @@
* SoObjects/Mailer/EOQualifier+MailDAV.m (buildQualifierFromFilters:):
Removed, everything is now done in (qualifierFromMailDAVMailFilters:).
(qualifierFromMailDAVMailFilters:): Removed all parentheses in qualifier.
* SoObjects/Mailer/EOQualifier+MailDAV.m (qualifierFromMailDAVMailFilters:):
Fixed segfault when there are no filters.
2009-10-07 Francis Lachapelle <flachapelle@inverse.ca>

View File

@ -37,6 +37,7 @@
+ (id) qualifierFromMailDAVMailFilters: (DOMElement *) mailFilters
{
EOQualifier *qualifier;
NSMutableArray *args, *formats;
NSArray *flags, *strings, *dates;
NSString *valueA, *valueB, *tagName, *format, *negate;
@ -52,6 +53,7 @@
@"keywords", @"body", nil];
dates = [NSArray arrayWithObjects: @"date", @"receive-date", nil];
formats = nil;
list = [mailFilters childNodes];
if (list)
{
@ -160,9 +162,16 @@
}
}
format = [formats componentsJoinedByString: @" AND "];
return [EOQualifier qualifierWithQualifierFormat: format
arguments: args];
if (formats)
{
format = [formats componentsJoinedByString: @" AND "];
qualifier = [EOQualifier qualifierWithQualifierFormat: format
arguments: args];
}
else
qualifier = nil;
return qualifier;
}
@end