summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lam <plam@MIT.EDU>2005-12-06 18:57:43 +0000
committerPatrick Lam <plam@MIT.EDU>2005-12-06 18:57:43 +0000
commitc6103dfb22de0664a6ab164d90d6959551e301c5 (patch)
treee1d2f807fe98e8c9602dae71939856611f6d9f8c
parent9ede93f1dc375c1f4d7e71d821887c01a367d995 (diff)
Don't assign types to user object names.
-rw-r--r--ChangeLog5
-rw-r--r--src/fcname.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a3672942..64c37ccf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
2005-12-05 Patrick Lam <plam@mit.edu>
+ * src/fcname.c (FcNameGetObjectType):
+
+ Don't assign types to user object names.
+
+2005-12-05 Patrick Lam <plam@mit.edu>
* src/fcpat.c (FcValueDestroy, FcValueListDestroy, FcStrHashed):
Don't free strings that have been returned from FcStrStaticName.
diff --git a/src/fcname.c b/src/fcname.c
index fc3dbd4f..d7100359 100644
--- a/src/fcname.c
+++ b/src/fcname.c
@@ -155,6 +155,9 @@ FcNameGetObjectType (const char *object)
for (l = _FcObjectTypes; l; l = l->next)
{
+ if (l == (FcObjectTypeList*)_FcUserObjectNames)
+ continue;
+
for (i = 0; i < l->ntypes; i++)
{
t = &l->types[i];