brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

script-parser: Expose extracting the id from a node

Browse Source 
The get_id_from_node() internal function should be exposed inside
Clutter (as a private function) because it can be useful to other
custom parsing code. The code is pretty trivial, but it would be
pointless to re-implement it.
This commit is contained in:
Emmanuele Bassi 2010-06-17 16:41:44 +01:00
parent c85d535a09
commit a4dbcf0c32
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/clutter-script-parser.c
View File

@ -487,8 +487,8 @@ clutter_script_parse_color (ClutterScript *script,
return FALSE; return FALSE;
} }
static const gchar * const gchar *
get_id_from_node (JsonNode *node) _clutter_script_get_id_from_node (JsonNode *node)
{ {
JsonObject *object; JsonObject *object;
@ -531,7 +531,7 @@ parse_children (ObjectInfo *oinfo,
JsonNode *child = json_array_get_element (array, i); JsonNode *child = json_array_get_element (array, i);
const gchar *id; const gchar *id;
id = get_id_from_node (child); id = _clutter_script_get_id_from_node (child);
if (id) if (id)
retval = g_list_prepend (retval, g_strdup (id)); retval = g_list_prepend (retval, g_strdup (id));
} }
@ -672,7 +672,7 @@ parse_behaviours (ObjectInfo *oinfo,
JsonNode *child = json_array_get_element (array, i); JsonNode *child = json_array_get_element (array, i);
const gchar *id; const gchar *id;
id = get_id_from_node (child); id = _clutter_script_get_id_from_node (child);
if (id) if (id)
retval = g_list_prepend (retval, g_strdup (id)); retval = g_list_prepend (retval, g_strdup (id));
} }
@ -1115,7 +1115,7 @@ clutter_script_parse_node (ClutterScript *script,
* definitions are parsed leaf-first we are guaranteed * definitions are parsed leaf-first we are guaranteed
* to have a defined object at this point * to have a defined object at this point
*/ */
id = get_id_from_node (node); id = _clutter_script_get_id_from_node (node);
if (id == NULL || *id == '\0') if (id == NULL || *id == '\0')
return FALSE; return FALSE;

2
clutter/clutter-script-private.h
View File

@ -149,6 +149,8 @@ guint _clutter_script_get_last_merge_id (ClutterScript *script);
void _clutter_script_add_object_info (ClutterScript *script, void _clutter_script_add_object_info (ClutterScript *script,
ObjectInfo *oinfo); ObjectInfo *oinfo);
const gchar *_clutter_script_get_id_from_node (JsonNode *node);
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_SCRIPT_PRIVATE_H__ */ #endif /* __CLUTTER_SCRIPT_PRIVATE_H__ */