LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 1c03128dc32222b38a2456aa650fb2b5a775c3a0 

Monotone-Revision: aff0225cae26a70d3ca711bd22d7459655c7f24e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-07-08T20:04:36
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2011-07-08 20:04:36 +00:00
parent 1cf68fa730
commit fcc4b2b070
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2011-07-08 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreTable.m
(-evaluateContentRestriction:intoQualifier:): temporarily
commented out code initializing "operator" as this local var is
never used.
* OpenChange/MAPIStoreFolder.m (-initWithSOstringByAddingPercentEscapesUsingEncodinGoObject:inContainer:):
make use of -[NSString stringByAddingPercentEscapesUsingEncoding:]
to properly escape folder names with non-ascii characters.

36
OpenChange/MAPIStoreTable.m
View File

@ -534,7 +534,7 @@ static Class NSDataK, NSStringK;
intoQualifier: (EOQualifier **) qualifier
{
NSString *property;
SEL operator;
// SEL operator;
id value;
MAPIRestrictionState rc;
@ -553,23 +553,23 @@ static Class NSDataK, NSStringK;
format: @"unhandled content restriction for class '%@'",
NSStringFromClass ([value class])];
switch (res->fuzzy & 0xf)
{
case 0:
operator = EOQualifierOperatorEqual;
break;
case 1:
operator = EOQualifierOperatorLike;
value = [NSString stringWithFormat: @"%%%@%%", value];
break;
case 2:
operator = EOQualifierOperatorEqual;
value = [NSString stringWithFormat: @"%@%%", value];
break;
default: [NSException raise: @"MAPIStoreInvalidOperatorException"
format: @"fuzzy operator value '%.4x' is invalid",
res->fuzzy];
}
// switch (res->fuzzy & 0xf)
// {
// case 0:
// operator = EOQualifierOperatorEqual;
// break;
// case 1:
// operator = EOQualifierOperatorLike;
// value = [NSString stringWithFormat: @"%%%@%%", value];
// break;
// case 2:
// operator = EOQualifierOperatorEqual;
// value = [NSString stringWithFormat: @"%@%%", value];
// break;
// default: [NSException raise: @"MAPIStoreInvalidOperatorException"
// format: @"fuzzy operator value '%.4x' is invalid",
// res->fuzzy];
// }
*qualifier = [[EOKeyValueQualifier alloc] initWithKey: property
operatorSelector: EOQualifierOperatorCaseInsensitiveLike