From bf4818bd759f612a9cec62c2e072544d54cc104c Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 7 Jan 2010 11:08:52 +0000 Subject: [PATCH] actor: Just emit a relayout cycle warning Currently, ClutterActor detects a relayout cycle (an actor causing a relayout to be queued from within an allocate() function) and aborts after printing out a warning. This might be a little bit too anal retentive, and it currently breaks GTK+ embedding inside clutter-gtk so we should probably relax the behaviour a bit. Now we just emit the warning but we still go ahead with the relayout. --- clutter/clutter-actor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index 26c7f5e28..724a2ac49 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -4547,7 +4547,6 @@ clutter_actor_queue_relayout (ClutterActor *self) "not allowed", priv->name ? priv->name : G_OBJECT_TYPE_NAME (self)); - return; } g_signal_emit (self, actor_signals[QUEUE_RELAYOUT], 0);