Don't assign types to user object names.

diff --git a/ChangeLog b/ChangeLog
index a367294224ebcaf90154889a80fc203a71e0b5c7..64c37ccff783040f582e2aab9482af75d802a94c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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):
 

diff --git a/src/fcname.c b/src/fcname.c
index fc3dbd4f3998964ce349cf6759eebcf70f07dc82..d7100359f7e29bcccae4c3b8445218ef4e8a719f 100644 (file)
--- 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];