Tag all deprecated symbols using CLUTTER_DEPRECATED

This requires some minor surgery in the build to disable the deprecation
warnings in the deprecated classes.

27 files changed, 209 insertions, 122 deletions

diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index cb6629f92..95b9a7b97 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -284,6 +284,8 @@
 #include "config.h"
 #endif
 
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
 #include "cogl/cogl.h"
 
 #include "clutter-actor-private.h"
diff --git a/clutter/clutter-path.c b/clutter/clutter-path.c
index 91b2be2ff..d46f33a02 100644
--- a/clutter/clutter-path.c
+++ b/clutter/clutter-path.c
@@ -1582,3 +1582,65 @@ clutter_path_node_equal (const ClutterPathNode *node_a,
 
   return TRUE;
 }
+
+G_DEFINE_BOXED_TYPE (ClutterKnot, clutter_knot,
+                     clutter_knot_copy,
+                     clutter_knot_free);
+
+/**
+ * clutter_knot_copy:
+ * @knot: a #ClutterKnot
+ *
+ * Makes an allocated copy of a knot.
+ *
+ * Return value: the copied knot.
+ *
+ * Since: 0.2
+ */
+ClutterKnot *
+clutter_knot_copy (const ClutterKnot *knot)
+{
+  if (G_UNLIKELY (knot == NULL))
+    return NULL;
+
+  return g_slice_dup (ClutterKnot, knot);
+}
+
+/**
+ * clutter_knot_free:
+ * @knot: a #ClutterKnot
+ *
+ * Frees the memory of an allocated knot.
+ *
+ * Since: 0.2
+ */
+void
+clutter_knot_free (ClutterKnot *knot)
+{
+  if (G_LIKELY (knot != NULL))
+    g_slice_free (ClutterKnot, knot);
+}
+
+/**
+ * clutter_knot_equal:
+ * @knot_a: First knot
+ * @knot_b: Second knot
+ *
+ * Compares to knot and checks if the point to the same location.
+ *
+ * Return value: %TRUE if the knots point to the same location.
+ *
+ * Since: 0.2
+ */
+gboolean
+clutter_knot_equal (const ClutterKnot *knot_a,
+                    const ClutterKnot *knot_b)
+{
+  g_return_val_if_fail (knot_a != NULL, FALSE);
+  g_return_val_if_fail (knot_b != NULL, FALSE);
+
+  if (knot_a == knot_b)
+    return TRUE;
+
+  return knot_a->x == knot_b->x && knot_a->y == knot_b->y;
+}
diff --git a/clutter/deprecated/clutter-behaviour-depth.c b/clutter/deprecated/clutter-behaviour-depth.c
index 91acb5bb0..28eb3c058 100644
--- a/clutter/deprecated/clutter-behaviour-depth.c
+++ b/clutter/deprecated/clutter-behaviour-depth.c
@@ -27,6 +27,8 @@
 #include "config.h"
 #endif
 
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
 #include "clutter-behaviour.h"
 #include "clutter-behaviour-depth.h"
 #include "clutter-enum-types.h"
diff --git a/clutter/deprecated/clutter-behaviour-depth.h b/clutter/deprecated/clutter-behaviour-depth.h
index 4ee2f83f8..1354295f8 100644
--- a/clutter/deprecated/clutter-behaviour-depth.h
+++ b/clutter/deprecated/clutter-behaviour-depth.h
@@ -34,8 +34,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
-
 #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))
@@ -82,19 +80,21 @@ struct _ClutterBehaviourDepthClass
 };
 
 GType             clutter_behaviour_depth_get_type (void) G_GNUC_CONST;
+
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate and ClutterActor:depth)
 ClutterBehaviour *clutter_behaviour_depth_new      (ClutterAlpha *alpha,
                                                     gint          depth_start,
                                                     gint          depth_end);
 
+CLUTTER_DEPRECATED
 void clutter_behaviour_depth_set_bounds (ClutterBehaviourDepth *behaviour,
                                          gint                   depth_start,
                                          gint                   depth_end);
+CLUTTER_DEPRECATED
 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__ */
diff --git a/clutter/deprecated/clutter-behaviour-ellipse.c b/clutter/deprecated/clutter-behaviour-ellipse.c
index aafbc6e48..ab2cf60f8 100644
--- a/clutter/deprecated/clutter-behaviour-ellipse.c
+++ b/clutter/deprecated/clutter-behaviour-ellipse.c
@@ -50,6 +50,8 @@
 #include <math.h>
 #include <stdlib.h>
 
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
 #include "clutter-behaviour.h"
 #include "clutter-behaviour-ellipse.h"
 #include "clutter-debug.h"
