[clutter] Update the deprecation macros



commit d5b565f7b939fcf3d65e310442f91cada3a9b8e2
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Mon Feb 27 15:10:13 2012 +0000

    Update the deprecation macros
    
    Use the new versioned macros instead of the generic ones.

 clutter/clutter-animation.h                    |    8 ++--
 clutter/clutter-backend.c                      |    2 +-
 clutter/deprecated/clutter-actor.h             |   30 +++++++++---------
 clutter/deprecated/clutter-backend.h           |   14 ++++----
 clutter/deprecated/clutter-behaviour-depth.h   |    6 ++--
 clutter/deprecated/clutter-behaviour-ellipse.h |   34 ++++++++++----------
 clutter/deprecated/clutter-behaviour-opacity.h |    6 ++--
 clutter/deprecated/clutter-behaviour-path.h    |   10 +++---
 clutter/deprecated/clutter-behaviour-rotate.h  |   18 +++++-----
 clutter/deprecated/clutter-behaviour-scale.h   |    6 ++--
 clutter/deprecated/clutter-behaviour.h         |   20 ++++++------
 clutter/deprecated/clutter-box.h               |   20 ++++++------
 clutter/deprecated/clutter-container.h         |   24 +++++++-------
 clutter/deprecated/clutter-fixed.h             |    6 ++--
 clutter/deprecated/clutter-frame-source.h      |    4 +-
 clutter/deprecated/clutter-group.h             |    8 ++--
 clutter/deprecated/clutter-main.h              |   32 ++++++++++----------
 clutter/deprecated/clutter-rectangle.h         |   16 +++++-----
 clutter/deprecated/clutter-score.h             |   28 +++++++++---------
 clutter/deprecated/clutter-shader.h            |   38 ++++++++++++------------
 clutter/deprecated/clutter-stage.h             |   18 +++++-----
 clutter/deprecated/clutter-timeline.h          |    6 ++--
 clutter/deprecated/clutter-timeout-pool.h      |    6 ++--
 23 files changed, 180 insertions(+), 180 deletions(-)
---
diff --git a/clutter/clutter-animation.h b/clutter/clutter-animation.h
index ddc61d8..d99bd81 100644
--- a/clutter/clutter-animation.h
+++ b/clutter/clutter-animation.h
@@ -135,11 +135,11 @@ ClutterInterval     *clutter_animation_get_interval    (ClutterAnimation     *an
                                                         const gchar          *property_name);
 void                 clutter_animation_completed       (ClutterAnimation     *animation);
 
-CLUTTER_DEPRECATED_FOR(clutter_timeline_set_progress_mode and clutter_animation_set_timeline)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_animation_set_timeline)
 void                 clutter_animation_set_alpha       (ClutterAnimation     *animation,
                                                         ClutterAlpha         *alpha);
 
-CLUTTER_DEPRECATED_FOR(clutter_animation_get_timeline and clutter_timeline_get_progress_mode)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_animation_get_timeline)
 ClutterAlpha *       clutter_animation_get_alpha       (ClutterAnimation     *animation);
 
 ClutterAnimation *   clutter_actor_animate               (ClutterActor         *actor,
@@ -168,13 +168,13 @@ ClutterAnimation *   clutter_actor_animate_with_timelinev (ClutterActor
 ClutterAnimation *   clutter_actor_get_animation          (ClutterActor         *actor);
 void                 clutter_actor_detach_animation       (ClutterActor         *actor);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_animate_with_timeline)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_animate_with_timeline)
 ClutterAnimation *   clutter_actor_animate_with_alpha    (ClutterActor         *actor,
                                                           ClutterAlpha         *alpha,
                                                           const gchar          *first_property_name,
                                                           ...) G_GNUC_NULL_TERMINATED;
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_animate_with_timelinev)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_animate_with_timelinev)
 ClutterAnimation *   clutter_actor_animate_with_alphav    (ClutterActor         *actor,
                                                            ClutterAlpha         *alpha,
                                                            gint                  n_properties,
diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
index 488008f..849365b 100644
--- a/clutter/clutter-backend.c
+++ b/clutter/clutter-backend.c
@@ -1029,7 +1029,7 @@ clutter_backend_get_double_click_distance (ClutterBackend *backend)
  *
  * Since: 0.4
  *
- * Deprecated: Use #ClutterSettings:font-dpi instead
+ * Deprecated: 1.4: Use #ClutterSettings:font-dpi instead
  */
 void
 clutter_backend_set_resolution (ClutterBackend *backend,
diff --git a/clutter/deprecated/clutter-actor.h b/clutter/deprecated/clutter-actor.h
index 25f92ad..5c0d93d 100644
--- a/clutter/deprecated/clutter-actor.h
+++ b/clutter/deprecated/clutter-actor.h
@@ -33,54 +33,54 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void            clutter_actor_set_geometry      (ClutterActor          *self,
                                                  const ClutterGeometry *geometry);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_get_allocation_geometry)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_allocation_geometry)
 void            clutter_actor_get_geometry      (ClutterActor          *self,
                                                  ClutterGeometry       *geometry);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_8
 guint32         clutter_actor_get_gid           (ClutterActor          *self);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_8
 ClutterActor *  clutter_get_actor_by_gid        (guint32                id_);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child() and clutter_actor_add_child())
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_remove_child() and clutter_actor_add_child())
 void            clutter_actor_reparent          (ClutterActor          *self,
                                                  ClutterActor          *new_parent);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_add_child)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_add_child)
 void            clutter_actor_set_parent        (ClutterActor          *self,
                                                  ClutterActor          *parent);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_remove_child)
 void            clutter_actor_unparent          (ClutterActor          *self);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_above_sibling)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_child_above_sibling)
 void            clutter_actor_raise             (ClutterActor          *self,
                                                  ClutterActor          *below);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_below_sibling)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_child_below_sibling)
 void            clutter_actor_lower             (ClutterActor          *self,
                                                  ClutterActor          *above);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_above_sibling() with NULL sibling)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_child_above_sibling() with NULL sibling)
 void            clutter_actor_raise_top         (ClutterActor          *self);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_below_sibling() with NULL sibling)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_child_below_sibling() with NULL sibling)
 void            clutter_actor_lower_bottom      (ClutterActor          *self);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void            clutter_actor_push_internal     (ClutterActor          *self);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void            clutter_actor_pop_internal      (ClutterActor          *self);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void            clutter_actor_show_all          (ClutterActor          *self);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void            clutter_actor_hide_all          (ClutterActor          *self);
 
 G_END_DECLS
