Make FcOpNotContains use FcStrStr for strings so that it matches semantics

    for !FcOpContains.
reviewed by: keithp

diff --git a/ChangeLog b/ChangeLog
index 8233894ed026cc310986efe7bc7d51e69a96073c..2984b0f330247dad8294b038740f1008f43f26c7 100644 (file)
--- 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 551dbe19178ff8c00bf6d93a06fb44269d6e6125..84c21e791c43ac145909d300291e8a6443048173 100644 (file)
--- 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;
            }