2006-07-06 Emmanuele Bassi <ebassi@openedhand.com>

	* configure.ac: Mark this as 0.1.1, and change the version info
	of the library.

	* clutter/clutter-actor.c:
	* clutter/clutter-group.c: Fix documentation.

diff --git a/ChangeLog b/ChangeLog
index 37f4a9e..2371e4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-07-06  Emmanuele Bassi  <ebassi@openedhand.com>
 
+       * configure.ac: Mark this as 0.1.1, and change the version info
+       of the library.
+
+       * clutter/clutter-actor.c:
+       * clutter/clutter-group.c: Fix documentation.
+
+2006-07-06  Emmanuele Bassi  <ebassi@openedhand.com>
+
        * clutter/clutter-actor.h:
        * clutter/clutter-actor.c:
        

diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index b54de9f..697471f 100644 (file)
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -646,6 +646,16 @@ clutter_actor_class_init (ClutterActorClass *klass)
                        CLUTTER_TYPE_GEOMETRY,
                        G_PARAM_READWRITE));
   
+  /**
+   * ClutterActor::destroy:
+   * @actor: the object which received the signal
+   *
+   * The ::destroy signal is emitted when an actor is destroyed,
+   * either by direct invocation of clutter_actor_destroy() or
+   * when the #ClutterGroup that contains the actor is destroyed.
+   *
+   * Since: 0.1.1
+   */
   actor_signals[DESTROY] =
     g_signal_new ("destroy",
                  G_TYPE_FROM_CLASS (object_class),
@@ -654,6 +664,14 @@ clutter_actor_class_init (ClutterActorClass *klass)
                  NULL, NULL,
                  clutter_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
+  /**
+   * ClutterActor::show:
+   * @actor: the object which received the signal
+   *
+   * The ::show signal is emitted when an actor becomes visible.
+   * 
+   * Since: 0.1.1
+   */
   actor_signals[SHOW] =
     g_signal_new ("show",
                  G_TYPE_FROM_CLASS (object_class),
@@ -662,6 +680,14 @@ clutter_actor_class_init (ClutterActorClass *klass)
                  NULL, NULL,
                  clutter_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
+  /**
+   * ClutterActor::hide:
+   * @actor: the object which received the signal
+   *
+   * The ::hide signal is emitted when an actor is no longer visible.
+   *
+   * Since: 0.1.1
+   */
   actor_signals[HIDE] =
     g_signal_new ("hide",
                  G_TYPE_FROM_CLASS (object_class),
@@ -743,20 +769,20 @@ clutter_actor_queue_redraw (ClutterActor *self)
 /**
  * clutter_actor_set_geometry:
  * @self: A #ClutterActor
- * @geom: A #ClutterGeometry
+ * @geometry: A #ClutterGeometry
  *
  * Sets the actors geometry in pixels relative to any parent actor.
  */
 void
 clutter_actor_set_geometry (ClutterActor          *self,
-                           const ClutterGeometry *geom)
+                           const ClutterGeometry *geometry)
 {
   ClutterActorBox box;
 
-  box.x1 = geom->x;
-  box.y1 = geom->y;
-  box.x2 = geom->x + geom->width;
-  box.y2 = geom->y + geom->height;
+  box.x1 = geometry->x;
+  box.y1 = geometry->y;
+  box.x2 = geometry->x + geometry->width;
+  box.y2 = geometry->y + geometry->height;
   
   clutter_actor_request_coords (self, &box);
 }
@@ -764,13 +790,13 @@ clutter_actor_set_geometry (ClutterActor          *self,
 /**
  * clutter_actor_get_geometry:
  * @self: A #ClutterActor
- * @geom: A location to store actors #ClutterGeometry
+ * @geometry: A location to store actors #ClutterGeometry
  *
  * Gets the actors geometry in pixels relative to any parent actor.
  */
 void
 clutter_actor_get_geometry (ClutterActor    *self,
-                           ClutterGeometry *geom)
+                           ClutterGeometry *geometry)
 {
   ClutterActorBox box;
 
@@ -778,10 +804,10 @@ clutter_actor_get_geometry (ClutterActor    *self,
   
   clutter_actor_allocate_coords (self, &box);
 
-  geom->x      = box.x1;
-  geom->y      = box.y1;
-  geom->width  = box.x2 - box.x1;
-  geom->height = box.y2 - box.y1;
+  geometry->x      = box.x1;
+  geometry->y      = box.y1;
+  geometry->width  = box.x2 - box.x1;
+  geometry->height = box.y2 - box.y1;
 }
 
 /**
@@ -1030,7 +1056,7 @@ clutter_actor_get_opacity (ClutterActor *self)
 /**
  * clutter_actor_set_name:
  * @self: A #ClutterActor
- * @id: Textual tag to apply to actor
+ * @name: Textual tag to apply to actor
  *
  * Sets a textual tag to the actor.
  */
@@ -1258,6 +1284,8 @@ clutter_actor_remove_clip (ClutterActor *self)
  * Gets whether the actor has a clip set or not.
  * 
  * Return value: %TRUE if the actor has a clip set.
+ *
+ * Since: 0.1.1
  */
 gboolean
 clutter_actor_has_clip (ClutterActor *self)
@@ -1330,6 +1358,8 @@ clutter_actor_get_parent (ClutterActor *self)
  *
  * This function should not be used in applications.  It should be called by
  * implementations of group actors, to dissociate a child from the container.
+ *
+ * Since: 0.1.1
  */
 void
 clutter_actor_unparent (ClutterActor *self)

diff --git a/clutter/clutter-group.c b/clutter/clutter-group.c
index 58c4678..3a29524 100644 (file)
--- a/clutter/clutter-group.c
+++ b/clutter/clutter-group.c
@@ -370,7 +370,7 @@ clutter_group_hide_all (ClutterGroup *self)
  * Adds a new child #ClutterActor to the #ClutterGroup.
  **/
 void
-clutter_group_add (ClutterGroup   *self,
+clutter_group_add (ClutterGroup *self,
                   ClutterActor *actor)
 {
   ClutterActor *parent;
@@ -404,7 +404,7 @@ clutter_group_add (ClutterGroup   *self,
 
 /**
  * clutter_group_add_many_valist:
- * @group: a #ClutterGroup
+ * @self: a #ClutterGroup
  * @first_actor: the #ClutterActor actor to add to the group
  * @args: the actors to be added
  *
@@ -412,19 +412,19 @@ clutter_group_add (ClutterGroup   *self,
  * function inside bindings.
  */
 void
-clutter_group_add_many_valist (ClutterGroup *group,
+clutter_group_add_many_valist (ClutterGroup *self,
                               ClutterActor *first_actor,
                               va_list       args)
 {
   ClutterActor *actor;
   
-  g_return_if_fail (CLUTTER_IS_GROUP (group));
+  g_return_if_fail (CLUTTER_IS_GROUP (self));
   g_return_if_fail (CLUTTER_IS_ACTOR (first_actor));
 
   actor = first_actor;
   while (actor)
     {
-      clutter_group_add (group, actor);
+      clutter_group_add (self, actor);
       actor = va_arg (args, ClutterActor *);
     }
 }

diff --git a/configure.ac b/configure.ac
index 34426e7..7f88879 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_PREREQ(2.53)
 # An even micro number indicates a released version.
 m4_define(clutter_version_major, 0)
 m4_define(clutter_version_minor, 1)
-m4_define(clutter_version_micro, 0)
+m4_define(clutter_version_micro, 1)
 
 AC_INIT([clutter], 
        clutter_version_major.clutter_version_minor.clutter_version_micro, 
@@ -23,9 +23,9 @@ AC_SUBST(CLUTTER_MAJORMINOR)
 # - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
 # - interfaces added -> increment AGE
 # - interfaces removed -> AGE = 0
-CLUTTER_LT_CURRENT=0
+CLUTTER_LT_CURRENT=1
 CLUTTER_LT_REV=0
-CLUTTER_LT_AGE=0
+CLUTTER_LT_AGE=1
 CLUTTER_LT_VERSION="$CLUTTER_LT_CURRENT:$CLUTTER_LT_REV:$CLUTTER_LT_AGE"
 CLUTTER_LT_LDFLAGS="-version-info $CLUTTER_LT_VERSION"