diff --git a/clutter/deprecated/clutter-backend.h b/clutter/deprecated/clutter-backend.h
index 25a6662..3fe0274 100644
--- a/clutter/deprecated/clutter-backend.h
+++ b/clutter/deprecated/clutter-backend.h
@@ -33,29 +33,29 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_FOR(ClutterSettings:font_dpi)
+CLUTTER_DEPRECATED_IN_1_4_FOR(ClutterSettings:font_dpi)
 void            clutter_backend_set_resolution                  (ClutterBackend *backend,
                                                                  gdouble         dpi);
 
-CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_time)
+CLUTTER_DEPRECATED_IN_1_4_FOR(ClutterSettings:double_click_time)
 void            clutter_backend_set_double_click_time           (ClutterBackend *backend,
                                                                  guint           msec);
 
-CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_time)
+CLUTTER_DEPRECATED_IN_1_4_FOR(ClutterSettings:double_click_time)
 guint           clutter_backend_get_double_click_time           (ClutterBackend *backend);
 
-CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_distance)
+CLUTTER_DEPRECATED_IN_1_4_FOR(ClutterSettings:double_click_distance)
 void            clutter_backend_set_double_click_distance       (ClutterBackend *backend,
                                                                  guint           distance);
 
-CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_distance)
+CLUTTER_DEPRECATED_IN_1_4_FOR(ClutterSettings:double_click_distance)
 guint           clutter_backend_get_double_click_distance       (ClutterBackend *backend);
 
-CLUTTER_DEPRECATED_FOR(ClutterSettings:font_name)
+CLUTTER_DEPRECATED_IN_1_4_FOR(ClutterSettings:font_name)
 void            clutter_backend_set_font_name                   (ClutterBackend *backend,
                                                                  const gchar    *font_name);
 
-CLUTTER_DEPRECATED_FOR(ClutterSettings:font_name)
+CLUTTER_DEPRECATED_IN_1_4_FOR(ClutterSettings:font_name)
 const gchar *   clutter_backend_get_font_name                   (ClutterBackend *backend);
 
 
diff --git a/clutter/deprecated/clutter-behaviour-depth.h b/clutter/deprecated/clutter-behaviour-depth.h
index 1354295..2010556 100644
--- a/clutter/deprecated/clutter-behaviour-depth.h
+++ b/clutter/deprecated/clutter-behaviour-depth.h
@@ -81,16 +81,16 @@ struct _ClutterBehaviourDepthClass
 
 GType             clutter_behaviour_depth_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_animate and ClutterActor:depth)
+CLUTTER_DEPRECATED_IN_1_6_FOR(clutter_actor_animate and ClutterActor:depth)
 ClutterBehaviour *clutter_behaviour_depth_new      (ClutterAlpha *alpha,
                                                     gint          depth_start,
                                                     gint          depth_end);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void clutter_behaviour_depth_set_bounds (ClutterBehaviourDepth *behaviour,
                                          gint                   depth_start,
                                          gint                   depth_end);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void clutter_behaviour_depth_get_bounds (ClutterBehaviourDepth *behaviour,
                                          gint                  *depth_start,
                                          gint                  *depth_end);
