diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index 863243efe..645442297 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -8613,7 +8613,6 @@ get_meta_from_animation_property (ClutterActor *actor, static GParamSpec * clutter_actor_find_property (ClutterAnimatable *animatable, - ClutterAnimation *animation, const gchar *property_name) { ClutterActorMeta *meta = NULL; @@ -8645,7 +8644,6 @@ clutter_actor_find_property (ClutterAnimatable *animatable, static void clutter_actor_get_initial_state (ClutterAnimatable *animatable, - ClutterAnimation *animation, const gchar *property_name, GValue *initial) { @@ -8666,7 +8664,6 @@ clutter_actor_get_initial_state (ClutterAnimatable *animatable, static void clutter_actor_set_final_state (ClutterAnimatable *animatable, - ClutterAnimation *animation, const gchar *property_name, const GValue *final) { diff --git a/clutter/clutter-animatable.c b/clutter/clutter-animatable.c index 0674abf7c..be8437df1 100644 --- a/clutter/clutter-animatable.c +++ b/clutter/clutter-animatable.c @@ -128,7 +128,6 @@ clutter_animatable_animate_property (ClutterAnimatable *animatable, /** * clutter_animatable_find_property: * @animatable: a #ClutterAnimatable - * @animation: a #ClutterAnimation * @property_name: the name of the animatable property to find * * Finds the #GParamSpec for @property_name @@ -140,20 +139,18 @@ clutter_animatable_animate_property (ClutterAnimatable *animatable, */ GParamSpec * clutter_animatable_find_property (ClutterAnimatable *animatable, - ClutterAnimation *animation, const gchar *property_name) { ClutterAnimatableIface *iface; g_return_val_if_fail (CLUTTER_IS_ANIMATABLE (animatable), NULL); - g_return_val_if_fail (CLUTTER_IS_ANIMATION (animation), NULL); g_return_val_if_fail (property_name != NULL, NULL); CLUTTER_NOTE (ANIMATION, "Looking for property '%s'", property_name); iface = CLUTTER_ANIMATABLE_GET_IFACE (animatable); if (iface->find_property != NULL) - return iface->find_property (animatable, animation, property_name); + return iface->find_property (animatable, property_name); return g_object_class_find_property (G_OBJECT_GET_CLASS (animatable), property_name); @@ -162,7 +159,6 @@ clutter_animatable_find_property (ClutterAnimatable *animatable, /** * clutter_animatable_get_initial_state: * @animatable: a #ClutterAnimatable - * @animation: a #ClutterAnimation * @property_name: the name of the animatable property to retrieve * @value: a #GValue initialized to the type of the property to retrieve * @@ -172,21 +168,19 @@ clutter_animatable_find_property (ClutterAnimatable *animatable, */ void clutter_animatable_get_initial_state (ClutterAnimatable *animatable, - ClutterAnimation *animation, const gchar *property_name, GValue *value) { ClutterAnimatableIface *iface; g_return_if_fail (CLUTTER_IS_ANIMATABLE (animatable)); - g_return_if_fail (CLUTTER_IS_ANIMATION (animation)); g_return_if_fail (property_name != NULL); CLUTTER_NOTE (ANIMATION, "Getting initial state of '%s'", property_name); iface = CLUTTER_ANIMATABLE_GET_IFACE (animatable); if (iface->get_initial_state != NULL) - iface->get_initial_state (animatable, animation, property_name, value); + iface->get_initial_state (animatable, property_name, value); else g_object_get_property (G_OBJECT (animatable), property_name, value); } @@ -194,7 +188,6 @@ clutter_animatable_get_initial_state (ClutterAnimatable *animatable, /** * clutter_animatable_set_final_state: * @animatable: a #ClutterAnimatable - * @animation: a #ClutterAnimation * @property_name: the name of the animatable property to set * @value: the value of the animatable property to set * @@ -204,21 +197,19 @@ clutter_animatable_get_initial_state (ClutterAnimatable *animatable, */ void clutter_animatable_set_final_state (ClutterAnimatable *animatable, - ClutterAnimation *animation, const gchar *property_name, const GValue *value) { ClutterAnimatableIface *iface; g_return_if_fail (CLUTTER_IS_ANIMATABLE (animatable)); - g_return_if_fail (CLUTTER_IS_ANIMATION (animation)); g_return_if_fail (property_name != NULL); CLUTTER_NOTE (ANIMATION, "Setting state of property '%s'", property_name); iface = CLUTTER_ANIMATABLE_GET_IFACE (animatable); if (iface->set_final_state != NULL) - iface->set_final_state (animatable, animation, property_name, value); + iface->set_final_state (animatable, property_name, value); else g_object_set_property (G_OBJECT (animatable), property_name, value); } diff --git a/clutter/clutter-animatable.h b/clutter/clutter-animatable.h index bddcc5ed0..2edd6b089 100644 --- a/clutter/clutter-animatable.h +++ b/clutter/clutter-animatable.h @@ -80,14 +80,11 @@ struct _ClutterAnimatableIface gdouble progress, GValue *value); GParamSpec *(* find_property) (ClutterAnimatable *animatable, - ClutterAnimation *animation, const gchar *property_name); void (* get_initial_state) (ClutterAnimatable *animatable, - ClutterAnimation *animation, const gchar *property_name, GValue *value); void (* set_final_state) (ClutterAnimatable *animatable, - ClutterAnimation *animation, const gchar *property_name, const GValue *value); }; @@ -103,14 +100,11 @@ gboolean clutter_animatable_animate_property (ClutterAnimatable *animatable, GValue *value); GParamSpec *clutter_animatable_find_property (ClutterAnimatable *animatable, - ClutterAnimation *animation, const gchar *property_name); void clutter_animatable_get_initial_state (ClutterAnimatable *animatable, - ClutterAnimation *animation, const gchar *property_name, GValue *value); void clutter_animatable_set_final_state (ClutterAnimatable *animatable, - ClutterAnimation *animation, const gchar *property_name, const GValue *value); diff --git a/clutter/clutter-animation.c b/clutter/clutter-animation.c index 100013ace..037d771fa 100644 --- a/clutter/clutter-animation.c +++ b/clutter/clutter-animation.c @@ -241,9 +241,7 @@ clutter_animation_real_completed (ClutterAnimation *self) p_value = clutter_interval_peek_initial_value (interval); if (animatable != NULL) - clutter_animatable_set_final_state (animatable, self, - p_name, - p_value); + clutter_animatable_set_final_state (animatable, p_name, p_value); else g_object_set_property (priv->object, p_name, p_value); } @@ -662,9 +660,7 @@ clutter_animation_validate_bind (ClutterAnimation *animation, { ClutterAnimatable *animatable = CLUTTER_ANIMATABLE (priv->object); - pspec = clutter_animatable_find_property (animatable, - animation, - property_name); + pspec = clutter_animatable_find_property (animatable, property_name); } else { @@ -789,7 +785,6 @@ clutter_animation_bind (ClutterAnimation *animation, if (CLUTTER_IS_ANIMATABLE (priv->object)) clutter_animatable_get_initial_state (CLUTTER_ANIMATABLE (priv->object), - animation, property_name, &initial); else @@ -901,9 +896,7 @@ clutter_animation_update_interval (ClutterAnimation *animation, { ClutterAnimatable *animatable = CLUTTER_ANIMATABLE (priv->object); - pspec = clutter_animatable_find_property (animatable, - animation, - property_name); + pspec = clutter_animatable_find_property (animatable, property_name); } else { @@ -1101,9 +1094,7 @@ on_alpha_notify (GObject *gobject, if (apply) { if (is_animatable) - clutter_animatable_set_final_state (animatable, animation, - p_name, - &value); + clutter_animatable_set_final_state (animatable, p_name, &value); else g_object_set_property (priv->object, p_name, &value); } @@ -1747,7 +1738,6 @@ done: if (CLUTTER_IS_ANIMATABLE (priv->object)) clutter_animatable_get_initial_state (CLUTTER_ANIMATABLE (priv->object), - animation, property_name, &cur_value); else @@ -1773,7 +1763,6 @@ done: { if (CLUTTER_IS_ANIMATABLE (priv->object)) clutter_animatable_set_final_state (CLUTTER_ANIMATABLE (priv->object), - animation, property_name, &real_value); else @@ -1812,9 +1801,7 @@ clutter_animation_setupv (ClutterAnimation *animation, } if (animatable != NULL) - pspec = clutter_animatable_find_property (animatable, - animation, - property_name); + pspec = clutter_animatable_find_property (animatable, property_name); else pspec = g_object_class_find_property (klass, property_name); @@ -1914,7 +1901,6 @@ clutter_animation_setup_valist (ClutterAnimation *animation, if (animatable != NULL) pspec = clutter_animatable_find_property (animatable, - animation, property_name); else pspec = g_object_class_find_property (klass, property_name);