[clutter/master-next: 40/51] actor: Ignore allocation flags

[Emmanuele Bassi <ebassi src gnome org>]

commit df2fdcb9c8e196449a40ba4667b727b3d6d5953c
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Mon Apr 23 12:28:23 2012 +0100

    actor: Ignore allocation flags
    
    Allocation flags are informative, and are only meant to be used to
    communicate additional information about the allocation process to
    an actor.

 clutter/clutter-actor.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 2856cc9..82b2243 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -2270,7 +2270,6 @@ clutter_actor_set_allocation_internal (ClutterActor           *self,
   ClutterActorPrivate *priv = self->priv;
   GObject *obj;
   gboolean x1_changed, y1_changed, x2_changed, y2_changed;
-  gboolean flags_changed;
   gboolean retval;
   ClutterActorBox old_alloc = { 0, };
 
@@ -2285,8 +2284,6 @@ clutter_actor_set_allocation_internal (ClutterActor           *self,
   x2_changed = priv->allocation.x2 != box->x2;
   y2_changed = priv->allocation.y2 != box->y2;
 
-  flags_changed = priv->allocation_flags != flags;
-
   priv->allocation = *box;
   priv->allocation_flags = flags;
 
@@ -2295,9 +2292,10 @@ clutter_actor_set_allocation_internal (ClutterActor           *self,
   priv->needs_height_request = FALSE;
   priv->needs_allocation = FALSE;
 
-  if (x1_changed || y1_changed ||
-      x2_changed || y2_changed ||
-      flags_changed)
+  if (x1_changed ||
+      y1_changed ||
+      x2_changed ||
+      y2_changed)
     {
       CLUTTER_NOTE (LAYOUT, "Allocation for '%s' changed",
                     _clutter_actor_get_debug_name (self));