From 800b5b6ef7f45c280347a521c16682b16f051657 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 16 Mar 2012 14:26:28 +0000 Subject: [PATCH] actor: Restore a lost queue_relayout() It got lost during a rebase conflict resolution. --- clutter/clutter-actor.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index b31a224f9..cfe0f6316 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -9476,6 +9476,8 @@ clutter_actor_set_y_internal (ClutterActor *self, clutter_actor_set_fixed_position_set (self, TRUE); clutter_actor_notify_if_geometry_changed (self, &old); + + clutter_actor_queue_relayout (self); } /** @@ -12969,7 +12971,7 @@ clutter_actor_set_final_state (ClutterAnimatable *animatable, clutter_actor_set_animatable_property (actor, pspec->param_id, final, pspec); } else - g_object_set_property (G_OBJECT (animatable), property_name, final); + g_object_set_property (G_OBJECT (animatable), pspec->name, final); } g_free (p_name);