diff --git a/clutter/deprecated/clutter-behaviour-ellipse.h b/clutter/deprecated/clutter-behaviour-ellipse.h
index 4063434..e535869 100644
--- a/clutter/deprecated/clutter-behaviour-ellipse.h
+++ b/clutter/deprecated/clutter-behaviour-ellipse.h
@@ -92,7 +92,7 @@ struct _ClutterBehaviourEllipseClass
 
 GType clutter_behaviour_ellipse_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
+CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_actor_animate)
 ClutterBehaviour *     clutter_behaviour_ellipse_new             (ClutterAlpha            *alpha,
 								  gint                     x,
 								  gint                     y,
@@ -102,54 +102,54 @@ ClutterBehaviour *     clutter_behaviour_ellipse_new             (ClutterAlpha
 								  gdouble                  start,
 								  gdouble                  end);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_8
 void                   clutter_behaviour_ellipse_set_center      (ClutterBehaviourEllipse *self,
 								  gint                     x,
 								  gint                     y);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_8
 void                   clutter_behaviour_ellipse_get_center      (ClutterBehaviourEllipse *self,
 								  gint                    *x,
 								  gint                    *y);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void                   clutter_behaviour_ellipse_set_width       (ClutterBehaviourEllipse *self,
 								  gint                     width);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 gint                   clutter_behaviour_ellipse_get_width       (ClutterBehaviourEllipse *self);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void                   clutter_behaviour_ellipse_set_height      (ClutterBehaviourEllipse *self,
 								  gint                     height);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 gint                   clutter_behaviour_ellipse_get_height      (ClutterBehaviourEllipse *self);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void                   clutter_behaviour_ellipse_set_angle_start (ClutterBehaviourEllipse *self,
 								  gdouble                  angle_start);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 gdouble                clutter_behaviour_ellipse_get_angle_start (ClutterBehaviourEllipse *self);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void                   clutter_behaviour_ellipse_set_angle_end   (ClutterBehaviourEllipse *self,
 								  gdouble                  angle_end);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 gdouble                clutter_behaviour_ellipse_get_angle_end   (ClutterBehaviourEllipse *self);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void                   clutter_behaviour_ellipse_set_angle_tilt  (ClutterBehaviourEllipse *self,
 								  ClutterRotateAxis        axis,
 								  gdouble                  angle_tilt);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 gdouble                clutter_behaviour_ellipse_get_angle_tilt  (ClutterBehaviourEllipse *self,
 								  ClutterRotateAxis        axis);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void                   clutter_behaviour_ellipse_set_tilt        (ClutterBehaviourEllipse *self,
 								  gdouble                  angle_tilt_x,
 								  gdouble                  angle_tilt_y,
 								  gdouble                  angle_tilt_z);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void                   clutter_behaviour_ellipse_get_tilt        (ClutterBehaviourEllipse *self,
 								  gdouble                 *angle_tilt_x,
 								  gdouble                 *angle_tilt_y,
 								  gdouble                 *angle_tilt_z);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 ClutterRotateDirection clutter_behaviour_ellipse_get_direction   (ClutterBehaviourEllipse *self);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void                   clutter_behaviour_ellipse_set_direction   (ClutterBehaviourEllipse *self,
 								  ClutterRotateDirection   direction);
 
diff --git a/clutter/deprecated/clutter-behaviour-opacity.h b/clutter/deprecated/clutter-behaviour-opacity.h
index 63ae33d..77b7377 100644
--- a/clutter/deprecated/clutter-behaviour-opacity.h
+++ b/clutter/deprecated/clutter-behaviour-opacity.h
@@ -95,16 +95,16 @@ struct _ClutterBehaviourOpacityClass
 
 GType clutter_behaviour_opacity_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_animate and ClutterActor:opacity)
+CLUTTER_DEPRECATED_IN_1_6_FOR(clutter_actor_animate and ClutterActor:opacity)
 ClutterBehaviour *clutter_behaviour_opacity_new (ClutterAlpha *alpha,
                                                  guint8        opacity_start,
                                                  guint8        opacity_end);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void clutter_behaviour_opacity_set_bounds (ClutterBehaviourOpacity *behaviour,
                                            guint8                   opacity_start,
                                            guint8                   opacity_end);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void clutter_behaviour_opacity_get_bounds (ClutterBehaviourOpacity *behaviour,
                                            guint8                  *opacity_start,
                                            guint8                  *opacity_end);
diff --git a/clutter/deprecated/clutter-behaviour-path.h b/clutter/deprecated/clutter-behaviour-path.h
index f26e3e5..f6576fa 100644
--- a/clutter/deprecated/clutter-behaviour-path.h
+++ b/clutter/deprecated/clutter-behaviour-path.h
@@ -108,25 +108,25 @@ struct _ClutterBehaviourPathClass
 
 GType clutter_behaviour_path_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
+CLUTTER_DEPRECATED_IN_1_6_FOR(clutter_actor_animate)
 ClutterBehaviour *clutter_behaviour_path_new          (ClutterAlpha         *alpha,
                                                        ClutterPath          *path);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