diff --git a/clutter/deprecated/clutter-behaviour-ellipse.h b/clutter/deprecated/clutter-behaviour-ellipse.h
index 8dffa869d..40634347b 100644
--- a/clutter/deprecated/clutter-behaviour-ellipse.h
+++ b/clutter/deprecated/clutter-behaviour-ellipse.h
@@ -32,8 +32,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
-
 #define CLUTTER_TYPE_BEHAVIOUR_ELLIPSE (clutter_behaviour_ellipse_get_type ())
 
 #define CLUTTER_BEHAVIOUR_ELLIPSE(obj) \
@@ -94,6 +92,7 @@ struct _ClutterBehaviourEllipseClass
 
 GType clutter_behaviour_ellipse_get_type (void) G_GNUC_CONST;
 
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
 ClutterBehaviour *     clutter_behaviour_ellipse_new             (ClutterAlpha            *alpha,
 								  gint                     x,
 								  gint                     y,
@@ -102,43 +101,58 @@ ClutterBehaviour *     clutter_behaviour_ellipse_new             (ClutterAlpha
 								  ClutterRotateDirection   direction,
 								  gdouble                  start,
 								  gdouble                  end);
+
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_center      (ClutterBehaviourEllipse *self,
 								  gint                     x,
 								  gint                     y);
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_get_center      (ClutterBehaviourEllipse *self,
 								  gint                    *x,
 								  gint                    *y);
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_width       (ClutterBehaviourEllipse *self,
 								  gint                     width);
+CLUTTER_DEPRECATED
 gint                   clutter_behaviour_ellipse_get_width       (ClutterBehaviourEllipse *self);
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_height      (ClutterBehaviourEllipse *self,
 								  gint                     height);
+CLUTTER_DEPRECATED
 gint                   clutter_behaviour_ellipse_get_height      (ClutterBehaviourEllipse *self);
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_angle_start (ClutterBehaviourEllipse *self,
 								  gdouble                  angle_start);
+CLUTTER_DEPRECATED
 gdouble                clutter_behaviour_ellipse_get_angle_start (ClutterBehaviourEllipse *self);
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_angle_end   (ClutterBehaviourEllipse *self,
 								  gdouble                  angle_end);
+CLUTTER_DEPRECATED
 gdouble                clutter_behaviour_ellipse_get_angle_end   (ClutterBehaviourEllipse *self);
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_angle_tilt  (ClutterBehaviourEllipse *self,
 								  ClutterRotateAxis        axis,
 								  gdouble                  angle_tilt);
+CLUTTER_DEPRECATED
 gdouble                clutter_behaviour_ellipse_get_angle_tilt  (ClutterBehaviourEllipse *self,
 								  ClutterRotateAxis        axis);
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_tilt        (ClutterBehaviourEllipse *self,
 								  gdouble                  angle_tilt_x,
 								  gdouble                  angle_tilt_y,
 								  gdouble                  angle_tilt_z);
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_get_tilt        (ClutterBehaviourEllipse *self,
 								  gdouble                 *angle_tilt_x,
 								  gdouble                 *angle_tilt_y,
 								  gdouble                 *angle_tilt_z);
+CLUTTER_DEPRECATED
 ClutterRotateDirection clutter_behaviour_ellipse_get_direction   (ClutterBehaviourEllipse *self);
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_direction   (ClutterBehaviourEllipse *self,
 								  ClutterRotateDirection   direction);
 
-#endif /* CLUTTER_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* __CLUTTER_BEHAVIOUR_ELLIPSE_H__ */
diff --git a/clutter/deprecated/clutter-behaviour-opacity.c b/clutter/deprecated/clutter-behaviour-opacity.c
index 5cc3899e2..072b28fa1 100644
--- a/clutter/deprecated/clutter-behaviour-opacity.c
+++ b/clutter/deprecated/clutter-behaviour-opacity.c
@@ -42,6 +42,8 @@
 
 #include <math.h>
 
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
 #include "clutter-behaviour.h"
 #include "clutter-behaviour-opacity.h"
 #include "clutter-private.h"
diff --git a/clutter/deprecated/clutter-behaviour-opacity.h b/clutter/deprecated/clutter-behaviour-opacity.h
index b6519aab8..63ae33d67 100644
--- a/clutter/deprecated/clutter-behaviour-opacity.h
+++ b/clutter/deprecated/clutter-behaviour-opacity.h
@@ -34,8 +34,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
-
 #define CLUTTER_TYPE_BEHAVIOUR_OPACITY (clutter_behaviour_opacity_get_type ())
 
 #define CLUTTER_BEHAVIOUR_OPACITY(obj) \
@@ -97,19 +95,20 @@ struct _ClutterBehaviourOpacityClass
 
 GType clutter_behaviour_opacity_get_type (void) G_GNUC_CONST;
 
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate and ClutterActor:opacity)
 ClutterBehaviour *clutter_behaviour_opacity_new (ClutterAlpha *alpha,
                                                  guint8        opacity_start,
                                                  guint8        opacity_end);
 
