[clutter] actor: Restore a lost queue_relayout()



commit 800b5b6ef7f45c280347a521c16682b16f051657
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Fri Mar 16 14:26:28 2012 +0000

    actor: Restore a lost queue_relayout()
    
    It got lost during a rebase conflict resolution.

 clutter/clutter-actor.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index b31a224..cfe0f63 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);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]