isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 08:30:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "actor: Unconditionally set show_on_set_parent"

Browse Source 
This reverts commit 81b19a78f5.

The commit breaks the conformance test unit for the invariants we
guarantee for the 1.x API:

ERROR:actor-invariants.c:307:actor_show_on_set_parent: assertion failed: (show_on_set_parent)
This commit is contained in:
Emmanuele Bassi 2012-04-26 14:02:07 +01:00
parent 854c246a2b
commit a2f54c59f5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clutter/clutter-actor.c
View File

@ -1554,9 +1554,12 @@ set_show_on_set_parent (ClutterActor *self,
if (priv->show_on_set_parent == set_show)
return;
priv->show_on_set_parent = set_show;
g_object_notify_by_pspec (G_OBJECT (self),
obj_props[PROP_SHOW_ON_SET_PARENT]);
if (priv->parent == NULL)
{
priv->show_on_set_parent = set_show;
g_object_notify_by_pspec (G_OBJECT (self),
obj_props[PROP_SHOW_ON_SET_PARENT]);
}
}
/**