+CLUTTER_DEPRECATED
 void clutter_behaviour_opacity_set_bounds (ClutterBehaviourOpacity *behaviour,
                                            guint8                   opacity_start,
                                            guint8                   opacity_end);
+CLUTTER_DEPRECATED
 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__ */
diff --git a/clutter/deprecated/clutter-behaviour-path.c b/clutter/deprecated/clutter-behaviour-path.c
index 30c5380f7..48ada7ed8 100644
--- a/clutter/deprecated/clutter-behaviour-path.c
+++ b/clutter/deprecated/clutter-behaviour-path.c
@@ -67,6 +67,8 @@
 #include "config.h"
 #endif
 
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
 #include "clutter-behaviour.h"
 #include "clutter-behaviour-path.h"
 #include "clutter-bezier.h"
diff --git a/clutter/deprecated/clutter-behaviour-path.h b/clutter/deprecated/clutter-behaviour-path.h
index fe15c3e50..f26e3e570 100644
--- a/clutter/deprecated/clutter-behaviour-path.h
+++ b/clutter/deprecated/clutter-behaviour-path.h
@@ -35,8 +35,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
-
 #define CLUTTER_TYPE_BEHAVIOUR_PATH (clutter_behaviour_path_get_type ())
 
 #define CLUTTER_BEHAVIOUR_PATH(obj) \
@@ -110,25 +108,27 @@ struct _ClutterBehaviourPathClass
 
 GType clutter_behaviour_path_get_type (void) G_GNUC_CONST;
 
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
 ClutterBehaviour *clutter_behaviour_path_new          (ClutterAlpha         *alpha,
                                                        ClutterPath          *path);
 
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
 ClutterBehaviour *clutter_behaviour_path_new_with_description
                                                       (ClutterAlpha         *alpha,
                                                        const gchar          *desc);
 
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
 ClutterBehaviour *clutter_behaviour_path_new_with_knots
                                                       (ClutterAlpha         *alpha,
                                                        const ClutterKnot    *knots,
                                                        guint                 n_knots);
 
+CLUTTER_DEPRECATED
 void              clutter_behaviour_path_set_path     (ClutterBehaviourPath *pathb,
                                                        ClutterPath          *path);
-
+CLUTTER_DEPRECATED
 ClutterPath *     clutter_behaviour_path_get_path     (ClutterBehaviourPath *pathb);
 
-#endif /* CLUTTER_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* __CLUTTER_BEHAVIOUR_PATH_H__ */
diff --git a/clutter/deprecated/clutter-behaviour-rotate.c b/clutter/deprecated/clutter-behaviour-rotate.c
index 0ab5da67c..056eb544b 100644
--- a/clutter/deprecated/clutter-behaviour-rotate.c
+++ b/clutter/deprecated/clutter-behaviour-rotate.c
@@ -41,6 +41,8 @@
 
 #include <math.h>
 
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
 #include "clutter-behaviour.h"
 #include "clutter-behaviour-rotate.h"
 #include "clutter-debug.h"
diff --git a/clutter/deprecated/clutter-behaviour-rotate.h b/clutter/deprecated/clutter-behaviour-rotate.h
index df880a562..84764ebe3 100644
--- a/clutter/deprecated/clutter-behaviour-rotate.h
+++ b/clutter/deprecated/clutter-behaviour-rotate.h
@@ -32,8 +32,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
-
 #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))
@@ -80,34 +78,41 @@ struct _ClutterBehaviourRotateClass
 
 GType clutter_behaviour_rotate_get_type (void) G_GNUC_CONST;
 
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
 ClutterBehaviour *     clutter_behaviour_rotate_new           (ClutterAlpha           *alpha,
                                                                ClutterRotateAxis       axis,
                                                                ClutterRotateDirection  direction,
                                                                gdouble                 angle_start,
                                                                gdouble                 angle_end);
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_rotate_get_center    (ClutterBehaviourRotate *rotate,
 							       gint                   *x,
 							       gint                   *y,
 							       gint                   *z);
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_rotate_set_center    (ClutterBehaviourRotate *rotate,
 							       gint                    x,
 							       gint                    y,
 							       gint                    z);
