mirror of
https://github.com/brl/mutter.git
synced 2025-06-13 16:59:30 +00:00
2007-10-08 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-script.c (json_parse_end): * clutter/json/json-object.c (json_object_get_members): Replace the GLib 2.14 API with the equivalent code for GLib < 2.14. * configure.ac: Revert the dependency bump.
This commit is contained in:
@ -542,22 +542,25 @@ clutter_script_construct_object (ClutterScript *script,
|
||||
return oinfo->object;
|
||||
}
|
||||
|
||||
static void
|
||||
for_each_object (gpointer key,
|
||||
gpointer value,
|
||||
gpointer data)
|
||||
{
|
||||
ClutterScript *script = data;
|
||||
ObjectInfo *oinfo = value;
|
||||
|
||||
clutter_script_construct_object (script, oinfo);
|
||||
}
|
||||
|
||||
static void
|
||||
json_parse_end (JsonParser *parser,
|
||||
gpointer user_data)
|
||||
{
|
||||
ClutterScript *script = user_data;
|
||||
ClutterScriptPrivate *priv = script->priv;
|
||||
GList *objects, *l;
|
||||
|
||||
objects = g_hash_table_get_values (priv->objects);
|
||||
for (l = objects; l; l = l->next)
|
||||
{
|
||||
ObjectInfo *oinfo = l->data;
|
||||
|
||||
oinfo->object = clutter_script_construct_object (script, oinfo);
|
||||
}
|
||||
g_list_free (objects);
|
||||
g_hash_table_foreach (priv->objects, for_each_object, script);
|
||||
}
|
||||
|
||||
static void
|
||||
|
Reference in New Issue
Block a user