Monotone-Parent: 1c03128dc32222b38a2456aa650fb2b5a775c3a0

Monotone-Revision: aff0225cae26a70d3ca711bd22d7459655c7f24e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-07-08T20:04:36
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2011-07-08 20:04:36 +00:00
1 parent 1cf68fa730
commit fcc4b2b070
2 files changed
+23 -18

No files matched your search

+5
View File
@@ -1,5 +1,10 @@
2011-07-08 Wolfgang Sourdeau <wsourdeau@inverse.ca> 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:): * OpenChange/MAPIStoreFolder.m (-initWithSOstringByAddingPercentEscapesUsingEncodinGoObject:inContainer:):
make use of -[NSString stringByAddingPercentEscapesUsingEncoding:] make use of -[NSString stringByAddingPercentEscapesUsingEncoding:]
to properly escape folder names with non-ascii characters. to properly escape folder names with non-ascii characters.
+18 -18
View File
@@ -534,7 +534,7 @@ static Class NSDataK, NSStringK;
intoQualifier: (EOQualifier **) qualifier intoQualifier: (EOQualifier **) qualifier
{ {
NSString *property; NSString *property;
SEL operator; // SEL operator;
id value; id value;
MAPIRestrictionState rc; MAPIRestrictionState rc;
@@ -553,23 +553,23 @@ static Class NSDataK, NSStringK;
format: @"unhandled content restriction for class '%@'", format: @"unhandled content restriction for class '%@'",
NSStringFromClass ([value class])]; NSStringFromClass ([value class])];
switch (res->fuzzy & 0xf) // switch (res->fuzzy & 0xf)
{ // {
case 0: // case 0:
operator = EOQualifierOperatorEqual; // operator = EOQualifierOperatorEqual;
break; // break;
case 1: // case 1:
operator = EOQualifierOperatorLike; // operator = EOQualifierOperatorLike;
value = [NSString stringWithFormat: @"%%%@%%", value]; // value = [NSString stringWithFormat: @"%%%@%%", value];
break; // break;
case 2: // case 2:
operator = EOQualifierOperatorEqual; // operator = EOQualifierOperatorEqual;
value = [NSString stringWithFormat: @"%@%%", value]; // value = [NSString stringWithFormat: @"%@%%", value];
break; // break;
default: [NSException raise: @"MAPIStoreInvalidOperatorException" // default: [NSException raise: @"MAPIStoreInvalidOperatorException"
format: @"fuzzy operator value '%.4x' is invalid", // format: @"fuzzy operator value '%.4x' is invalid",
res->fuzzy]; // res->fuzzy];
} // }
*qualifier = [[EOKeyValueQualifier alloc] initWithKey: property *qualifier = [[EOKeyValueQualifier alloc] initWithKey: property
operatorSelector: EOQualifierOperatorCaseInsensitiveLike operatorSelector: EOQualifierOperatorCaseInsensitiveLike