From: Keith Packard <keithp@keithp.com>
Date: Fri, 17 Jun 2005 03:01:43 +0000 (+0000)
Subject: Make FcOpNotContains use FcStrStr for strings so that it matches semantics
X-Git-Tag: fc-2_3_90~29
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f1a42f6b5f9bcd774d09002509b2872c04025c1b;p=fontconfig.git

Make FcOpNotContains use FcStrStr for strings so that it matches semantics
    for !FcOpContains.
reviewed by: keithp
---

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;
 	    }