Because we hacked FcPatternGet, we don't really need to expand the filename

    again in FcPatternGetString.

diff --git a/ChangeLog b/ChangeLog
index ba86c681ecc40dd879e3f15e51832604cb0aaf0f..20d8f8530e6b9072654a469350b3fb9fae6215b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-05  Patrick Lam  <plam@mit.edu>
+       * src/fcpat.c (FcPatternGetString):
+
+       Because we hacked FcPatternGet, we don't really need to expand the
+       filename again in FcPatternGetString.
+
 2006-03-05  Patrick Lam  <plam@mit.edu>
        * src/fcpat.c (FcPatternGetString, FcPatternGet):
 

diff --git a/src/fcpat.c b/src/fcpat.c
index 980b16eda9b1853c8a2e87357749d5a7c12b667e..a2eb64088dd049cff1f3f72b032fc8b0aed46ddb 100644 (file)
--- a/src/fcpat.c
+++ b/src/fcpat.c
@@ -1214,9 +1214,6 @@ FcPatternGetString (const FcPattern *p, const char *object, int id, FcChar8 ** s
     if (v.type != FcTypeString)
         return FcResultTypeMismatch;
 
-    if (FcObjectToPtr(object) == FcObjectToPtr(FC_FILE))
-        return FcPatternGetFile (p, object, id, s);
-
     *s = (FcChar8 *) v.u.s;
     return FcResultMatch;
 }