Deprecate ClutterBehaviour and sub-classes

The Behaviour class and its implementations have been replaced by the
new animation framework API and by the constraints for layout-related
animations.

Currently, we need to make tests build, so we undef DISABLE_DEPRECATED
in specific test cases while they get ported.

clutter/clutter-actor.c

@@ -291,7 +291,6 @@
 #include "clutter-action.h"
 #include "clutter-actor-meta-private.h"
 #include "clutter-animatable.h"
-#include "clutter-behaviour.h"
 #include "clutter-constraint.h"
 #include "clutter-container.h"
 #include "clutter-debug.h"
@@ -307,6 +306,9 @@
 #include "clutter-stage-private.h"
 #include "clutter-units.h"
 
+#undef CLUTTER_DISABLE_DEPRECATED
+#include "clutter-behaviour.h"
+
 typedef struct _ShaderData ShaderData;
 typedef struct _AnchorCoord AnchorCoord;
 

clutter/clutter-behaviour-depth.c

@@ -27,6 +27,7 @@
 #include "config.h"
 #endif
 
+#undef CLUTTER_DISABLE_DEPRECATED
 #include "clutter-behaviour-depth.h"
 
 #include "clutter-enum-types.h"
@@ -36,7 +37,9 @@
 
 /**
  * SECTION:clutter-behaviour-depth
+ * @Title: ClutterBehaviourDepth
  * @short_description: A behaviour controlling the Z position
+ * @Deprecated: 1.6: Use clutter_actor_animate() instead
  *
  * #ClutterBehaviourDepth is a simple #ClutterBehaviour controlling the
  * depth of a set of actors between a start and end depth.
@@ -163,6 +166,8 @@ clutter_behaviour_depth_class_init (ClutterBehaviourDepthClass *klass)
    * Start depth level to apply to the actors.
    *
    * Since: 0.4
+   *
+   * Deprecated: 1.6
    */
   g_object_class_install_property (gobject_class,
                                    PROP_DEPTH_START,
@@ -177,6 +182,8 @@ clutter_behaviour_depth_class_init (ClutterBehaviourDepthClass *klass)
    * End depth level to apply to the actors.
    *
    * Since: 0.4
+   *
+   * Deprecated: 1.6
    */
   g_object_class_install_property (gobject_class,
                                    PROP_DEPTH_END,
@@ -208,9 +215,11 @@ clutter_behaviour_depth_init (ClutterBehaviourDepth *depth)
  * of the #ClutterAlpha instance. In the case when @alpha is %NULL,
  * it can be set later with clutter_behaviour_set_alpha().
  *
- * Return value: the newly created behaviour
+ * Return value: (transfer full): the newly created behaviour
  *
  * Since: 0.4
+ *
+ * Deprecated: 1.6
  */
 ClutterBehaviour *
 clutter_behaviour_depth_new (ClutterAlpha *alpha,
@@ -235,6 +244,8 @@ clutter_behaviour_depth_new (ClutterAlpha *alpha,
  * Sets the boundaries of the @behaviour.
  *
  * Since: 0.6
+ *
+ * Deprecated: 1.6
  */
 void
 clutter_behaviour_depth_set_bounds (ClutterBehaviourDepth *behaviour,
@@ -273,6 +284,8 @@ clutter_behaviour_depth_set_bounds (ClutterBehaviourDepth *behaviour,
  * Gets the boundaries of the @behaviour
  *
  * Since: 0.6
+ *
+ * Deprecated: 1.6
  */
 void
 clutter_behaviour_depth_get_bounds (ClutterBehaviourDepth *behaviour,

clutter/clutter-behaviour-depth.h

@@ -35,6 +35,8 @@
 
 G_BEGIN_DECLS
 
+#ifndef CLUTTER_DISABLE_DEPRECATED
+
 #define CLUTTER_TYPE_BEHAVIOUR_DEPTH            (clutter_behaviour_depth_get_type ())
 #define CLUTTER_BEHAVIOUR_DEPTH(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_DEPTH, ClutterBehaviourDepth))
 #define CLUTTER_IS_BEHAVIOUR_DEPTH(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BEHAVIOUR_DEPTH))
@@ -53,6 +55,9 @@ typedef struct _ClutterBehaviourDepthClass      ClutterBehaviourDepthClass;
  * and should be accessed using the provided API
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6: Use clutter_actor_animate() with #ClutterActor:depth
+ *   instead.
  */
 struct _ClutterBehaviourDepth
 {
@@ -68,6 +73,8 @@ struct _ClutterBehaviourDepth
  * The #ClutterBehaviourDepthClass structure contains only private data
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 struct _ClutterBehaviourDepthClass
 {
@@ -87,6 +94,8 @@ void clutter_behaviour_depth_get_bounds (ClutterBehaviourDepth *behaviour,
                                          gint                  *depth_start,
                                          gint                  *depth_end);
 
+#endif /* CLUTTER_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
 #endif /* __CLUTTER_BEHAVIOUR_DEPTH__ */

clutter/clutter-behaviour-ellipse.c

@@ -26,7 +26,9 @@
 
 /**
  * SECTION:clutter-behaviour-ellipse
+ * @Title: ClutterBehaviourEllipse
  * @short_description: A behaviour interpolating position along an ellipse
+ * @Deprecated: 1.6: Use clutter_actor_animate() instead
  *
  * #ClutterBehaviourEllipse interpolates actors along a path defined by
  *  an ellipse.
@@ -45,9 +47,9 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include "clutter-fixed.h"
+#undef CLUTTER_DISABLE_DEPRECATED
-#include "clutter-marshal.h"
 #include "clutter-behaviour-ellipse.h"
+
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
 #include "clutter-private.h"

clutter/clutter-behaviour-ellipse.h

@@ -35,6 +35,8 @@
 
 G_BEGIN_DECLS
 
+#ifndef CLUTTER_DISABLE_DEPRECATED
+
 #define CLUTTER_TYPE_BEHAVIOUR_ELLIPSE (clutter_behaviour_ellipse_get_type ())
 
 #define CLUTTER_BEHAVIOUR_ELLIPSE(obj) \
@@ -68,6 +70,8 @@ typedef struct _ClutterBehaviourEllipseClass   ClutterBehaviourEllipseClass;
  * and should be accessed using the provided API
  *
  * Since: 0.4
+ *
+ * Deprecated: 1.6
  */
 struct _ClutterBehaviourEllipse
 {
@@ -82,6 +86,8 @@ struct _ClutterBehaviourEllipse
  * The #ClutterBehaviourEllipseClass struct contains only private data
  *
  * Since: 0.4
+ *
+ * Deprecated: 1.6
  */
 struct _ClutterBehaviourEllipseClass
 {
@@ -134,6 +140,8 @@ ClutterRotateDirection clutter_behaviour_ellipse_get_direction   (ClutterBehavio
 void                   clutter_behaviour_ellipse_set_direction   (ClutterBehaviourEllipse *self,
 								  ClutterRotateDirection   direction);
 
+#endif /* CLUTTER_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
 #endif /* __CLUTTER_BEHAVIOUR_ELLIPSE_H__ */

clutter/clutter-behaviour-opacity.c

@@ -23,34 +23,26 @@
 
 /**
  * SECTION:clutter-behaviour-opacity
+ * @Title: ClutterBehaviourOpacity
  * @short_description: A behaviour controlling opacity
+ * @Deprecated: 1.6: Use clutter_actor_animate() instead.
  *
- * #ClutterBehaviourPath interpolates actors opacity between two values.
+ * #ClutterBehaviourOpacity controls the opacity of a set of actors.
  *
+ * Since: 0.2
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "clutter-actor.h"
-#include "clutter-behaviour.h"
-#include "clutter-behaviour-opacity.h"
-#include "clutter-enum-types.h"
-#include "clutter-main.h"
-#include "clutter-private.h"
-#include "clutter-debug.h"
-
 #include <math.h>
 
-/**
+#undef CLUTTER_DISABLE_DEPRECATED
- * SECTION:clutter-behaviour-opacity
+#include "clutter-behaviour-opacity.h"
- * @short_description: Behaviour controlling the opacity
+
- *
+#include "clutter-private.h"
- * #ClutterBehaviourOpacity controls the opacity of a set of actors.
+#include "clutter-debug.h"
- *
- * Since: 0.2
- */
 
 G_DEFINE_TYPE (ClutterBehaviourOpacity,
                clutter_behaviour_opacity,
@@ -179,6 +171,8 @@ clutter_behaviour_opacity_class_init (ClutterBehaviourOpacityClass *klass)
    * Initial opacity level of the behaviour.
    *
    * Since: 0.2
+   *
+   * Deprecated: 1.6
    */
   pspec = g_param_spec_uint ("opacity-start",
                              P_("Opacity Start"),
@@ -195,6 +189,8 @@ clutter_behaviour_opacity_class_init (ClutterBehaviourOpacityClass *klass)
    * Final opacity level of the behaviour.
    *
    * Since: 0.2
+   *
+   * Deprecated: 1.6
    */
   pspec = g_param_spec_uint ("opacity-end",
                              P_("Opacity End"),
@@ -234,6 +230,8 @@ clutter_behaviour_opacity_init (ClutterBehaviourOpacity *self)
  * Return value: the newly created #ClutterBehaviourOpacity
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 ClutterBehaviour *
 clutter_behaviour_opacity_new (ClutterAlpha *alpha,
@@ -257,6 +255,8 @@ clutter_behaviour_opacity_new (ClutterAlpha *alpha,
  * on each actor it controls.
  *
  * Since: 0.6
+ *
+ * Deprecated: 1.6
  */
 void
 clutter_behaviour_opacity_set_bounds (ClutterBehaviourOpacity *behaviour,
@@ -298,6 +298,8 @@ clutter_behaviour_opacity_set_bounds (ClutterBehaviourOpacity *behaviour,
  * on each actor it controls.
  *
  * Since: 0.6
+ *
+ * Deprecated: 1.6
  */
 void
 clutter_behaviour_opacity_get_bounds (ClutterBehaviourOpacity *behaviour,

clutter/clutter-behaviour-opacity.h

@@ -35,6 +35,8 @@
 
 G_BEGIN_DECLS
 
+#ifndef CLUTTER_DISABLE_DEPRECATED
+
 #define CLUTTER_TYPE_BEHAVIOUR_OPACITY (clutter_behaviour_opacity_get_type ())
 
 #define CLUTTER_BEHAVIOUR_OPACITY(obj) \
@@ -68,6 +70,9 @@ typedef struct _ClutterBehaviourOpacityClass   ClutterBehaviourOpacityClass;
  * should be accessed using the provided API
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6: Use clutter_actor_animate() and #ClutterActor:opacity
+ *   instead.
  */
 struct _ClutterBehaviourOpacity
 {
@@ -82,6 +87,8 @@ struct _ClutterBehaviourOpacity
  * The #ClutterBehaviourOpacityClass structure contains only private data
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 struct _ClutterBehaviourOpacityClass
 {
@@ -102,7 +109,8 @@ void clutter_behaviour_opacity_get_bounds (ClutterBehaviourOpacity *behaviour,
                                            guint8                  *opacity_start,
                                            guint8                  *opacity_end);
 
+#endif /* CLUTTER_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
-
 #endif /* __CLUTTER_BEHAVIOUR_OPACITY_H__ */

clutter/clutter-behaviour-path.c

@@ -26,7 +26,10 @@
 
 /**
  * SECTION:clutter-behaviour-path
+ * @Title: ClutterBehaviourPath
  * @short_description: A behaviour for moving actors along a #ClutterPath
+ * @Deprecated: 1.6: Use #ClutterPathConstraint and clutter_actor_animate()
+ *   with the #ClutterPathConstraint:offset property instead.
  *
  * #ClutterBehaviourPath interpolates actors along a defined path.
  *
@@ -61,9 +64,9 @@
 #include "config.h"
 #endif
 
-#include "clutter-actor.h"
+#undef CLUTTER_DISABLE_DEPRECATED
-#include "clutter-behaviour.h"
 #include "clutter-behaviour-path.h"
+
 #include "clutter-bezier.h"
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
@@ -231,6 +234,8 @@ clutter_behaviour_path_class_init (ClutterBehaviourPathClass *klass)
    * is reached.
    *
    * Since: 0.2
+   *
+   * Deprecated: 1.6
    */
   path_signals[KNOT_REACHED] =
     g_signal_new ("knot-reached",
@@ -323,9 +328,11 @@ clutter_behaviour_path_init (ClutterBehaviourPath *self)
  * of the #ClutterAlpha instance. In the case when @alpha is %NULL,
  * it can be set later with clutter_behaviour_set_alpha().
  *
- * Return value: a #ClutterBehaviour
+ * Return value: (transfer full): a #ClutterBehaviour
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 ClutterBehaviour *
 clutter_behaviour_path_new (ClutterAlpha *alpha,
@@ -349,9 +356,11 @@ clutter_behaviour_path_new (ClutterAlpha *alpha,
  * of the #ClutterAlpha instance. In the case when @alpha is %NULL,
  * it can be set later with clutter_behaviour_set_alpha().
  *
- * Return value: a #ClutterBehaviour
+ * Return value: (transfer full): a #ClutterBehaviour
  *
  * Since: 1.0
+ *
+ * Deprecated: 1.6
  */
 ClutterBehaviour *
 clutter_behaviour_path_new_with_description (ClutterAlpha *alpha,
@@ -380,9 +389,11 @@ clutter_behaviour_path_new_with_description (ClutterAlpha *alpha,
  * of the #ClutterAlpha instance. In the case when @alpha is %NULL,
  * it can be set later with clutter_behaviour_set_alpha().
  *
- * Return value: a #ClutterBehaviour
+ * Return value: (transfer full): a #ClutterBehaviour
  *
  * Since: 1.0
+ *
+ * Deprecated: 1.6
  */
 ClutterBehaviour *
 clutter_behaviour_path_new_with_knots (ClutterAlpha      *alpha,
@@ -416,6 +427,8 @@ clutter_behaviour_path_new_with_knots (ClutterAlpha      *alpha,
  * it.
  *
  * Since: 1.0
+ *
+ * Deprecated: 1.6
  */
 void
 clutter_behaviour_path_set_path (ClutterBehaviourPath *pathb,
@@ -447,6 +460,8 @@ clutter_behaviour_path_set_path (ClutterBehaviourPath *pathb,
  * Return value: (transfer none): the path
  *
  * Since: 1.0
+ *
+ * Deprecated: 1.6
  */
 ClutterPath *
 clutter_behaviour_path_get_path (ClutterBehaviourPath *pathb)

clutter/clutter-behaviour-path.h

@@ -36,6 +36,8 @@
 
 G_BEGIN_DECLS
 
+#ifndef CLUTTER_DISABLE_DEPRECATED
+
 #define CLUTTER_TYPE_BEHAVIOUR_PATH (clutter_behaviour_path_get_type ())
 
 #define CLUTTER_BEHAVIOUR_PATH(obj) \
@@ -69,6 +71,9 @@ typedef struct _ClutterBehaviourPathClass   ClutterBehaviourPathClass;
  * and should be accessed using the provided API
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6: Use #ClutterPathConstraint and clutter_actor_animate()
+ *   instead.
  */
 struct _ClutterBehaviourPath
 {
@@ -85,6 +90,8 @@ struct _ClutterBehaviourPath
  * The #ClutterBehaviourPathClass struct contains only private data
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 struct _ClutterBehaviourPathClass
 {
@@ -121,6 +128,8 @@ void              clutter_behaviour_path_set_path     (ClutterBehaviourPath *pat
 
 ClutterPath *     clutter_behaviour_path_get_path     (ClutterBehaviourPath *pathb);
 
+#endif /* CLUTTER_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
 #endif /* __CLUTTER_BEHAVIOUR_PATH_H__ */

clutter/clutter-behaviour-rotate.c

@@ -35,17 +35,16 @@
 #include "config.h"
 #endif
 
-#include "clutter-actor.h"
+#undef CLUTTER_DISABLE_DEPRECATED
-#include "clutter-behaviour.h"
-#include "clutter-main.h"
-#include "clutter-fixed.h"
 #include "clutter-behaviour-rotate.h"
-#include "clutter-enum-types.h"
-#include "clutter-private.h"
-#include "clutter-debug.h"
 
 #include <math.h>
 
+#include "clutter-debug.h"
+#include "clutter-enum-types.h"
+#include "clutter-main.h"
+#include "clutter-private.h"
+
 G_DEFINE_TYPE (ClutterBehaviourRotate,
                clutter_behaviour_rotate,
                CLUTTER_TYPE_BEHAVIOUR);

clutter/clutter-behaviour-rotate.h

@@ -34,6 +34,8 @@
 
 G_BEGIN_DECLS
 
+#ifndef CLUTTER_DISABLE_DEPRECATED
+
 #define CLUTTER_TYPE_BEHAVIOUR_ROTATE            (clutter_behaviour_rotate_get_type ())
 #define CLUTTER_BEHAVIOUR_ROTATE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_ROTATE, ClutterBehaviourRotate))
 #define CLUTTER_IS_BEHAVIOUR_ROTATE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BEHAVIOUR_ROTATE))
@@ -52,6 +54,8 @@ typedef struct _ClutterBehaviourRotateClass     ClutterBehaviourRotateClass;
  * should be accessed using the provided API
  *
  * Since: 0.4
+ *
+ * Deprecated: 1.6: Use clutter_actor_animate() instead.
  */
 struct _ClutterBehaviourRotate
 {
@@ -67,6 +71,8 @@ struct _ClutterBehaviourRotate
  * The #ClutterBehaviourRotateClass struct contains only private data
  *
  * Since: 0.4
+ *
+ * Deprecated: 1.6
  */
 struct _ClutterBehaviourRotateClass
 {
@@ -102,6 +108,8 @@ void                   clutter_behaviour_rotate_set_bounds    (ClutterBehaviourR
                                                                gdouble                 angle_start,
                                                                gdouble                 angle_end);
 
+#endif /* CLUTTER_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
 #endif /* __CLUTTER_BEHAVIOUR_ROTATE_H__ */

clutter/clutter-behaviour-scale.c

@@ -23,26 +23,27 @@
 
 /**
  * SECTION:clutter-behaviour-scale
+ * @Title: ClutterBehaviourScale
  * @short_description: A behaviour controlling scale
+ * @Deprecated: 1.6: Use clutter_actor_animate() with #ClutterActor:x-scale
+ *   and #ClutterActor:y-scale instead.
  *
  * A #ClutterBehaviourScale interpolates actors size between two values.
- *
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "clutter-actor.h"
-#include "clutter-behaviour.h"
-#include "clutter-enum-types.h"
-#include "clutter-main.h"
-#include "clutter-behaviour-scale.h"
-#include "clutter-private.h"
-#include "clutter-debug.h"
-
 #include <math.h>
 
+#undef CLUTTER_DISABLE_DEPRECATED
+#include "clutter-behaviour-scale.h"
+
+#include "clutter-debug.h"
+#include "clutter-main.h"
+#include "clutter-private.h"
+
 G_DEFINE_TYPE (ClutterBehaviourScale,
                clutter_behaviour_scale,
 	       CLUTTER_TYPE_BEHAVIOUR);
@@ -211,6 +212,8 @@ clutter_behaviour_scale_class_init (ClutterBehaviourScaleClass *klass)
    * The initial scaling factor on the X axis for the actors.
    *
    * Since: 0.6
+   *
+   * Deprecated: 1.6
    */
   pspec = g_param_spec_double ("x-scale-start",
                                P_("X Start Scale"),
@@ -228,6 +231,8 @@ clutter_behaviour_scale_class_init (ClutterBehaviourScaleClass *klass)
    * The final scaling factor on the X axis for the actors.
    *
    * Since: 0.6
+   *
+   * Deprecated: 1.6
    */
   pspec = g_param_spec_double ("x-scale-end",
                                P_("X End Scale"),
@@ -245,6 +250,8 @@ clutter_behaviour_scale_class_init (ClutterBehaviourScaleClass *klass)
    * The initial scaling factor on the Y axis for the actors.
    *
    * Since: 0.6
+   *
+   * Deprecated: 1.6
    */
   pspec = g_param_spec_double ("y-scale-start",
                                P_("Y Start Scale"),
@@ -262,6 +269,8 @@ clutter_behaviour_scale_class_init (ClutterBehaviourScaleClass *klass)
    * The final scaling factor on the Y axis for the actors.
    *
    * Since: 0.6
+   *
+   * Deprecated: 1.6
    */
   pspec = g_param_spec_double ("y-scale-end",
                                P_("Y End Scale"),
@@ -302,9 +311,11 @@ clutter_behaviour_scale_init (ClutterBehaviourScale *self)
  * of the #ClutterAlpha instance. In the case when @alpha is %NULL,
  * it can be set later with clutter_behaviour_set_alpha().
  *
- * Return value: the newly created #ClutterBehaviourScale
+ * Return value: (transfer full): the newly created #ClutterBehaviourScale
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 ClutterBehaviour *
 clutter_behaviour_scale_new (ClutterAlpha   *alpha,
@@ -335,6 +346,8 @@ clutter_behaviour_scale_new (ClutterAlpha   *alpha,
  * Sets the bounds used by scale behaviour.
  *
  * Since: 0.6
+ *
+ * Deprecated: 1.6
  */
 void
 clutter_behaviour_scale_set_bounds (ClutterBehaviourScale *scale,
@@ -393,6 +406,8 @@ clutter_behaviour_scale_set_bounds (ClutterBehaviourScale *scale,
  * Retrieves the bounds used by scale behaviour.
  *
  * Since: 0.4
+ *
+ * Deprecated: 1.6
  */
 void
 clutter_behaviour_scale_get_bounds (ClutterBehaviourScale *scale,

clutter/clutter-behaviour-scale.h

@@ -34,6 +34,8 @@
 
 G_BEGIN_DECLS
 
+#ifndef CLUTTER_DISABLE_DEPRECATED
+
 #define CLUTTER_TYPE_BEHAVIOUR_SCALE            (clutter_behaviour_scale_get_type ())
 #define CLUTTER_BEHAVIOUR_SCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScale))
 #define CLUTTER_BEHAVIOUR_SCALE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScaleClass))
@@ -52,6 +54,9 @@ typedef struct _ClutterBehaviourScaleClass      ClutterBehaviourScaleClass;
  * should be accessed using the provided API
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6: Use clutter_actor_animate() with #ClutterActor:x-scale
+ *   and #ClutterActor:y-scale instead.
  */
 struct _ClutterBehaviourScale
 {
@@ -67,6 +72,8 @@ struct _ClutterBehaviourScale
  * The #ClutterBehaviourScaleClass struct contains only private data
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 struct _ClutterBehaviourScaleClass
 {
@@ -92,6 +99,8 @@ void              clutter_behaviour_scale_get_bounds (ClutterBehaviourScale *sca
                                                       gdouble               *x_scale_end,
                                                       gdouble               *y_scale_end);
 
+#endif /* CLUTTER_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
 #endif /* __CLUTTER_BEHAVIOUR_SCALE_H__ */

clutter/clutter-behaviour.c

@@ -23,7 +23,9 @@
 
 /**
  * SECTION:clutter-behaviour
+ * @Title: ClutterBehaviour
  * @short_description: Class for providing behaviours to actors
+ * @Deprecated: 1.6: Use the implicit animation API instead.
  *
  * #ClutterBehaviour is the base class for implementing behaviours.  A
  * behaviour is a controller object for #ClutterActor<!-- -->s; you can
@@ -62,15 +64,16 @@
  * instance bound to the behaviour and apply it to the desiderd property
  * (or properties) of every actor controlled by the behaviour.
  *
- * #ClutterBehaviour is available since Clutter 0.2
+ * #ClutterBehaviour is available since Clutter 0.2.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "clutter-actor.h"
+#undef CLUTTER_DISABLE_DEPRECATED
 #include "clutter-behaviour.h"
+
 #include "clutter-debug.h"
 #include "clutter-main.h"
 #include "clutter-marshal.h"

clutter/clutter-behaviour.h

@@ -36,6 +36,8 @@
 
 G_BEGIN_DECLS
 
+#ifndef CLUTTER_DISABLE_DEPRECATED
+
 #define CLUTTER_TYPE_BEHAVIOUR clutter_behaviour_get_type()
 
 #define CLUTTER_BEHAVIOUR(obj) \
@@ -72,6 +74,8 @@ typedef struct _ClutterBehaviourClass   ClutterBehaviourClass;
  * will be called for each actor driven by @behaviour.
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 typedef void (*ClutterBehaviourForeachFunc) (ClutterBehaviour *behaviour,
                                              ClutterActor     *actor,
@@ -84,6 +88,8 @@ typedef void (*ClutterBehaviourForeachFunc) (ClutterBehaviour *behaviour,
  * be accessed with the functions below.
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 struct _ClutterBehaviour
 {
@@ -104,6 +110,8 @@ struct _ClutterBehaviour
  * Base class for behaviours.
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 struct _ClutterBehaviourClass
 {
@@ -151,6 +159,8 @@ void          clutter_behaviour_set_alpha      (ClutterBehaviour            *beh
 gboolean      clutter_behaviour_is_applied     (ClutterBehaviour            *behave,
 						ClutterActor                *actor);
 
+#endif /* CLUTTER_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
-#endif
+#endif /* __CLUTTER_BEHAVIOUR_H__ */

tests/conform/test-behaviours.c

@@ -1,4 +1,6 @@
 #include <glib.h>
+
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 #include "test-conform-common.h"

tests/conform/test-script-parser.c

@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 #include "test-conform-common.h"

tests/interactive/test-actor-clone.c

@@ -1,3 +1,4 @@
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 #include <math.h>

tests/interactive/test-actors.c

@@ -1,3 +1,4 @@
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 #include <math.h>

tests/interactive/test-behave.c

@@ -5,6 +5,7 @@
 #include <glib.h>
 #include <gmodule.h>
 
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 static gboolean

tests/interactive/test-depth.c

@@ -1,5 +1,7 @@
 #include <stdlib.h>
 #include <gmodule.h>
+
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 /* each time the timeline animating the label completes, swap the direction */

tests/interactive/test-layout.c

@@ -3,6 +3,8 @@
 
 #include <gmodule.h>
 #include <cogl/cogl.h>
+
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 /* layout actor, by Lucas Rocha */

tests/interactive/test-multistage.c

@@ -1,4 +1,6 @@
 #include <gmodule.h>
+
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 static gint n_stages = 1;

tests/interactive/test-paint-wrapper.c

@@ -3,6 +3,8 @@
 #endif
 
 #include <gmodule.h>
+
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 #if defined (_MSC_VER) && !defined (_USE_MATH_DEFINES)

tests/interactive/test-pixmap.c

@@ -4,9 +4,11 @@
 #include <string.h>
 #include <gmodule.h>
 
+#undef CLUTTER_DISABLE_DEPRECATED
+#include <clutter/clutter.h>
+
 #if HAVE_CLUTTER_GLX
 
-#include <clutter/clutter.h>
 #include <clutter/x11/clutter-x11.h>
 #include <clutter/x11/clutter-x11-texture-pixmap.h>
 

tests/interactive/test-rotate.c

@@ -5,6 +5,7 @@
 #include <glib.h>
 #include <gmodule.h>
 
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 G_MODULE_EXPORT int

tests/interactive/test-scale.c

@@ -1,5 +1,7 @@
 #include <stdlib.h>
 #include <gmodule.h>
+
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 static const ClutterGravity gravities[] = {

tests/interactive/test-script.c

@@ -6,6 +6,7 @@
 #include <glib.h>
 #include <gmodule.h>
 
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 static ClutterScript *script = NULL;

tests/interactive/test-texture-async.c

@@ -1,5 +1,7 @@
 #include <stdlib.h>
 #include <gmodule.h>
+
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 enum

tests/interactive/test-texture-quality.c

@@ -1,5 +1,7 @@
 #include <stdlib.h>
 #include <gmodule.h>
+
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 /* each time the timeline animating the label completes, swap the direction */

tests/interactive/test-threads.c

@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <gmodule.h>
+
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 typedef struct

tests/interactive/test-viewport.c

@@ -5,6 +5,7 @@
 #include <glib.h>
 #include <gmodule.h>
 
+#undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
 G_MODULE_EXPORT int