[clutter] actor: Deprecate [sg]et_geometry()

[Emmanuele Bassi <ebassi src gnome org>]

commit ba8d682c0900afd0ef14acc8fe7083d4137f4b63
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Tue Nov 8 14:46:55 2011 +0000

    actor: Deprecate [sg]et_geometry()
    
    These methods are short-hands for accessing the position and size,
    which are already shorthands for accessing the various dimensional
    and positional attributes. Plus, they use ClutterGeometry, which is a
    fairly bad data type for a rectangle.

 clutter/clutter-actor.c            |    9 ++++++++-
 clutter/clutter-actor.h            |    4 ----
 clutter/deprecated/clutter-actor.h |   11 +++++++++--
 3 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index ce699b5..5a66c16 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -6289,6 +6289,9 @@ clutter_actor_allocate (ClutterActor           *self,
  * size, in pixels. This means the untransformed actor will have the
  * given geometry. This is the same as calling clutter_actor_set_position()
  * and clutter_actor_set_size().
+ *
+ * Deprecated: 1.10: Use clutter_actor_set_position() and
+ *   clutter_actor_set_size() instead.
  */
 void
 clutter_actor_set_geometry (ClutterActor          *self,
@@ -6305,12 +6308,16 @@ clutter_actor_set_geometry (ClutterActor          *self,
 /**
  * clutter_actor_get_geometry:
  * @self: A #ClutterActor
- * @geometry: (out): A location to store actors #ClutterGeometry
+ * @geometry: (out caller-allocates): A location to store actors #ClutterGeometry
  *
  * Gets the size and position of an actor relative to its parent
  * actor. This is the same as calling clutter_actor_get_position() and
  * clutter_actor_get_size(). It tries to "do what you mean" and get the
  * requested size and position if the actor's allocation is invalid.
+ *
+ * Deprecated: 1.10: Use clutter_actor_get_position() and
+ *   clutter_actor_get_size(), or clutter_actor_get_allocation_geometry()
+ *   instead.
  */
 void
 clutter_actor_get_geometry (ClutterActor    *self,
diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h
index 41ea9ab..7adabf4 100644
--- a/clutter/clutter-actor.h
+++ b/clutter/clutter-actor.h
@@ -326,10 +326,6 @@ void                  clutter_actor_get_allocation_geometry   (ClutterActor
 void                  clutter_actor_get_allocation_vertices   (ClutterActor          *self,
 							       ClutterActor          *ancestor,
                                                                ClutterVertex          verts[]);
-void                  clutter_actor_set_geometry              (ClutterActor          *self,
-                                                               const ClutterGeometry *geometry);
-void                  clutter_actor_get_geometry              (ClutterActor          *self,
-                                                               ClutterGeometry       *geometry);
 void                  clutter_actor_set_size                  (ClutterActor          *self,
                                                                gfloat                 width,
                                                                gfloat                 height);
diff --git a/clutter/deprecated/clutter-actor.h b/clutter/deprecated/clutter-actor.h
index 9d9f001..c752e51 100644
--- a/clutter/deprecated/clutter-actor.h
+++ b/clutter/deprecated/clutter-actor.h
@@ -6,10 +6,17 @@
 G_BEGIN_DECLS
 
 CLUTTER_DEPRECATED
-guint32         clutter_actor_get_gid           (ClutterActor *self);
+void            clutter_actor_set_geometry      (ClutterActor          *self,
+                                                 const ClutterGeometry *geometry);
 
+CLUTTER_DEPRECATED_FOR(clutter_actor_get_allocation_geometry)
+void            clutter_actor_get_geometry      (ClutterActor          *self,
+                                                 ClutterGeometry       *geometry);
 CLUTTER_DEPRECATED
-ClutterActor *  clutter_get_actor_by_gid        (guint32       id_);
+guint32         clutter_actor_get_gid           (ClutterActor          *self);
+
+CLUTTER_DEPRECATED
+ClutterActor *  clutter_get_actor_by_gid        (guint32                id_);
 
 G_END_DECLS