+CLUTTER_DEPRECATED_IN_1_6_FOR(clutter_actor_animate)
 ClutterBehaviour *clutter_behaviour_path_new_with_description
                                                       (ClutterAlpha         *alpha,
                                                        const gchar          *desc);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
+CLUTTER_DEPRECATED_IN_1_6_FOR(clutter_actor_animate)
 ClutterBehaviour *clutter_behaviour_path_new_with_knots
                                                       (ClutterAlpha         *alpha,
                                                        const ClutterKnot    *knots,
                                                        guint                 n_knots);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void              clutter_behaviour_path_set_path     (ClutterBehaviourPath *pathb,
                                                        ClutterPath          *path);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 ClutterPath *     clutter_behaviour_path_get_path     (ClutterBehaviourPath *pathb);
 
 G_END_DECLS
diff --git a/clutter/deprecated/clutter-behaviour-rotate.h b/clutter/deprecated/clutter-behaviour-rotate.h
index 84764eb..16e5ce9 100644
--- a/clutter/deprecated/clutter-behaviour-rotate.h
+++ b/clutter/deprecated/clutter-behaviour-rotate.h
@@ -78,37 +78,37 @@ struct _ClutterBehaviourRotateClass
 
 GType clutter_behaviour_rotate_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
+CLUTTER_DEPRECATED_IN_1_6_FOR(clutter_actor_animate)
 ClutterBehaviour *     clutter_behaviour_rotate_new           (ClutterAlpha           *alpha,
                                                                ClutterRotateAxis       axis,
                                                                ClutterRotateDirection  direction,
                                                                gdouble                 angle_start,
                                                                gdouble                 angle_end);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void                   clutter_behaviour_rotate_get_center    (ClutterBehaviourRotate *rotate,
 							       gint                   *x,
 							       gint                   *y,
 							       gint                   *z);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void                   clutter_behaviour_rotate_set_center    (ClutterBehaviourRotate *rotate,
 							       gint                    x,
 							       gint                    y,
 							       gint                    z);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 ClutterRotateAxis      clutter_behaviour_rotate_get_axis      (ClutterBehaviourRotate *rotate);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void                   clutter_behaviour_rotate_set_axis      (ClutterBehaviourRotate *rotate,
                                                                ClutterRotateAxis       axis);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 ClutterRotateDirection clutter_behaviour_rotate_get_direction (ClutterBehaviourRotate *rotate);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void                   clutter_behaviour_rotate_set_direction (ClutterBehaviourRotate *rotate,
                                                                ClutterRotateDirection  direction);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void                   clutter_behaviour_rotate_get_bounds    (ClutterBehaviourRotate *rotate,
                                                                gdouble                *angle_start,
                                                                gdouble                *angle_end);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void                   clutter_behaviour_rotate_set_bounds    (ClutterBehaviourRotate *rotate,
                                                                gdouble                 angle_start,
                                                                gdouble                 angle_end);
diff --git a/clutter/deprecated/clutter-behaviour-scale.h b/clutter/deprecated/clutter-behaviour-scale.h
index c03207b..c072234 100644
--- a/clutter/deprecated/clutter-behaviour-scale.h
+++ b/clutter/deprecated/clutter-behaviour-scale.h
@@ -81,20 +81,20 @@ 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)
+CLUTTER_DEPRECATED_IN_1_6_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
+CLUTTER_DEPRECATED_IN_1_6
 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