+CLUTTER_DEPRECATED
 ClutterRotateAxis      clutter_behaviour_rotate_get_axis      (ClutterBehaviourRotate *rotate);
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_rotate_set_axis      (ClutterBehaviourRotate *rotate,
                                                                ClutterRotateAxis       axis);
+CLUTTER_DEPRECATED
 ClutterRotateDirection clutter_behaviour_rotate_get_direction (ClutterBehaviourRotate *rotate);
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_rotate_set_direction (ClutterBehaviourRotate *rotate,
                                                                ClutterRotateDirection  direction);
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_rotate_get_bounds    (ClutterBehaviourRotate *rotate,
                                                                gdouble                *angle_start,
                                                                gdouble                *angle_end);
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_rotate_set_bounds    (ClutterBehaviourRotate *rotate,
                                                                gdouble                 angle_start,
                                                                gdouble                 angle_end);
 
-#endif /* CLUTTER_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* __CLUTTER_BEHAVIOUR_ROTATE_H__ */
diff --git a/clutter/deprecated/clutter-behaviour-scale.c b/clutter/deprecated/clutter-behaviour-scale.c
index 82a3b0e6c..23292e117 100644
--- a/clutter/deprecated/clutter-behaviour-scale.c
+++ b/clutter/deprecated/clutter-behaviour-scale.c
@@ -41,6 +41,8 @@
 
 #include <math.h>
 
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
 #include "clutter-behaviour.h"
 #include "clutter-behaviour-scale.h"
 #include "clutter-debug.h"
diff --git a/clutter/deprecated/clutter-behaviour-scale.h b/clutter/deprecated/clutter-behaviour-scale.h
index 3479c7c37..c03207b19 100644
--- a/clutter/deprecated/clutter-behaviour-scale.h
+++ b/clutter/deprecated/clutter-behaviour-scale.h
@@ -34,8 +34,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
-
 #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))
@@ -83,24 +81,26 @@ struct _ClutterBehaviourScaleClass
 
 GType clutter_behaviour_scale_get_type (void) G_GNUC_CONST;
 
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate with ClutterActor:scale-x and ClutterActor:scale-y)
 ClutterBehaviour *clutter_behaviour_scale_new        (ClutterAlpha          *alpha,
                                                       gdouble                x_scale_start,
                                                       gdouble                y_scale_start,
                                                       gdouble                x_scale_end,
                                                       gdouble                y_scale_end);
+
+CLUTTER_DEPRECATED
 void              clutter_behaviour_scale_set_bounds (ClutterBehaviourScale *scale,
                                                       gdouble                x_scale_start,
                                                       gdouble                y_scale_start,
                                                       gdouble                x_scale_end,
                                                       gdouble                y_scale_end);
+CLUTTER_DEPRECATED
 void              clutter_behaviour_scale_get_bounds (ClutterBehaviourScale *scale,
                                                       gdouble               *x_scale_start,
                                                       gdouble               *y_scale_start,
                                                       gdouble               *x_scale_end,
                                                       gdouble               *y_scale_end);
 
-#endif /* CLUTTER_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* __CLUTTER_BEHAVIOUR_SCALE_H__ */
diff --git a/clutter/deprecated/clutter-behaviour.c b/clutter/deprecated/clutter-behaviour.c
index 9f238fe7c..1cbdbe742 100644
--- a/clutter/deprecated/clutter-behaviour.c
+++ b/clutter/deprecated/clutter-behaviour.c
@@ -77,6 +77,7 @@
 #include "config.h"
 #endif
 
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include "clutter-behaviour.h"
 
 #include "clutter-debug.h"
@@ -86,73 +87,6 @@
 #include "clutter-scriptable.h"
 #include "clutter-script-private.h"
 
-/**
- * clutter_knot_copy:
- * @knot: a #ClutterKnot
- *
- * Makes an allocated copy of a knot.
- *
- * Return value: the copied knot.
- *
- * Since: 0.2
- */
-ClutterKnot *
-clutter_knot_copy (const ClutterKnot *knot)
-{
-  ClutterKnot *copy;
-
-  copy = g_slice_new0 (ClutterKnot);
-  
-  *copy = *knot;
-
-  return copy;
-}
-
-/**
- * clutter_knot_free:
- * @knot: a #ClutterKnot
- *
- * Frees the memory of an allocated knot.
- *
- * Since: 0.2
- */
-void
-clutter_knot_free (ClutterKnot *knot)
-{
-  if (G_LIKELY (knot))
-    {
-      g_slice_free (ClutterKnot, knot);
-    }
-}
-
-/**
- * clutter_knot_equal:
- * @knot_a: First knot
- * @knot_b: Second knot
- *
- * Compares to knot and checks if the point to the same location.
- *
- * Return value: %TRUE if the knots point to the same location.
- *
- * Since: 0.2
- */
-gboolean
-clutter_knot_equal (const ClutterKnot *knot_a,
-                    const ClutterKnot *knot_b)
-{
-  g_return_val_if_fail (knot_a != NULL, FALSE);
-  g_return_val_if_fail (knot_b != NULL, FALSE);
-
-  if (knot_a == knot_b)
-    return TRUE;
-
-  return knot_a->x == knot_b->x && knot_a->y == knot_b->y;
-}
-
-G_DEFINE_BOXED_TYPE (ClutterKnot, clutter_knot,
-                     clutter_knot_copy,
-                     clutter_knot_free);
-
 static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
 
 G_DEFINE_ABSTRACT_TYPE_WITH_CODE (ClutterBehaviour,
@@ -298,6 +232,8 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass)
    * the alpha-notify virtual function is called.
    *
    * Since: 0.2
