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

Add more checks to ClutterContainer::raise() and ::lower()

Browse Source 
Check that the actors passed are actually children of the container,
as the implementations assume this.
This commit is contained in:
Emmanuele Bassi 2007-08-13 17:01:12 +00:00
parent a60dcb9889
commit adfa359e48
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
clutter/clutter-container.c
View File

@ -422,6 +422,25 @@ clutter_container_raise (ClutterContainer *container,
if (actor == sibling)
return;
if (clutter_actor_get_parent (actor) != CLUTTER_ACTOR (container))
{
g_warning ("Actor of type `%s' is not a child of the container "
"of type `%s'",
g_type_name (G_OBJECT_TYPE (actor)),
g_type_name (G_OBJECT_TYPE (container)));
return;
}
if (sibling &&
clutter_actor_get_parent (sibling) != CLUTTER_ACTOR (container))
{
g_warning ("Actor of type `%s' is not a child of the container "
"of type `%s'",
g_type_name (G_OBJECT_TYPE (sibling)),
g_type_name (G_OBJECT_TYPE (container)));
return;
}
CLUTTER_CONTAINER_GET_IFACE (container)->raise (container, actor, sibling);
}
@ -447,6 +466,25 @@ clutter_container_lower (ClutterContainer *container,
if (actor == sibling)
return;
if (clutter_actor_get_parent (actor) != CLUTTER_ACTOR (container))
{
g_warning ("Actor of type `%s' is not a child of the container "
"of type `%s'",
g_type_name (G_OBJECT_TYPE (actor)),
g_type_name (G_OBJECT_TYPE (container)));
return;
}
if (sibling &&
clutter_actor_get_parent (sibling) != CLUTTER_ACTOR (container))
{
g_warning ("Actor of type `%s' is not a child of the container "
"of type `%s'",
g_type_name (G_OBJECT_TYPE (sibling)),
g_type_name (G_OBJECT_TYPE (container)));
return;
}
CLUTTER_CONTAINER_GET_IFACE (container)->raise (container, actor, sibling);
}