+CLUTTER_DEPRECATED_IN_1_6
 void              clutter_behaviour_scale_get_bounds (ClutterBehaviourScale *scale,
                                                       gdouble               *x_scale_start,
                                                       gdouble               *y_scale_start,
diff --git a/clutter/deprecated/clutter-behaviour.h b/clutter/deprecated/clutter-behaviour.h
index 9767418..6e43f49 100644
--- a/clutter/deprecated/clutter-behaviour.h
+++ b/clutter/deprecated/clutter-behaviour.h
@@ -136,31 +136,31 @@ struct _ClutterBehaviourClass
 
 GType clutter_behaviour_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void          clutter_behaviour_apply          (ClutterBehaviour            *behave,
                                                 ClutterActor                *actor);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void          clutter_behaviour_remove         (ClutterBehaviour            *behave,
                                                 ClutterActor                *actor);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void          clutter_behaviour_remove_all     (ClutterBehaviour            *behave);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void          clutter_behaviour_actors_foreach (ClutterBehaviour            *behave,
                                                 ClutterBehaviourForeachFunc  func,
                                                 gpointer                     data);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 gint          clutter_behaviour_get_n_actors   (ClutterBehaviour            *behave);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 ClutterActor *clutter_behaviour_get_nth_actor  (ClutterBehaviour            *behave,
 						gint                         index_);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 GSList *      clutter_behaviour_get_actors     (ClutterBehaviour            *behave);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 ClutterAlpha *clutter_behaviour_get_alpha      (ClutterBehaviour            *behave);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void          clutter_behaviour_set_alpha      (ClutterBehaviour            *behave,
                                                 ClutterAlpha                *alpha);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 gboolean      clutter_behaviour_is_applied     (ClutterBehaviour            *behave,
 						ClutterActor                *actor);
 
diff --git a/clutter/deprecated/clutter-box.h b/clutter/deprecated/clutter-box.h
index ef03ee4..e83f05b 100644
--- a/clutter/deprecated/clutter-box.h
+++ b/clutter/deprecated/clutter-box.h
@@ -85,52 +85,52 @@ struct _ClutterBoxClass
 
 GType clutter_box_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_new)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_new)
 ClutterActor *        clutter_box_new                (ClutterLayoutManager *manager);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_set_layout_manager)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_layout_manager)
 void                  clutter_box_set_layout_manager (ClutterBox           *box,
                                                       ClutterLayoutManager *manager);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_get_layout_manager)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_layout_manager)
 ClutterLayoutManager *clutter_box_get_layout_manager (ClutterBox           *box);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_set_background_color)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_background_color)
 void                  clutter_box_set_color          (ClutterBox           *box,
                                                       const ClutterColor   *color);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_get_background_color)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_background_color)
 void                  clutter_box_get_color          (ClutterBox           *box,
                                                       ClutterColor         *color);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_add_child)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_add_child)
 void                  clutter_box_pack               (ClutterBox           *box,
                                                       ClutterActor         *actor,
                                                       const gchar          *first_property,
                                                       ...);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_add_child)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_add_child)
 void                  clutter_box_packv              (ClutterBox           *box,
                                                       ClutterActor         *actor,
                                                       guint                 n_properties,
                                                       const gchar * const   properties[],
                                                       const GValue         *values);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_insert_child_above)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_insert_child_above)
 void                  clutter_box_pack_after         (ClutterBox           *box,
                                                       ClutterActor         *actor,
                                                       ClutterActor         *sibling,
                                                       const gchar          *first_property,
                                                       ...);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_insert_child_below)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_insert_child_below)
 void                  clutter_box_pack_before        (ClutterBox           *box,
                                                       ClutterActor         *actor,
                                                       ClutterActor         *sibling,
                                                       const gchar          *first_property,
                                                       ...);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_insert_child_at_index)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_insert_child_at_index)
 void                  clutter_box_pack_at            (ClutterBox           *box,
                                                       ClutterActor         *actor,
                                                       gint                  position,
diff --git a/clutter/deprecated/clutter-container.h b/clutter/deprecated/clutter-container.h
index 0be03b2..38e7898 100644
--- a/clutter/deprecated/clutter-container.h
+++ b/clutter/deprecated/clutter-container.h
@@ -34,58 +34,58 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_add_child)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_add_child)
 void            clutter_container_add                           (ClutterContainer *container,
                                                                  ClutterActor     *first_actor,
                                                                  ...) G_GNUC_NULL_TERMINATED;
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_add_child)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_add_child)
 void            clutter_container_add_actor                     (ClutterContainer *container,
                                                                  ClutterActor     *actor);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_add_child)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_add_child)
 void            clutter_container_add_valist                    (ClutterContainer *container,
                                                                  ClutterActor     *first_actor,
                                                                  va_list           var_args);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_remove_child)
 void            clutter_container_remove                        (ClutterContainer *container,
                                                                  ClutterActor     *first_actor,
                                                                  ...) G_GNUC_NULL_TERMINATED;
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_remove_child)
 void            clutter_container_remove_actor                  (ClutterContainer *container,
                                                                  ClutterActor     *actor);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_remove_child)
 void            clutter_container_remove_valist                 (ClutterContainer *container,
                                                                  ClutterActor     *first_actor,
                                                                  va_list           var_args);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_get_children)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_children)
 GList *         clutter_container_get_children                  (ClutterContainer *container);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void            clutter_container_foreach                       (ClutterContainer *container,
                                                                  ClutterCallback   callback,
                                                                  gpointer          user_data);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void            clutter_container_foreach_with_internals        (ClutterContainer *container,
                                                                  ClutterCallback   callback,
                                                                  gpointer          user_data);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_above_sibling)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_child_above_sibling)
 void            clutter_container_raise_child                   (ClutterContainer *container,
                                                                  ClutterActor     *actor,
                                                                  ClutterActor     *sibling);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_below_sibling)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_child_below_sibling)
 void            clutter_container_lower_child                   (ClutterContainer *container,
                                                                  ClutterActor     *actor,
                                                                  ClutterActor     *sibling);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void            clutter_container_sort_depth_order              (ClutterContainer *container);
 
 G_END_DECLS
