[clutter/clutter-1.6] animation: Use ::destroy with animate()

[Emmanuele Bassi <ebassi src gnome org>]

commit 8ac7bcb2fdceb41f85b6fc471fcebffd8a1033f2
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Sat Apr 16 10:22:01 2011 +0100

    animation: Use ::destroy with animate()
    
    ClutterAnimation uses the weak ref machinery of GObject when associated
    to ClutterActor by clutter_actor_animate() and friends - all the while
    taking a reference on the actor itself. In order to trigger the weak ref
    callback, external code would need to unref the Actor at least twice,
    which has slim chance of happening. Plus, the way to destroy an Actor is
    to call destroy(), not call unref().
    
    The destruction sequence of ClutterActor emits the ::destroy signal, which
    should be used by classes to release external references the might be
    holding. My oh my, this sounds *exactly* the case!
    
    So, let's switch to using the ::destroy signal for clutter_actor_animate()
    and friends, since we know that the object bound to the Animation is
    an Actor, and has a ::destroy signal.
    
    This change has the added benefit of allowing destroying an actor as the
    result of the Animation::completed signal without getting a segfault or
    other bad things to happen.
    
    Obviously, the change does not affect other GObject classes, or Animation
    instances created using clutter_animation_new(); for those, the current
    "let's take a reference on the object to avoid it going away in-flight"
    mechanism should still suffice.
    
    Side note: it would be interesting if GObject had an interface for
    "destructible" objects, so that we could do a safe type check. I guess
    it's a Rainy Day Project(tm)...
    (cherry picked from commit 57ebce8039c0d82b144c6753246dcb0c6308a844)
    
    Signed-off-by: Emmanuele Bassi <ebassi linux intel com>

 clutter/clutter-animation.c |   37 ++++++++++++++++++++++++-------------
 1 files changed, 24 insertions(+), 13 deletions(-)
---
diff --git a/clutter/clutter-animation.c b/clutter/clutter-animation.c
index f357a06..cf77de7 100644
--- a/clutter/clutter-animation.c
+++ b/clutter/clutter-animation.c
@@ -200,19 +200,22 @@ G_DEFINE_TYPE_WITH_CODE (ClutterAnimation, clutter_animation, G_TYPE_OBJECT,
                                                 clutter_scriptable_init));
 
 static void
-on_actor_dispose (gpointer  user_data,
-                  GObject  *actor_pointer)
+on_actor_destroy (ClutterActor     *actor,
+                  ClutterAnimation *animation)
 {
-  ClutterAnimation *self = user_data;
+  ClutterAnimationPrivate *priv = animation->priv;
+  GObject *obj = G_OBJECT (actor);
 
-  if (self->priv->object == actor_pointer)
+  if (obj == priv->object)
     {
-      CLUTTER_NOTE (ANIMATION, "Object [%p] was unref'd", actor_pointer);
-      g_object_unref (self);
+      g_object_set_qdata (priv->object, quark_object_animation, NULL);
+      g_signal_handlers_disconnect_by_func (priv->object,
+                                            G_CALLBACK (on_actor_destroy),
+                                            animation);
+      g_object_unref (animation);
     }
 }
 
-
 static void
 clutter_animation_real_completed (ClutterAnimation *self)
 {
@@ -265,7 +268,9 @@ clutter_animation_real_completed (ClutterAnimation *self)
                     priv->object);
 
       g_object_set_qdata (priv->object, quark_object_animation, NULL);
-      g_object_weak_unref (priv->object, on_actor_dispose, self);
+      g_signal_handlers_disconnect_by_func (priv->object,
+                                            G_CALLBACK (on_actor_destroy),
+                                            animation);
 
       CLUTTER_NOTE (ANIMATION, "Releasing the reference Animation [%p]",
                     animation);
@@ -1973,7 +1978,13 @@ animation_create_for_actor (ClutterActor *actor)
       animation = clutter_animation_new ();
       clutter_animation_set_object (animation, object);
       g_object_set_qdata (object, quark_object_animation, animation);
-      g_object_weak_ref (object, on_actor_dispose, animation);
+
+      /* use the ::destroy signal to get a notification
+       * that the actor went away mid-animation
+       */
+      g_signal_connect (object, "destroy",
+                        G_CALLBACK (on_actor_destroy),
+                        animation);
 
       CLUTTER_NOTE (ANIMATION,
                     "Created new Animation [%p] for actor [%p]",
@@ -2514,10 +2525,10 @@ clutter_actor_detach_animation (ClutterActor *actor)
         clutter_timeline_stop (timeline);
     }
 
-  /* set_object(NULL) does no call weak_unref() because the weak reference
-   * is added by animation_create_for_actor()
-   */
-  g_object_weak_unref (priv->object, on_actor_dispose, animation);
+  /* disconnect the ::destroy handler added by animation_create_for_actor() */
+  g_signal_handlers_disconnect_by_func (actor,
+                                        G_CALLBACK (on_actor_destroy),
+                                        animation);
 
   clutter_animation_set_object (animation, NULL);