mirror of
https://github.com/brl/mutter.git
synced 2025-02-17 05:44:08 +00:00
Revert "actor: Unconditionally set show_on_set_parent"
This reverts commit 81b19a78f5e02ae8ffd9235054d80b172496415b. 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:
parent
854c246a2b
commit
a2f54c59f5
@ -1554,9 +1554,12 @@ set_show_on_set_parent (ClutterActor *self,
|
|||||||
if (priv->show_on_set_parent == set_show)
|
if (priv->show_on_set_parent == set_show)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
priv->show_on_set_parent = set_show;
|
if (priv->parent == NULL)
|
||||||
g_object_notify_by_pspec (G_OBJECT (self),
|
{
|
||||||
obj_props[PROP_SHOW_ON_SET_PARENT]);
|
priv->show_on_set_parent = set_show;
|
||||||
|
g_object_notify_by_pspec (G_OBJECT (self),
|
||||||
|
obj_props[PROP_SHOW_ON_SET_PARENT]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user