diff --git a/clutter/deprecated/clutter-fixed.h b/clutter/deprecated/clutter-fixed.h
index c313a03..c756ef4 100644
--- a/clutter/deprecated/clutter-fixed.h
+++ b/clutter/deprecated/clutter-fixed.h
@@ -77,13 +77,13 @@ struct _ClutterParamSpecFixed
 
 GType        clutter_param_fixed_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_FOR(g_value_set_int)
+CLUTTER_DEPRECATED_IN_1_10_FOR(g_value_set_int)
 void         clutter_value_set_fixed      (GValue       *value,
                                            CoglFixed     fixed_);
-CLUTTER_DEPRECATED_FOR(g_value_get_int)
+CLUTTER_DEPRECATED_IN_1_10_FOR(g_value_get_int)
 CoglFixed    clutter_value_get_fixed      (const GValue *value);
 
-CLUTTER_DEPRECATED_FOR(g_param_spec_int)
+CLUTTER_DEPRECATED_IN_1_10_FOR(g_param_spec_int)
 GParamSpec * clutter_param_spec_fixed     (const gchar  *name,
                                            const gchar  *nick,
                                            const gchar  *blurb,
diff --git a/clutter/deprecated/clutter-frame-source.h b/clutter/deprecated/clutter-frame-source.h
index d3649fb..f451341 100644
--- a/clutter/deprecated/clutter-frame-source.h
+++ b/clutter/deprecated/clutter-frame-source.h
@@ -32,12 +32,12 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 guint clutter_frame_source_add (guint          fps,
 				GSourceFunc    func,
 				gpointer       data);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 guint clutter_frame_source_add_full (gint           priority,
 				     guint          fps,
 				     GSourceFunc    func,
diff --git a/clutter/deprecated/clutter-group.h b/clutter/deprecated/clutter-group.h
index 650f1df..5bc378f 100644
--- a/clutter/deprecated/clutter-group.h
+++ b/clutter/deprecated/clutter-group.h
@@ -31,17 +31,17 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_new)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_new)
 ClutterActor *  clutter_group_new               (void);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_get_child_at_index)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_child_at_index)
 ClutterActor *  clutter_group_get_nth_child     (ClutterGroup *self,
                                                  gint          index_);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_get_n_children)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_n_children)
 gint            clutter_group_get_n_children    (ClutterGroup *self);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_remove_all_children)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_remove_all_children)
 void            clutter_group_remove_all        (ClutterGroup *self);
 
 #ifndef CLUTTER_DISABLE_DEPRECATED
diff --git a/clutter/deprecated/clutter-main.h b/clutter/deprecated/clutter-main.h
index e83cafc..d05d94b 100644
--- a/clutter/deprecated/clutter-main.h
+++ b/clutter/deprecated/clutter-main.h
@@ -31,58 +31,58 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void                    clutter_threads_init                    (void);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 guint                   clutter_threads_add_frame_source        (guint             fps,
                                                                  GSourceFunc       func,
                                                                  gpointer          data);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 guint                   clutter_threads_add_frame_source_full   (gint              priority,
                                                                  guint             fps,
                                                                  GSourceFunc       func,
                                                                  gpointer          data,
                                                                  GDestroyNotify    notify);
 
-CLUTTER_DEPRECATED_FOR(clutter_stage_set_motion_events_enabled)
+CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_stage_set_motion_events_enabled)
 void                    clutter_set_motion_events_enabled       (gboolean          enable);
 
-CLUTTER_DEPRECATED_FOR(clutter_stage_get_motion_events_enabled)
+CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_stage_get_motion_events_enabled)
 gboolean                clutter_get_motion_events_enabled       (void);
 
-CLUTTER_DEPRECATED_FOR(clutter_stage_ensure_redraw)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_stage_ensure_redraw)
 void                    clutter_redraw                          (ClutterStage     *stage);
 
-CLUTTER_DEPRECATED_FOR(cogl_pango_font_map_clear_glyph_cache)
+CLUTTER_DEPRECATED_IN_1_10_FOR(cogl_pango_font_map_clear_glyph_cache)
 void                    clutter_clear_glyph_cache               (void);
 
-CLUTTER_DEPRECATED_FOR(clutter_backend_set_font_options)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_backend_set_font_options)
 void                    clutter_set_font_flags                  (ClutterFontFlags  flags);
 
-CLUTTER_DEPRECATED_FOR(clutter_backend_get_font_options)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_backend_get_font_options)
 ClutterFontFlags        clutter_get_font_flags                  (void);
 
-CLUTTER_DEPRECATED_FOR(clutter_device_manager_get_device)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_device_manager_get_device)
 ClutterInputDevice *    clutter_get_input_device_for_id         (gint id_);
 
-CLUTTER_DEPRECATED_FOR(clutter_input_device_grab)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_input_device_grab)
 void                    clutter_grab_pointer_for_device         (ClutterActor     *actor,
                                                                  gint              id_);
 
