2007-10-10 Emmanuele Bassi <ebassi@openedhand.com>

	* clutter/clutter-script.c (json_object_end): Add "type_func"
	to the list of attributes we skip.

diff --git a/ChangeLog b/ChangeLog
index a5f79fd..4274f0a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-10-10  Emmanuele Bassi  <ebassi@openedhand.com>
 
+       * clutter/clutter-script.c (json_object_end): Add "type_func"
+       to the list of attributes we skip.
+
+2007-10-10  Emmanuele Bassi  <ebassi@openedhand.com>
+
        * clutter/json/json-parser.c: Use the commodity JsonNode API
        and accept bare values as root nodes.
 

diff --git a/clutter/clutter-script.c b/clutter/clutter-script.c
index 8e60bdd..9d3606b 100644 (file)
--- a/clutter/clutter-script.c
+++ b/clutter/clutter-script.c
@@ -600,7 +600,9 @@ json_object_end (JsonParser *parser,
 
       val = json_object_get_member (object, name);
 
-      if (strcmp (name, "id") == 0 || strcmp (name, "type") == 0)
+      if (strcmp (name, "id") == 0 ||
+          strcmp (name, "type_func") == 0 ||
+          strcmp (name, "type") == 0)
         continue;
       else
         {