+   *
+   * Deprecated: 1.6
    */
   obj_props[PROP_ALPHA] =
     g_param_spec_object ("alpha",
@@ -321,6 +257,8 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass)
    * to an actor.
    *
    * Since: 0.4
+   *
+   * Deprecated: 1.6
    */
   behave_signals[APPLIED] =
     g_signal_new ("applied",
@@ -340,6 +278,8 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass)
    * to an actor anymore.
    *
    * Since: 0.4
+   *
+   * Deprecated: 1.6
    */
   behave_signals[REMOVED] =
     g_signal_new ("removed",
@@ -376,6 +316,8 @@ remove_actor_on_destroy (ClutterActor     *actor,
  * the actor.
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 void
 clutter_behaviour_apply (ClutterBehaviour *behave,
@@ -415,6 +357,8 @@ clutter_behaviour_apply (ClutterBehaviour *behave,
  * Return value: TRUE if actor has behaviour. FALSE otherwise.
  *
  * Since: 0.4
+ *
+ * Deprecated: 1.6
  */
 gboolean
 clutter_behaviour_is_applied (ClutterBehaviour *behave,
@@ -435,6 +379,8 @@ clutter_behaviour_is_applied (ClutterBehaviour *behave,
  * @behave applies.  This function removes a reference on the actor.
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 void
 clutter_behaviour_remove (ClutterBehaviour *behave,
@@ -476,6 +422,8 @@ clutter_behaviour_remove (ClutterBehaviour *behave,
  * Return value: The number of applied actors 
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 gint
 clutter_behaviour_get_n_actors (ClutterBehaviour *behave)
@@ -495,8 +443,10 @@ clutter_behaviour_get_n_actors (ClutterBehaviour *behave)
  * Return value: (transfer none): A Clutter actor or NULL if @index_ is invalid.
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
-ClutterActor*
+ClutterActor *
 clutter_behaviour_get_nth_actor (ClutterBehaviour *behave,
 				 gint              index_)
 {
@@ -515,6 +465,8 @@ clutter_behaviour_get_nth_actor (ClutterBehaviour *behave,
  * Calls @func for every actor driven by @behave.
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 void
 clutter_behaviour_actors_foreach (ClutterBehaviour            *behave,
@@ -546,6 +498,8 @@ clutter_behaviour_actors_foreach (ClutterBehaviour            *behave,
  *   object has been bound to this behaviour.
  * 
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 ClutterAlpha *
 clutter_behaviour_get_alpha (ClutterBehaviour *behave)
@@ -598,6 +552,8 @@ notify_cb (GObject          *object,
  * of the #ClutterAlpha instance.
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 void
 clutter_behaviour_set_alpha (ClutterBehaviour *behave,
@@ -658,6 +614,8 @@ clutter_behaviour_set_alpha (ClutterBehaviour *behave,
  *   finished using it.
  * 
  * Since: 0.2
+ *
+ * Deprecated: 1.6
  */
 GSList *
 clutter_behaviour_get_actors (ClutterBehaviour *behave)
@@ -682,6 +640,8 @@ clutter_behaviour_get_actors (ClutterBehaviour *behave)
  * Removes every actor from the list that @behave holds.
  *
  * Since: 0.4
+ *
+ * Deprecated: 1.6
  */
 void
 clutter_behaviour_remove_all (ClutterBehaviour *behave)
diff --git a/clutter/deprecated/clutter-behaviour.h b/clutter/deprecated/clutter-behaviour.h
index 129c6fb65..97674186d 100644
--- a/clutter/deprecated/clutter-behaviour.h
+++ b/clutter/deprecated/clutter-behaviour.h
@@ -34,8 +34,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
-
 #define CLUTTER_TYPE_BEHAVIOUR clutter_behaviour_get_type()
 
 #define CLUTTER_BEHAVIOUR(obj) \
@@ -138,26 +136,34 @@ struct _ClutterBehaviourClass
 
 GType clutter_behaviour_get_type (void) G_GNUC_CONST;
 
+CLUTTER_DEPRECATED
 void          clutter_behaviour_apply          (ClutterBehaviour            *behave,
                                                 ClutterActor                *actor);
+CLUTTER_DEPRECATED
 void          clutter_behaviour_remove         (ClutterBehaviour            *behave,
                                                 ClutterActor                *actor);
+CLUTTER_DEPRECATED
 void          clutter_behaviour_remove_all     (ClutterBehaviour            *behave);
+CLUTTER_DEPRECATED
 void          clutter_behaviour_actors_foreach (ClutterBehaviour            *behave,
                                                 ClutterBehaviourForeachFunc  func,
                                                 gpointer                     data);
+CLUTTER_DEPRECATED
 gint          clutter_behaviour_get_n_actors   (ClutterBehaviour            *behave);
+CLUTTER_DEPRECATED
 ClutterActor *clutter_behaviour_get_nth_actor  (ClutterBehaviour            *behave,
 						gint                         index_);
+CLUTTER_DEPRECATED
 GSList *      clutter_behaviour_get_actors     (ClutterBehaviour            *behave);
+CLUTTER_DEPRECATED
 ClutterAlpha *clutter_behaviour_get_alpha      (ClutterBehaviour            *behave);
+CLUTTER_DEPRECATED
 void          clutter_behaviour_set_alpha      (ClutterBehaviour            *behave,
                                                 ClutterAlpha                *alpha);
+CLUTTER_DEPRECATED
 gboolean      clutter_behaviour_is_applied     (ClutterBehaviour            *behave,
 						ClutterActor                *actor);
 
-#endif /* !CLUTTER_DISABLE_DEPRECATED || CLUTTER_COMPILATION */
-
 G_END_DECLS
 
 #endif /* __CLUTTER_BEHAVIOUR_H__ */
diff --git a/clutter/deprecated/clutter-fixed.c b/clutter/deprecated/clutter-fixed.c
index b37c15f9f..e5a0746f1 100644
--- a/clutter/deprecated/clutter-fixed.c
+++ b/clutter/deprecated/clutter-fixed.c
@@ -29,6 +29,8 @@
 #include "config.h"
 #endif
 
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
 #include <cogl/cogl.h>
 
 #include <glib-object.h>
diff --git a/clutter/deprecated/clutter-fixed.h b/clutter/deprecated/clutter-fixed.h
index d284bffdd..c313a0344 100644
--- a/clutter/deprecated/clutter-fixed.h
+++ b/clutter/deprecated/clutter-fixed.h
@@ -29,13 +29,11 @@
 #ifndef __CLUTTER_FIXED_H__
 #define __CLUTTER_FIXED_H__
 
-#include <glib-object.h>
 #include <cogl/cogl.h>
+#include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
 
-#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
-
 #define CLUTTER_TYPE_PARAM_FIXED           (clutter_param_fixed_get_type ())
 #define CLUTTER_PARAM_SPEC_FIXED(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), CLUTTER_TYPE_PARAM_FIXED, ClutterParamSpecFixed))
 #define CLUTTER_IS_PARAM_SPEC_FIXED(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), CLUTTER_TYPE_PARAM_FIXED))
@@ -79,10 +77,13 @@ struct _ClutterParamSpecFixed
 
 GType        clutter_param_fixed_get_type (void) G_GNUC_CONST;
 
+CLUTTER_DEPRECATED_FOR(g_value_set_int)
 void         clutter_value_set_fixed      (GValue       *value,
                                            CoglFixed     fixed_);
+CLUTTER_DEPRECATED_FOR(g_value_get_int)
 CoglFixed    clutter_value_get_fixed      (const GValue *value);
 
+CLUTTER_DEPRECATED_FOR(g_param_spec_int)
 GParamSpec * clutter_param_spec_fixed     (const gchar  *name,
                                            const gchar  *nick,
                                            const gchar  *blurb,
@@ -91,9 +92,6 @@ GParamSpec * clutter_param_spec_fixed     (const gchar  *name,
                                            CoglFixed     default_value,
                                            GParamFlags   flags);
 
-
-#endif /* DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* __CLUTTER_FIXED_H__ */
diff --git a/clutter/deprecated/clutter-frame-source.c b/clutter/deprecated/clutter-frame-source.c
index 8f5f46b11..cba050a0f 100644
--- a/clutter/deprecated/clutter-frame-source.c
+++ b/clutter/deprecated/clutter-frame-source.c
@@ -27,6 +27,8 @@
 #include "config.h"
 #endif
 
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
 #include "clutter-frame-source.h"
 #include "clutter-timeout-interval.h"
 #include "clutter-private.h"
diff --git a/clutter/deprecated/clutter-frame-source.h b/clutter/deprecated/clutter-frame-source.h
index a8a40cc45..d3649fbd3 100644
--- a/clutter/deprecated/clutter-frame-source.h
+++ b/clutter/deprecated/clutter-frame-source.h
@@ -28,24 +28,22 @@
 #ifndef __CLUTTER_FRAME_SOURCE_H__
 #define __CLUTTER_FRAME_SOURCE_H__
 
-#include <glib.h>
+#include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
 
-#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
-
+CLUTTER_DEPRECATED
 guint clutter_frame_source_add (guint          fps,
 				GSourceFunc    func,
 				gpointer       data);
 
+CLUTTER_DEPRECATED
 guint clutter_frame_source_add_full (gint           priority,
 				     guint          fps,
 				     GSourceFunc    func,
 				     gpointer       data,
 				     GDestroyNotify notify);
 
-#endif /* CLUTTER_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* __CLUTTER_FRAME_SOURCE_H__ */
diff --git a/clutter/deprecated/clutter-score.c b/clutter/deprecated/clutter-score.c
index b3153b053..316c54907 100644
--- a/clutter/deprecated/clutter-score.c
+++ b/clutter/deprecated/clutter-score.c
@@ -83,6 +83,8 @@
 #include "config.h"
 #endif
 
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
 #include "clutter-score.h"
 #include "clutter-main.h"
 #include "clutter-marshal.h"
diff --git a/clutter/deprecated/clutter-score.h b/clutter/deprecated/clutter-score.h
index 790e711f4..a00d28d88 100644
--- a/clutter/deprecated/clutter-score.h
+++ b/clutter/deprecated/clutter-score.h
@@ -32,8 +32,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
-
 #define CLUTTER_TYPE_SCORE              (clutter_score_get_type ())
 
 #define CLUTTER_SCORE(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_SCORE, ClutterScore))
@@ -100,34 +98,46 @@ struct _ClutterScoreClass
 
 GType clutter_score_get_type (void) G_GNUC_CONST;
 
+CLUTTER_DEPRECATED
 ClutterScore *   clutter_score_new            (void);
 
+CLUTTER_DEPRECATED
 void             clutter_score_set_loop         (ClutterScore    *score,
                                                  gboolean         loop);
+CLUTTER_DEPRECATED
 gboolean         clutter_score_get_loop         (ClutterScore    *score);
 
+CLUTTER_DEPRECATED
 gulong           clutter_score_append           (ClutterScore    *score,
                                                  ClutterTimeline *parent,
                                                  ClutterTimeline *timeline);
+CLUTTER_DEPRECATED
 gulong           clutter_score_append_at_marker (ClutterScore    *score,
                                                  ClutterTimeline *parent,
                                                  const gchar     *marker_name,
                                                  ClutterTimeline *timeline);
+CLUTTER_DEPRECATED
 void             clutter_score_remove           (ClutterScore    *score,
                                                  gulong           id_);
+CLUTTER_DEPRECATED
 void             clutter_score_remove_all       (ClutterScore    *score);
+CLUTTER_DEPRECATED
 ClutterTimeline *clutter_score_get_timeline     (ClutterScore    *score,
                                                  gulong           id_);
+CLUTTER_DEPRECATED
 GSList *         clutter_score_list_timelines   (ClutterScore    *score);
 
+CLUTTER_DEPRECATED
 void             clutter_score_start            (ClutterScore    *score);
+CLUTTER_DEPRECATED
 void             clutter_score_stop             (ClutterScore    *score);
+CLUTTER_DEPRECATED
 void             clutter_score_pause            (ClutterScore    *score);
+CLUTTER_DEPRECATED
 void             clutter_score_rewind           (ClutterScore    *score);
+CLUTTER_DEPRECATED
 gboolean         clutter_score_is_playing       (ClutterScore    *score);
 
-#endif /* CLUTTER_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* __CLUTTER_SCORE_H__ */
diff --git a/clutter/deprecated/clutter-shader.c b/clutter/deprecated/clutter-shader.c
index eb31a4acd..8108ecc18 100644
--- a/clutter/deprecated/clutter-shader.c
+++ b/clutter/deprecated/clutter-shader.c
@@ -52,6 +52,8 @@
 #include <unistd.h>
 #endif
 
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
diff --git a/clutter/deprecated/clutter-shader.h b/clutter/deprecated/clutter-shader.h
index ee636622a..ae24caf16 100644
--- a/clutter/deprecated/clutter-shader.h
+++ b/clutter/deprecated/clutter-shader.h
@@ -34,8 +34,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
-
 #define CLUTTER_TYPE_SHADER         (clutter_shader_get_type ())
 #define CLUTTER_SHADER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), CLUTTER_TYPE_SHADER, ClutterShader))
 #define CLUTTER_SHADER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), CLUTTER_TYPE_SHADER, ClutterShaderClass))
@@ -110,37 +108,48 @@ struct _ClutterShaderClass
 GQuark clutter_shader_error_quark (void);
 GType clutter_shader_get_type (void) G_GNUC_CONST;
 
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 ClutterShader *       clutter_shader_new                      (void);
 
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 void                  clutter_shader_set_is_enabled           (ClutterShader      *shader,
                                                                gboolean            enabled);
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 gboolean              clutter_shader_get_is_enabled           (ClutterShader      *shader);
 
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 gboolean              clutter_shader_compile                  (ClutterShader      *shader,
                                                                GError            **error);
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 void                  clutter_shader_release                  (ClutterShader      *shader);
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 gboolean              clutter_shader_is_compiled              (ClutterShader      *shader);
 
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 void                  clutter_shader_set_vertex_source        (ClutterShader      *shader,
                                                                const gchar        *data,
                                                                gssize              length);
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 void                  clutter_shader_set_fragment_source      (ClutterShader      *shader,
                                                                const gchar        *data,
                                                                gssize              length);
-
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 const gchar *         clutter_shader_get_vertex_source        (ClutterShader      *shader);
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 const gchar *         clutter_shader_get_fragment_source      (ClutterShader      *shader);
 
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 void                  clutter_shader_set_uniform              (ClutterShader      *shader,
                                                                const gchar        *name,
                                                                const GValue       *value);
 
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 CoglHandle            clutter_shader_get_cogl_program         (ClutterShader      *shader);
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 CoglHandle            clutter_shader_get_cogl_fragment_shader (ClutterShader      *shader);
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 CoglHandle            clutter_shader_get_cogl_vertex_shader   (ClutterShader      *shader);
 
-#endif /* CLUTTER_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* __CLUTTER_SHADER_H__ */
diff --git a/clutter/deprecated/clutter-timeout-interval.c b/clutter/deprecated/clutter-timeout-interval.c
index ac0ad44d1..52ee18029 100644
--- a/clutter/deprecated/clutter-timeout-interval.c
+++ b/clutter/deprecated/clutter-timeout-interval.c
@@ -25,6 +25,8 @@
 #include "config.h"
 #endif
 
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
 /* This file contains the common code to check whether an interval has
    expired used in clutter-frame-source and clutter-timeout-pool. */
 
diff --git a/clutter/deprecated/clutter-timeout-pool.c b/clutter/deprecated/clutter-timeout-pool.c
index 6ef839b8e..0a7ad4b81 100644
--- a/clutter/deprecated/clutter-timeout-pool.c
+++ b/clutter/deprecated/clutter-timeout-pool.c
@@ -34,6 +34,8 @@
 #include "config.h"
 #endif
 
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
 #include "clutter-timeout-pool.h"
 
 #include "clutter-debug.h"
diff --git a/clutter/deprecated/clutter-timeout-pool.h b/clutter/deprecated/clutter-timeout-pool.h
index 0268ab833..44a3f2d54 100644
--- a/clutter/deprecated/clutter-timeout-pool.h
+++ b/clutter/deprecated/clutter-timeout-pool.h
@@ -35,12 +35,10 @@
 #ifndef __CLUTTER_TIMEOUT_POOL_H__
 #define __CLUTTER_TIMEOUT_POOL_H__
 
-#include <glib.h>
+#include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
 
-#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
-
 /**
  * ClutterTimeoutPool: (skip)
  *
@@ -53,17 +51,19 @@ G_BEGIN_DECLS
  */
 typedef struct _ClutterTimeoutPool    ClutterTimeoutPool;
 
+CLUTTER_DEPRECATED
 ClutterTimeoutPool *clutter_timeout_pool_new    (gint                priority);
+
+CLUTTER_DEPRECATED
 guint               clutter_timeout_pool_add    (ClutterTimeoutPool *pool,
                                                  guint               fps,
                                                  GSourceFunc         func,
                                                  gpointer            data,
                                                  GDestroyNotify      notify);
+CLUTTER_DEPRECATED
 void                clutter_timeout_pool_remove (ClutterTimeoutPool *pool,
                                                  guint               id_);
 
-#endif /* CLUTTER_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* __CLUTTER_TIMEOUT_POOL_H__ */