From e8d32fd153268c653c1adc5c66f30f0ee624b432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Thu, 25 Feb 2010 11:28:32 +0000 Subject: [PATCH] animator: removed bogus arg in keys interpolation accessor A bogus ClutterInterpolation argument had been carried from clutter_animator_set_interpolation to clutter_animator_get_interpolation in copy and paste. --- clutter/clutter-animator.c | 16 +++++++--------- clutter/clutter-animator.h | 3 +-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/clutter/clutter-animator.c b/clutter/clutter-animator.c index 9725b2c58..4b77dbece 100644 --- a/clutter/clutter-animator.c +++ b/clutter/clutter-animator.c @@ -1579,7 +1579,6 @@ clutter_animator_property_set_ease_in (ClutterAnimator *animator, * @animator: a #ClutterAnimatorKey * @object: a #GObject * @property_name: the name of a property on object - * @interpolation: the #ClutterInterpolation to use * * Get the interpolation used by animator for a property on a particular * object. @@ -1588,10 +1587,9 @@ clutter_animator_property_set_ease_in (ClutterAnimator *animator, * Since: 1.2 */ ClutterInterpolation -clutter_animator_property_get_interpolation (ClutterAnimator *animator, - GObject *object, - const gchar *property_name, - ClutterInterpolation interpolation) +clutter_animator_property_get_interpolation (ClutterAnimator *animator, + GObject *object, + const gchar *property_name) { GList *initial; ClutterAnimatorKey key, *initial_key; @@ -1631,10 +1629,10 @@ clutter_animator_property_get_interpolation (ClutterAnimator *animator, * Since: 1.2 */ void -clutter_animator_property_set_interpolation (ClutterAnimator *animator, - GObject *object, - const gchar *property_name, - ClutterInterpolation interpolation) +clutter_animator_property_set_interpolation (ClutterAnimator *animator, + GObject *object, + const gchar *property_name, + ClutterInterpolation interpolation) { GList *initial; ClutterAnimatorKey key, *initial_key; diff --git a/clutter/clutter-animator.h b/clutter/clutter-animator.h index 8f2c3b0aa..fb4f93a19 100644 --- a/clutter/clutter-animator.h +++ b/clutter/clutter-animator.h @@ -146,8 +146,7 @@ void clutter_animator_property_set_ease_in (ClutterAnimato ClutterInterpolation clutter_animator_property_get_interpolation (ClutterAnimator *animator, GObject *object, - const gchar *property_name, - ClutterInterpolation interpolation); + const gchar *property_name); void clutter_animator_property_set_interpolation (ClutterAnimator *animator, GObject *object, const gchar *property_name,