summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2005-06-17 03:01:43 +0000
committerKeith Packard <keithp@keithp.com>2005-06-17 03:01:43 +0000
commitf1a42f6b5f9bcd774d09002509b2872c04025c1b (patch)
tree0221f3767d594dc44b5ea85a7a3ff2da6a33b972
parentadc7abacbf0e2eae882d035f10117fb009b71bdd (diff)
downloadfontconfig-f1a42f6b5f9bcd774d09002509b2872c04025c1b.tar.gz
Make FcOpNotContains use FcStrStr for strings so that it matches semantics
for !FcOpContains. reviewed by: keithp
-rw-r--r--ChangeLog8
-rw-r--r--src/fccfg.c4
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8233894..2984b0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-16 Patrick Lam <plam@MIT.EDU>
+
+ reviewed by: keithp
+
+ * src/fccfg.c: (FcConfigCompareValue):
+ Make FcOpNotContains use FcStrStr for strings so that
+ it matches semantics for !FcOpContains.
+
2005-05-20 Keith Packard <keithp@keithp.com>
* debian/changelog:
diff --git a/src/fccfg.c b/src/fccfg.c
index 551dbe1..84c21e7 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -629,9 +629,11 @@ FcConfigCompareValue (const FcValue left_o,
ret = FcStrStrIgnoreCase (left.u.s, right.u.s) != 0;
break;
case FcOpNotEqual:
- case FcOpNotContains:
ret = FcStrCmpIgnoreCase (left.u.s, right.u.s) != 0;
break;
+ case FcOpNotContains:
+ ret = FcStrStrIgnoreCase (left.u.s, right.u.s) == 0;
+ break;
default:
break;
}