-CLUTTER_DEPRECATED_FOR(clutter_input_device_ungrab)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_input_device_ungrab)
 void                    clutter_ungrab_pointer_for_device       (gint              id_);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void                    clutter_set_default_frame_rate          (guint             frames_per_sec);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 gulong                  clutter_get_timestamp                   (void);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 gboolean                clutter_get_debug_enabled               (void);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 gboolean                clutter_get_show_fps                    (void);
 
 G_END_DECLS
diff --git a/clutter/deprecated/clutter-rectangle.h b/clutter/deprecated/clutter-rectangle.h
index f22121d..7c05b75 100644
--- a/clutter/deprecated/clutter-rectangle.h
+++ b/clutter/deprecated/clutter-rectangle.h
@@ -82,32 +82,32 @@ struct _ClutterRectangleClass
 
 GType clutter_rectangle_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_new)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_new)
 ClutterActor *clutter_rectangle_new              (void);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_new)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_new)
 ClutterActor *clutter_rectangle_new_with_color   (const ClutterColor *color);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_get_background_color)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_background_color)
 void          clutter_rectangle_get_color        (ClutterRectangle   *rectangle,
                                                   ClutterColor       *color);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_set_background_color)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_background_color)
 void          clutter_rectangle_set_color        (ClutterRectangle   *rectangle,
 						  const ClutterColor *color);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 guint         clutter_rectangle_get_border_width (ClutterRectangle   *rectangle);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void          clutter_rectangle_set_border_width (ClutterRectangle   *rectangle,
                                                   guint               width);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void          clutter_rectangle_get_border_color (ClutterRectangle   *rectangle,
                                                   ClutterColor       *color);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void          clutter_rectangle_set_border_color (ClutterRectangle   *rectangle,
                                                   const ClutterColor *color);
 
diff --git a/clutter/deprecated/clutter-score.h b/clutter/deprecated/clutter-score.h
index a00d28d..7ede3e1 100644
--- a/clutter/deprecated/clutter-score.h
+++ b/clutter/deprecated/clutter-score.h
@@ -98,44 +98,44 @@ struct _ClutterScoreClass
 
 GType clutter_score_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 ClutterScore *   clutter_score_new            (void);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void             clutter_score_set_loop         (ClutterScore    *score,
                                                  gboolean         loop);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 gboolean         clutter_score_get_loop         (ClutterScore    *score);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 gulong           clutter_score_append           (ClutterScore    *score,
                                                  ClutterTimeline *parent,
                                                  ClutterTimeline *timeline);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 gulong           clutter_score_append_at_marker (ClutterScore    *score,
                                                  ClutterTimeline *parent,
                                                  const gchar     *marker_name,
                                                  ClutterTimeline *timeline);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void             clutter_score_remove           (ClutterScore    *score,
                                                  gulong           id_);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void             clutter_score_remove_all       (ClutterScore    *score);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 ClutterTimeline *clutter_score_get_timeline     (ClutterScore    *score,
                                                  gulong           id_);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 GSList *         clutter_score_list_timelines   (ClutterScore    *score);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void             clutter_score_start            (ClutterScore    *score);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void             clutter_score_stop             (ClutterScore    *score);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void             clutter_score_pause            (ClutterScore    *score);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void             clutter_score_rewind           (ClutterScore    *score);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 gboolean         clutter_score_is_playing       (ClutterScore    *score);
 
 G_END_DECLS
diff --git a/clutter/deprecated/clutter-shader.h b/clutter/deprecated/clutter-shader.h
index 37c8e64..9e2c019 100644
--- a/clutter/deprecated/clutter-shader.h
+++ b/clutter/deprecated/clutter-shader.h
@@ -108,68 +108,68 @@ struct _ClutterShaderClass
 GQuark clutter_shader_error_quark (void);
 GType clutter_shader_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
 ClutterShader *       clutter_shader_new                      (void);
 
-CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
 void                  clutter_shader_set_is_enabled           (ClutterShader      *shader,
                                                                gboolean            enabled);
-CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
 gboolean              clutter_shader_get_is_enabled           (ClutterShader      *shader);
 
-CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
 gboolean              clutter_shader_compile                  (ClutterShader      *shader,
                                                                GError            **error);
-CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
 void                  clutter_shader_release                  (ClutterShader      *shader);
-CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
 gboolean              clutter_shader_is_compiled              (ClutterShader      *shader);
 
-CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
 void                  clutter_shader_set_vertex_source        (ClutterShader      *shader,
                                                                const gchar        *data,
                                                                gssize              length);
-CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
 void                  clutter_shader_set_fragment_source      (ClutterShader      *shader,
                                                                const gchar        *data,
                                                                gssize              length);
-CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
 const gchar *         clutter_shader_get_vertex_source        (ClutterShader      *shader);
-CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
 const gchar *         clutter_shader_get_fragment_source      (ClutterShader      *shader);
 
-CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
 void                  clutter_shader_set_uniform              (ClutterShader      *shader,
                                                                const gchar        *name,
                                                                const GValue       *value);
 
-CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
 CoglHandle            clutter_shader_get_cogl_program         (ClutterShader      *shader);
-CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
 CoglHandle            clutter_shader_get_cogl_fragment_shader (ClutterShader      *shader);
-CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
 CoglHandle            clutter_shader_get_cogl_vertex_shader   (ClutterShader      *shader);
 
 /* ClutterActor methods */
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_add_effect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_actor_add_effect)
 gboolean              clutter_actor_set_shader                (ClutterActor       *self,
                                                                ClutterShader      *shader);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_get_effect)
+CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_actor_get_effect)
 ClutterShader *       clutter_actor_get_shader                (ClutterActor       *self);
 
-CLUTTER_DEPRECATED_FOR(clutter_shader_effect_set_uniform_value)
+CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_shader_effect_set_uniform_value)
 void                  clutter_actor_set_shader_param          (ClutterActor       *self,
                                                                const gchar        *param,
                                                                const GValue       *value);
 
-CLUTTER_DEPRECATED_FOR(clutter_shader_effect_set_uniform)
+CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_shader_effect_set_uniform)
 void                  clutter_actor_set_shader_param_int      (ClutterActor       *self,
                                                                const gchar        *param,
                                                                gint                value);
 
-CLUTTER_DEPRECATED_FOR(clutter_shader_effect_set_uniform)
+CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_shader_effect_set_uniform)
 void                  clutter_actor_set_shader_param_float    (ClutterActor       *self,
                                                                const gchar        *param,
                                                                gfloat              value);
diff --git a/clutter/deprecated/clutter-stage.h b/clutter/deprecated/clutter-stage.h
index bfcdf2a..e56e299 100644
--- a/clutter/deprecated/clutter-stage.h
+++ b/clutter/deprecated/clutter-stage.h
@@ -65,35 +65,35 @@ G_BEGIN_DECLS
 
 #endif /* CLUTTER_DISABLE_DEPRECATED */
 
-CLUTTER_DEPRECATED_FOR(clutter_stage_new)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_stage_new)
 ClutterActor *  clutter_stage_get_default       (void);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 gboolean        clutter_stage_is_default        (ClutterStage       *stage);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_queue_redraw)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_queue_redraw)
 void            clutter_stage_queue_redraw      (ClutterStage       *stage);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void            clutter_stage_set_use_fog       (ClutterStage       *stage,
                                                  gboolean            fog);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 gboolean        clutter_stage_get_use_fog       (ClutterStage       *stage);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void            clutter_stage_set_fog           (ClutterStage       *stage,
                                                  ClutterFog         *fog);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_10
 void            clutter_stage_get_fog           (ClutterStage       *stage,
                                                  ClutterFog         *fog);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_set_background_color)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_background_color)
 void            clutter_stage_set_color         (ClutterStage       *stage,
                                                  const ClutterColor *color);
 
-CLUTTER_DEPRECATED_FOR(clutter_actor_get_background_color)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_background_color)
 void            clutter_stage_get_color         (ClutterStage       *stage,
                                                  ClutterColor       *color);
 
diff --git a/clutter/deprecated/clutter-timeline.h b/clutter/deprecated/clutter-timeline.h
index 950362e..e99c7df 100644
--- a/clutter/deprecated/clutter-timeline.h
+++ b/clutter/deprecated/clutter-timeline.h
@@ -26,14 +26,14 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_FOR(clutter_timeline_new)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_timeline_new)
 ClutterTimeline *               clutter_timeline_clone                  (ClutterTimeline          *timeline);
 
-CLUTTER_DEPRECATED_FOR(clutter_timeline_set_repeat_count)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_timeline_set_repeat_count)
 void                            clutter_timeline_set_loop               (ClutterTimeline          *timeline,
                                                                          gboolean                  loop);
 
-CLUTTER_DEPRECATED_FOR(clutter_timeline_get_repeat_count)
+CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_timeline_get_repeat_count)
 gboolean                        clutter_timeline_get_loop               (ClutterTimeline          *timeline);
 
 G_END_DECLS
diff --git a/clutter/deprecated/clutter-timeout-pool.h b/clutter/deprecated/clutter-timeout-pool.h
index 44a3f2d..9d7ad1d 100644
--- a/clutter/deprecated/clutter-timeout-pool.h
+++ b/clutter/deprecated/clutter-timeout-pool.h
@@ -51,16 +51,16 @@ G_BEGIN_DECLS
  */
 typedef struct _ClutterTimeoutPool    ClutterTimeoutPool;
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 ClutterTimeoutPool *clutter_timeout_pool_new    (gint                priority);
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 guint               clutter_timeout_pool_add    (ClutterTimeoutPool *pool,
                                                  guint               fps,
                                                  GSourceFunc         func,
                                                  gpointer            data,
                                                  GDestroyNotify      notify);
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_6
 void                clutter_timeout_pool_remove (ClutterTimeoutPool *pool,
                                                  guint               id_);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]