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

actor: NULL-ify sibling fields when removing

Browse Source 
Let's try and avoid leaving around stale pointers.
This commit is contained in:
Emmanuele Bassi 2012-01-20 17:15:20 +00:00
parent 27784de941
commit 29384c114f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clutter/clutter-actor.c
View File

@ -9499,6 +9499,9 @@ insert_child_at_depth (ClutterActor *self,
self->priv->first_child = child; self->priv->first_child = child;
self->priv->last_child = child; self->priv->last_child = child;
child->priv->next_sibling = NULL;
child->priv->prev_sibling = NULL;
return; return;
} }
@ -9749,6 +9752,8 @@ clutter_actor_add_child_internal (ClutterActor *self,
g_object_ref_sink (child); g_object_ref_sink (child);
child->priv->parent = self; child->priv->parent = self;
child->priv->next_sibling = NULL;
child->priv->prev_sibling = NULL;
/* delegate the actual insertion */ /* delegate the actual insertion */
add_func (self, child, data); add_func (self, child, data);
@ -9993,7 +9998,8 @@ clutter_actor_set_parent (ClutterActor *self,
* emit the ::actor-added signal, to avoid recursion or double * emit the ::actor-added signal, to avoid recursion or double
* emissions * emissions
*/ */
clutter_actor_add_child_internal (parent, self, ADD_CHILD_LEGACY_FLAGS, clutter_actor_add_child_internal (parent, self,
ADD_CHILD_LEGACY_FLAGS,
insert_child_at_depth, insert_child_at_depth,
NULL); NULL);
} }
@ -10072,6 +10078,9 @@ remove_child (ClutterActor *self,
if (self->priv->last_child == child) if (self->priv->last_child == child)
self->priv->last_child = prev_sibling; self->priv->last_child = prev_sibling;
child->priv->prev_sibling = NULL;
child->priv->next_sibling = NULL;
} }
typedef enum { typedef enum {