summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lam <plam@MIT.EDU>2006-03-05 15:33:46 +0000
committerPatrick Lam <plam@MIT.EDU>2006-03-05 15:33:46 +0000
commit9226e04c69d7cb472999b1d8bc0cfa3c28054ebe (patch)
tree3d1585be7ff6a813c3770624429e316a77b59142
parent618adbaf7bbad8441efb589417d7144476f828c7 (diff)
Because we hacked FcPatternGet, we don't really need to expand the filename
again in FcPatternGetString.
-rw-r--r--ChangeLog6
-rw-r--r--src/fcpat.c3
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ba86c681..20d8f853 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
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):
Ok, so some people (wine!) use FcPatternGet to fetch FC_FILE.
diff --git a/src/fcpat.c b/src/fcpat.c
index 980b16ed..a2eb6408 100644
--- 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;
}