2007-11-18 Emmanuele Bassi <ebassi@openedhand.com>

	* clutter/clutter-model.c: Add gtk-doc section for
	ClutterModelIter

	* clutter/clutter-script.h: Fix argument name.

	* clutter/x11/clutter-x11.h:
	* clutter/x11/clutter-event-x11.c:
	* clutter/x11/clutter-backend-x11.c: Document functions and
	types.

diff --git a/ChangeLog b/ChangeLog
index 04b6e99..466ab6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2007-11-18  Emmanuele Bassi  <ebassi@openedhand.com>
 
+       * clutter/clutter-model.c: Add gtk-doc section for
+       ClutterModelIter
+
+       * clutter/clutter-script.h: Fix argument name.
+
+       * clutter/x11/clutter-x11.h:
+       * clutter/x11/clutter-event-x11.c:
+       * clutter/x11/clutter-backend-x11.c: Document functions and
+       types.
+
+2007-11-18  Emmanuele Bassi  <ebassi@openedhand.com>
+
        * clutter.symbols: Update exported symbols.
 
        * clutter/clutter-actor.[ch]: Remove clutter_actor_rotate_*

diff --git a/clutter/clutter-model.c b/clutter/clutter-model.c
index e26996a..e2cc872 100644 (file)
--- a/clutter/clutter-model.c
+++ b/clutter/clutter-model.c
@@ -1109,6 +1109,27 @@ clutter_model_set_filter (ClutterModel           *model,
  * ClutterModelIter Object 
  */
 
+/**
+ * SECTION:clutter-model-iter
+ * @short_description: Iterates through a model
+ *
+ * #ClutterModelIter is an object used for iterating through all the rows
+ * of a #ClutterModel. It allows setting and getting values on the row
+ * which is currently pointing at.
+ *
+ * A #ClutterModelIter represents a position between two elements
+ * of the sequence. For example, the iterator returned by
+ * clutter_model_get_first_iter() represents the gap immediately before
+ * the first row of the #ClutterModel, and the iterator returned by
+ * clutter_model_get_last_iter() represents the gap immediately after the
+ * last row.
+ *
+ * A #ClutterModelIter can only be created by a #ClutterModel and it is
+ * valid as long as the model does not change.
+ *
+ * #ClutterModelIter is available since Clutter 0.6
+ */
+
 G_DEFINE_TYPE (ClutterModelIter, clutter_model_iter, G_TYPE_OBJECT);
 
 #define CLUTTER_MODEL_ITER_GET_PRIVATE(obj) \
@@ -1470,10 +1491,11 @@ _model_iter_is_last (ClutterModelIter *iter)
     {
       temp_iter->priv->seq_iter = begin;
       if (_model_filter (model, temp_iter))
-      {
-        end = begin;
-        break;
-      }
+        {
+          end = begin;
+          break;
+        }
+
       begin = g_sequence_iter_prev (begin);
     }
   /* This is because the 'end_iter' is always *after* the last valid iter.
@@ -1508,9 +1530,8 @@ _model_iter_next (ClutterModelIter *iter)
     {
       g_object_set (temp_iter, "iter", filter_next, NULL);
       if (_model_filter (model, temp_iter))
-        {
-          break;
-        }
+        break;
+
       filter_next = g_sequence_iter_next (filter_next);
     }
   
@@ -1549,9 +1570,8 @@ _model_iter_prev (ClutterModelIter *iter)
     {
       g_object_set (temp_iter, "iter", filter_prev, NULL);
       if (_model_filter (model, temp_iter))
-        {
-          break;
-        }
+        break;
+
       filter_prev = g_sequence_iter_prev (filter_prev);
     }
   
@@ -1608,6 +1628,7 @@ _model_iter_get_row (ClutterModelIter *iter)
         {
           if (iter_priv->seq_iter == temp_iter->priv->seq_iter)
             break;
+
           row++;
         }
       filter_next = g_sequence_iter_next (filter_next);
@@ -1699,7 +1720,9 @@ clutter_model_iter_set_valist (ClutterModelIter *iter,
 
       if (column < 0 || column >= model_priv->n_columns)
         { 
-          g_warning ("%s: Invalid column number %d added to iter (remember to end you list of columns with a -1)", G_STRLOC, column);
+          g_warning ("%s: Invalid column number %d added to iter "
+                     "(remember to end you list of columns with a -1)",
+                     G_STRLOC, column);
           break;
         }
       g_value_init (&value, model_priv->column_types[column]);
@@ -1820,7 +1843,9 @@ clutter_model_iter_get_valist (ClutterModelIter *iter,
 
       if (column < 0 || column >= model_priv->n_columns)
         { 
-          g_warning ("%s: Invalid column number %d added to iter (remember to end you list of columns with a -1)", G_STRLOC, column);
+          g_warning ("%s: Invalid column number %d added to iter "
+                     "(remember to end you list of columns with a -1)",
+                     G_STRLOC, column);
           break;
         }
           

diff --git a/clutter/clutter-script.h b/clutter/clutter-script.h
index 394d06e..ac73d47 100644 (file)
--- a/clutter/clutter-script.h
+++ b/clutter/clutter-script.h
@@ -134,7 +134,7 @@ void           clutter_script_ensure_objects       (ClutterScript  *script);
 GType          clutter_script_get_type_from_name   (ClutterScript  *script,
                                                     const gchar    *type_name);
 
-G_CONST_RETURN gchar *clutter_get_script_id        (GObject        *object);
+G_CONST_RETURN gchar *clutter_get_script_id        (GObject        *gobject);
 
 void           clutter_script_connect_signals      (ClutterScript  *script,
                                                     gpointer        user_data);

diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
index 3d4e0e5..7cb8ca9 100644 (file)
--- a/clutter/x11/clutter-backend-x11.c
+++ b/clutter/x11/clutter-backend-x11.c
@@ -331,9 +331,9 @@ error_handler(Display     *xdpy,
 /**
  * clutter_x11_trap_x_errors:
  *
- * FIXME
+ * Traps every X error until clutter_x11_untrap_x_errors() is called.
  *
- * Since: 0.4
+ * Since: 0.6
  */
 void
 clutter_x11_trap_x_errors (void)
@@ -345,9 +345,9 @@ clutter_x11_trap_x_errors (void)
 /**
  * clutter_x11_untrap_x_errors:
  *
- * FIXME
+ * Removes the X error trap and returns the current status.
  *
- * Return value: FIXME
+ * Return value: the trapped error code, or 0 for success
  *
  * Since: 0.4
  */
@@ -362,11 +362,11 @@ clutter_x11_untrap_x_errors (void)
 /**
  * clutter_x11_get_default_display:
  * 
- * FIXME
+ * Retrieves the pointer to the default display.
  *
- * Return value: FIXME
+ * Return value: the default display
  *
- * Since: 0.4
+ * Since: 0.6
  */
 Display *
 clutter_x11_get_default_display (void)
@@ -383,11 +383,11 @@ clutter_x11_get_default_display (void)
 /**
  * clutter_x11_get_default_screen:
  * 
- * Gets the pointer to the default X Screen object.
+ * Gets the number of the default X Screen object.
  *
- * Return value: FIXME
+ * Return value: the number of the default screen
  *
- * Since: 0.4
+ * Since: 0.6
  */
 int
 clutter_x11_get_default_screen (void)
@@ -404,11 +404,11 @@ clutter_x11_get_default_screen (void)
 /**
  * clutter_x11_get_root_window:
  * 
- * FIXME
+ * Retrieves the root window.
  *
- * Return value: FIXME
+ * Return value: the id of the root window
  *
- * Since: 0.4
+ * Since: 0.6
  */
 Window
 clutter_x11_get_root_window (void)
@@ -424,15 +424,16 @@ clutter_x11_get_root_window (void)
 
 /**
  * clutter_x11_add_filter:
- * 
- * FIXME
+ * @func: a filter function
+ * @data: user data to be passed to the filter function, or %NULL
  *
- * Return value: FIXME
+ * Adds an event filter function.
  *
- * Since: 0.4
+ * Since: 0.6
  */
 void
-clutter_x11_add_filter (ClutterX11FilterFunc func, gpointer data)
+clutter_x11_add_filter (ClutterX11FilterFunc func,
+                        gpointer             data)
 {
   ClutterX11EventFilter *filter;
 
@@ -444,27 +445,28 @@ clutter_x11_add_filter (ClutterX11FilterFunc func, gpointer data)
       return;
     }
 
-  filter = g_new0(ClutterX11EventFilter, 1);
+  filter = g_new0 (ClutterX11EventFilter, 1);
   filter->func = func;
   filter->data = data;
 
-  backend_singleton->event_filters 
-     = g_slist_append (backend_singleton->event_filters, filter);
+  backend_singleton->event_filters =
+    g_slist_append (backend_singleton->event_filters, filter);
 
   return;
 }
 
 /**
  * clutter_x11_remove_filter:
- * 
- * FIXME
+ * @func: a filter function
+ * @data: user data to be passed to the filter function, or %NULL
  *
- * Return value: FIXME
+ * Removes the given filter function.
  *
- * Since: 0.4
+ * Since: 0.6
  */
 void
-clutter_x11_remove_filter (ClutterX11FilterFunc func, gpointer data)
+clutter_x11_remove_filter (ClutterX11FilterFunc func,
+                           gpointer             data)
 {
   GSList                *tmp_list, *this;
   ClutterX11EventFilter *filter;
@@ -475,14 +477,14 @@ clutter_x11_remove_filter (ClutterX11FilterFunc func, gpointer data)
 
   while (tmp_list)
     {
-      filter = (ClutterX11EventFilter *)tmp_list->data;
+      filter   = tmp_list->data;
       this     =  tmp_list;
       tmp_list = tmp_list->next;
 
       if (filter->func == func && filter->data == data)
         {
-         backend_singleton->event_filters 
-             = g_slist_remove_link (backend_singleton->event_filters, this);
+         backend_singleton->event_filters =
+           g_slist_remove_link (backend_singleton->event_filters, this);
 
           g_slist_free_1 (this);
           g_free (filter);

diff --git a/clutter/x11/clutter-event-x11.c b/clutter/x11/clutter-event-x11.c
index e14bd6f..da162fb 100644 (file)
--- a/clutter/x11/clutter-event-x11.c
+++ b/clutter/x11/clutter-event-x11.c
@@ -357,9 +357,9 @@ event_translate (ClutterBackend *backend,
 
       while (node)
        {
-         filter = (ClutterX11EventFilter *)node->data;
+         filter = node->data;
 
-         switch (filter->func(xevent, event, filter->data))
+         switch (filter->func (xevent, event, filter->data))
            {
            case CLUTTER_X11_FILTER_CONTINUE:
              break;
@@ -370,6 +370,7 @@ event_translate (ClutterBackend *backend,
            default:
              break;
            }
+
          node = node->next;
        }
     }

diff --git a/clutter/x11/clutter-x11.h b/clutter/x11/clutter-x11.h
index a788268..92a2ab7 100644 (file)
--- a/clutter/x11/clutter-x11.h
+++ b/clutter/x11/clutter-x11.h
@@ -45,17 +45,39 @@
 
 G_BEGIN_DECLS
 
+/**
+ * ClutterX11FilterReturn:
+ * @CLUTTER_X11_FILTER_CONTINUE: The event was not handled, continues the
+ *   processing
+ * @CLUTTER_X11_FILTER_TRANSLATE: Native event translated into a Clutter
+ *   event, stops the processing
+ * @CLUTTER_X11_FILTER_REMOVE: Remove the event, stops the processing
+ *
+ * Return values for the #ClutterX11FilterFunc function.
+ *
+ * Since: 0.6
+ */
 typedef enum {
-  CLUTTER_X11_FILTER_CONTINUE,   /* Event not handled, continue processesing */
-  CLUTTER_X11_FILTER_TRANSLATE,  /* Native event translated into a Clutter 
-                                    event and stored in the "event" structure 
-                                    that was passed in */
-  CLUTTER_X11_FILTER_REMOVE      /* Terminate processing, removing event */
+  CLUTTER_X11_FILTER_CONTINUE,
+  CLUTTER_X11_FILTER_TRANSLATE,
+  CLUTTER_X11_FILTER_REMOVE
 } ClutterX11FilterReturn;
 
+/**
+ * ClutterX11FilterFunc:
+ * @xev: Native X11 event structure
+ * @cev: Clutter event structure
+ * @data: user data passed to the filter function
+ *
+ * Filter function for X11 native events.
+ *
+ * Return value: the result of the filtering
+ *
+ * Since: 0.6
+ */
 typedef ClutterX11FilterReturn (*ClutterX11FilterFunc) (XEvent        *xev, 
                                                        ClutterEvent  *cev,
-                                                       gpointer      *data);
+                                                       gpointer       data);
 
 void     clutter_x11_trap_x_errors       (void);
 gint     clutter_x11_untrap_x_errors     (void);
@@ -64,16 +86,15 @@ Display *clutter_x11_get_default_display (void);
 int      clutter_x11_get_default_screen  (void);
 Window   clutter_x11_get_root_window     (void);
 
-Window       clutter_x11_get_stage_window (ClutterStage *stage);
-XVisualInfo *clutter_x11_get_stage_visual (ClutterStage *stage);
-
+Window       clutter_x11_get_stage_window  (ClutterStage *stage);
+XVisualInfo *clutter_x11_get_stage_visual  (ClutterStage *stage);
 gboolean     clutter_x11_set_stage_foreign (ClutterStage *stage,
                                             Window        xwindow);
 
-void         clutter_x11_add_filter (ClutterX11FilterFunc func, gpointer data);
-
+void         clutter_x11_add_filter    (ClutterX11FilterFunc func,
+                                        gpointer             data);
 void         clutter_x11_remove_filter (ClutterX11FilterFunc func, 
-                                       gpointer data);
+                                       gpointer             data);
 
 G_END_DECLS
 

diff --git a/doc/reference/ChangeLog b/doc/reference/ChangeLog
index 2beacd6..c55b5bd 100644 (file)
--- a/doc/reference/ChangeLog
+++ b/doc/reference/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-18  Emmanuele Bassi  <ebassi@openedhand.com>
+
+       * Makefile.am: Add clutter-x11.h to the headers scanned.
+
+       * clutter-sections.txt: Update with the newly added and removed
+       symbols.
+
 2007-11-15  Emmanuele Bassi  <ebassi@openedhand.com>
 
        * Makefile.am: Ignore the OSX backend subdirectory and

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 7660b0a..94def32 100644 (file)
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -49,6 +49,7 @@ CFILE_GLOB=$(top_srcdir)/clutter/*.c
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
 IGNORE_HFILES=\
+       clutter.h \
        clutter-debug.h \
        clutter-private.h \
        clutter-marshal.h \
@@ -57,6 +58,7 @@ IGNORE_HFILES=\
        clutter-enum-types.h \
        clutter-script-private.h \
        clutter-json.h \
+       clutter-deprecated.h \
        stamp-clutter-enum-types.h \
        stamp-clutter-marshal.h \
        cogl \
@@ -70,7 +72,7 @@ IGNORE_HFILES=\
        sdl
 
 EXTRA_HFILES=\
-        ../../clutter/glx/clutter-glx.h
+        ../../clutter/x11/clutter-x11.h
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png

diff --git a/doc/reference/clutter-sections.txt b/doc/reference/clutter-sections.txt
index 8890918..27c5e4e 100644 (file)
--- a/doc/reference/clutter-sections.txt
+++ b/doc/reference/clutter-sections.txt
@@ -83,6 +83,7 @@ clutter_label_get_type
 <SECTION>
 <FILE>clutter-behaviour</FILE>
 <TITLE>ClutterBehaviour</TITLE>
+ClutterBehaviour
 ClutterBehaviourClass
 clutter_behaviour_apply
 clutter_behaviour_remove
@@ -96,7 +97,6 @@ clutter_behaviour_get_nth_actor
 clutter_behaviour_get_alpha
 clutter_behaviour_set_alpha
 <SUBSECTION Standard>
-ClutterBehaviour
 CLUTTER_BEHAVIOUR
 CLUTTER_IS_BEHAVIOUR
 CLUTTER_TYPE_BEHAVIOUR
@@ -111,6 +111,8 @@ clutter_behaviour_get_type
 <SECTION>
 <FILE>clutter-alpha</FILE>
 <TITLE>ClutterAlpha</TITLE>
+ClutterAlpha
+ClutterAlphaClass
 clutter_alpha_new
 clutter_alpha_new_full
 clutter_alpha_get_alpha
@@ -150,8 +152,6 @@ CLUTTER_TYPE_ALPHA
 CLUTTER_ALPHA_CLASS
 CLUTTER_IS_ALPHA_CLASS
 CLUTTER_ALPHA_GET_CLASS
-ClutterAlpha
-ClutterAlphaClass
 <SUBSECTION Private>
 ClutterAlphaPrivate
 clutter_alpha_get_type
@@ -160,12 +160,12 @@ clutter_alpha_get_type
 <SECTION>
 <FILE>clutter-clone-texture</FILE>
 <TITLE>ClutterCloneTexture</TITLE>
+ClutterCloneTexture
+ClutterCloneTextureClass
 clutter_clone_texture_new
 clutter_clone_texture_get_parent_texture
 clutter_clone_texture_set_parent_texture
 <SUBSECTION Standard>
-ClutterCloneTexture
-ClutterCloneTextureClass
 CLUTTER_CLONE_TEXTURE
 CLUTTER_IS_CLONE_TEXTURE
 CLUTTER_TYPE_CLONE_TEXTURE
@@ -180,6 +180,8 @@ clutter_clone_texture_get_type
 <SECTION>
 <FILE>clutter-group</FILE>
 <TITLE>ClutterGroup</TITLE>
+ClutterGroup
+ClutterGroupClass
 clutter_group_new
 clutter_group_add
 clutter_group_add_many
@@ -188,13 +190,11 @@ clutter_group_remove
 clutter_group_remove_all
 clutter_group_get_n_children
 clutter_group_get_nth_child
-clutter_group_find_child_by_id
 clutter_group_raise
 clutter_group_lower
 clutter_group_sort_depth_order
+clutter_group_find_child_by_id
 <SUBSECTION Standard>
-ClutterGroup
-ClutterGroupClass
 CLUTTER_GROUP
 CLUTTER_IS_GROUP
 CLUTTER_TYPE_GROUP
@@ -209,6 +209,7 @@ clutter_group_get_type
 <SECTION>
 <FILE>clutter-container</FILE>
 <TITLE>ClutterContainer</TITLE>
+ClutterContainer
 ClutterContainerIface
 clutter_container_add_actor
 clutter_container_add
@@ -218,13 +219,11 @@ clutter_container_remove
 clutter_container_remove_valist
 clutter_container_get_children
 clutter_container_foreach
-clutter_container_find_child_by_id
 clutter_container_find_child_by_name
 clutter_container_raise_child
 clutter_container_lower_child
 clutter_container_sort_depth_order
 <SUBSECTION Standard>
-ClutterContainer
 CLUTTER_TYPE_CONTAINER
 CLUTTER_CONTAINER
 CLUTTER_IS_CONTAINER
@@ -236,6 +235,7 @@ clutter_container_get_type
 <SECTION>
 <FILE>clutter-layout</FILE>
 <TITLE>ClutterLayout</TITLE>
+ClutterLayout
 ClutterLayoutIface
 ClutterLayoutFlags
 clutter_layout_get_layout_flags
@@ -244,7 +244,6 @@ clutter_layout_natural_request
 clutter_layout_tune_request
 clutter_layout_width_for_height
 <SUBSECTION Standard>
-ClutterLayout
 CLUTTER_TYPE_LAYOUT
 CLUTTER_LAYOUT
 CLUTTER_IS_LAYOUT
@@ -256,6 +255,8 @@ clutter_layout_get_type
 <SECTION>
 <FILE>clutter-rectangle</FILE>
 <TITLE>ClutterRectangle</TITLE>
+ClutterRectangle
+ClutterRectangleClass
 clutter_rectangle_new
 clutter_rectangle_new_with_color
 clutter_rectangle_get_color
@@ -265,8 +266,6 @@ clutter_rectangle_set_border_color
 clutter_rectangle_get_border_width
 clutter_rectangle_set_border_width
 <SUBSECTION Standard>
-ClutterRectangle
-ClutterRectangleClass
 CLUTTER_RECTANGLE
 CLUTTER_IS_RECTANGLE
 CLUTTER_TYPE_RECTANGLE
@@ -327,9 +326,10 @@ clutter_actor_get_x
 clutter_actor_set_y
 clutter_actor_get_y
 clutter_actor_move_by
-clutter_actor_rotate_x
-clutter_actor_rotate_y
-clutter_actor_rotate_z
+clutter_actor_set_rotation
+clutter_actor_set_rotationx
+clutter_actor_get_rotation
+clutter_actor_get_rotationx
 clutter_actor_set_opacity
 clutter_actor_get_opacity
 clutter_actor_set_name
@@ -361,20 +361,10 @@ clutter_actor_get_scalex
 clutter_actor_get_scale
 clutter_actor_get_abs_size
 clutter_actor_apply_transform_to_point
-clutter_actor_get_rxang
-clutter_actor_get_ryang
-clutter_actor_get_rzang
-clutter_actor_get_rxangx
-clutter_actor_get_ryangx
-clutter_actor_get_rzangx
 
 <SUBSECTION>
 ClutterVertex
 clutter_actor_get_vertices
-clutter_actor_pick
-clutter_actor_rotate_xx
-clutter_actor_rotate_yx
-clutter_actor_rotate_zx
 clutter_actor_set_scale_with_gravity
 clutter_actor_set_scale_with_gravityx
 
@@ -441,7 +431,6 @@ clutter_texture_get_type
 <SECTION>
 <FILE>clutter-stage</FILE>
 <TITLE>ClutterStage</TITLE>
-<SUBSECTION>
 ClutterStage
 ClutterStageClass
 CLUTTER_STAGE_WIDTH
@@ -538,10 +527,7 @@ clutter_timeline_get_type
 <SECTION>
 <FILE>clutter-behaviour-path</FILE>
 <TITLE>ClutterBehaviourPath</TITLE>
-ClutterKnot
-clutter_knot_copy
-clutter_knot_free
-clutter_knot_equal
+ClutterBehaviourPath
 ClutterBehaviourPathClass
 clutter_behaviour_path_new
 clutter_behaviour_path_get_knots
@@ -550,8 +536,14 @@ clutter_behaviour_path_append_knots
 clutter_behaviour_path_insert_knot
 clutter_behaviour_path_remove_knot
 clutter_behaviour_path_clear
+
+<SUBSECTION>
+ClutterKnot
+clutter_knot_copy
+clutter_knot_free
+clutter_knot_equal
+
 <SUBSECTION Standard>
-ClutterBehaviourPath
 CLUTTER_TYPE_KNOT
 CLUTTER_BEHAVIOUR_PATH
 CLUTTER_IS_BEHAVIOUR_PATH
@@ -568,10 +560,10 @@ clutter_behaviour_path_get_type
 <SECTION>
 <FILE>clutter-behaviour-opacity</FILE>
 <TITLE>ClutterBehaviourOpacity</TITLE>
-clutter_behaviour_opacity_new
-<SUBSECTION Standard>
 ClutterBehaviourOpacity
 ClutterBehaviourOpacityClass
+clutter_behaviour_opacity_new
+<SUBSECTION Standard>
 CLUTTER_BEHAVIOUR_OPACITY
 CLUTTER_IS_BEHAVIOUR_OPACITY
 CLUTTER_TYPE_BEHAVIOUR_OPACITY
@@ -588,6 +580,8 @@ clutter_behaviour_opacity_get_type
 <TITLE>ClutterBehaviourRotate</TITLE>
 ClutterRotateAxis
 ClutterRotateDirection
+ClutterBehaviourRotate
+ClutterBehaviourRotateClass
 clutter_behaviour_rotate_new
 clutter_behaviour_rotate_newx
 clutter_behaviour_rotate_set_axis
@@ -601,8 +595,6 @@ clutter_behaviour_rotate_get_boundsx
 clutter_behaviour_rotate_set_center
 clutter_behaviour_rotate_get_center
 <SUBSECTION Standard>
-ClutterBehaviourRotate
-ClutterBehaviourRotateClass
 CLUTTER_TYPE_BEHAVIOUR_ROTATE
 CLUTTER_BEHAVIOUR_ROTATE
 CLUTTER_IS_BEHAVIOUR_ROTATE
@@ -618,14 +610,14 @@ clutter_behaviour_rotate_get_type
 <FILE>clutter-behaviour-scale</FILE>
 <TITLE>ClutterBehaviourScale</TITLE>
 ClutterGravity
+ClutterBehaviourScale
+ClutterBehaviourScaleClass
 clutter_behaviour_scale_new
 clutter_behaviour_scale_newx
 clutter_behaviour_scale_get_bounds
 clutter_behaviour_scale_get_boundsx
 clutter_behaviour_scale_get_gravity
 <SUBSECTION Standard>
-ClutterBehaviourScale
-ClutterBehaviourScaleClass
 CLUTTER_BEHAVIOUR_SCALE
 CLUTTER_IS_BEHAVIOUR_SCALE
 CLUTTER_TYPE_BEHAVIOUR_SCALE
@@ -640,8 +632,11 @@ clutter_behaviour_scale_get_type
 <SECTION>
 <FILE>clutter-behaviour-bspline</FILE>
 <TITLE>ClutterBehaviourBspline</TITLE>
+ClutterBehaviourBspline
+ClutterBehaviourBsplineClass
 clutter_behaviour_bspline_new
 clutter_behaviour_bspline_append_knot
+clutter_behaviour_bspline_append_knots
 clutter_behaviour_bspline_append
 clutter_behaviour_bspline_truncate
 clutter_behaviour_bspline_join
@@ -651,8 +646,6 @@ clutter_behaviour_bspline_adjust
 clutter_behaviour_bspline_set_origin
 clutter_behaviour_bspline_get_origin
 <SUBSECTION Standard>
-ClutterBehaviourBspline
-ClutterBehaviourBsplineClass
 CLUTTER_TYPE_BEHAVIOUR_BSPLINE
 CLUTTER_BEHAVIOUR_BSPLINE
 CLUTTER_BEHAVIOUR_BSPLINE_CLASS
@@ -667,35 +660,35 @@ clutter_behaviour_bspline_get_type
 <SECTION>
 <FILE>clutter-behaviour-ellipse</FILE>
 <TITLE>ClutterBehaviourEllipse</TITLE>
+ClutterBehaviourEllipse
 ClutterBehaviourEllipseClass
 clutter_behaviour_ellipse_new
 clutter_behaviour_ellipse_newx
 clutter_behaviour_ellipse_set_center
 clutter_behaviour_ellipse_get_center
-clutter_behaviour_ellipse_get_angle_begin
-clutter_behaviour_ellipse_get_angle_end
-clutter_behaviour_ellipse_get_angle_tilt
-clutter_behaviour_ellipse_get_height
-clutter_behaviour_ellipse_get_width
-clutter_behaviour_ellipse_set_angle_begin
+clutter_behaviour_ellipse_set_angle_start
+clutter_behaviour_ellipse_get_angle_start
+clutter_behaviour_ellipse_set_angle_startx
+clutter_behaviour_ellipse_get_angle_startx
 clutter_behaviour_ellipse_set_angle_end
+clutter_behaviour_ellipse_get_angle_end
+clutter_behaviour_ellipse_set_angle_endx
+clutter_behaviour_ellipse_get_angle_endx
 clutter_behaviour_ellipse_set_angle_tilt
+clutter_behaviour_ellipse_get_angle_tilt
+clutter_behaviour_ellipse_set_angle_tiltx
+clutter_behaviour_ellipse_get_angle_tiltx
 clutter_behaviour_ellipse_set_height
+clutter_behaviour_ellipse_get_height
 clutter_behaviour_ellipse_set_width
-clutter_behaviour_ellipse_get_angle_beginx
-clutter_behaviour_ellipse_get_angle_endx
-clutter_behaviour_ellipse_get_angle_tiltx
-clutter_behaviour_ellipse_set_angle_beginx
-clutter_behaviour_ellipse_set_angle_endx
-clutter_behaviour_ellipse_set_angle_tiltx
+clutter_behaviour_ellipse_get_width
 clutter_behaviour_ellipse_set_tilt
 clutter_behaviour_ellipse_get_tilt
-clutter_behaviour_ellipse_get_tiltx
 clutter_behaviour_ellipse_set_tiltx
-clutter_behaviour_ellipse_get_direction
+clutter_behaviour_ellipse_get_tiltx
 clutter_behaviour_ellipse_set_direction
+clutter_behaviour_ellipse_get_direction
 <SUBSECTION Standard>
-ClutterBehaviourEllipse
 CLUTTER_TYPE_BEHAVIOUR_ELLIPSE
 CLUTTER_BEHAVIOUR_ELLIPSE
 CLUTTER_BEHAVIOUR_ELLIPSE_CLASS
@@ -799,6 +792,9 @@ clutter_cosi
 clutter_cosx
 clutter_sini
 clutter_sinx
+CLUTTER_SQRTI_ARG_10_PERCENT
+CLUTTER_SQRTI_ARG_5_PERCENT
+CLUTTER_SQRTI_ARG_MAX
 clutter_sqrti
 clutter_sqrtx
 clutter_log2x
@@ -888,6 +884,7 @@ clutter_get_option_group
 clutter_main
 clutter_main_quit
 clutter_main_level
+
 <SUBSECTION>
 clutter_get_debug_enabled
 clutter_get_show_fps
@@ -897,6 +894,7 @@ clutter_get_default_frame_rate
 clutter_set_default_frame_rate
 clutter_get_motion_events_enabled
 clutter_enable_motion_events
+
 <SUBSECTION>
 clutter_threads_set_lock_functions
 clutter_threads_init
@@ -906,6 +904,15 @@ clutter_threads_add_idle
 clutter_threads_add_idle_full
 clutter_threads_add_timeout
 clutter_threads_add_timeout_full
+
+<SUBSECTION>
+clutter_get_keyboard_grab
+clutter_get_pointer_grab
+clutter_grab_keyboard
+clutter_grab_pointer
+clutter_ungrab_keyboard
+clutter_ungrab_pointer
+
 <SUBSECTION Standard>
 CLUTTER_INIT_ERROR
 <SUBSECTION Private>
@@ -951,6 +958,7 @@ CLUTTER_NO_FPU
 <SECTION>
 <FILE>clutter-entry</FILE>
 <TITLE>ClutterEntry</TITLE>
+ClutterEntry
 ClutterEntryClass
 clutter_entry_new
 clutter_entry_new_with_text
@@ -986,7 +994,6 @@ CLUTTER_TYPE_ENTRY
 CLUTTER_ENTRY_CLASS
 CLUTTER_IS_ENTRY_CLASS
 CLUTTER_ENTRY_GET_CLASS
-ClutterEntry
 <SUBSECTION Private>
 ClutterEntryPrivate
 clutter_entry_get_type
@@ -995,6 +1002,7 @@ clutter_entry_get_type
 <SECTION>
 <FILE>clutter-box</FILE>
 <TITLE>ClutterBox</TITLE>
+ClutterBox
 ClutterBoxClass
 ClutterPackType
 clutter_box_set_color
@@ -1012,7 +1020,6 @@ ClutterBoxChild
 clutter_box_query_child
 clutter_box_query_nth_child
 <SUBSECTION Standard>
-ClutterBox
 CLUTTER_TYPE_BOX
 CLUTTER_BOX
 CLUTTER_IS_BOX
@@ -1030,6 +1037,8 @@ clutter_padding_get_type
 <SECTION>
 <FILE>clutter-effect</FILE>
 <TITLE>Clutter Effects</TITLE>
+ClutterEffectTemplate
+ClutterEffectTemplateClass
 clutter_effect_template_new
 clutter_effect_template_new_full
 clutter_effect_template_new_for_duration
@@ -1047,8 +1056,6 @@ clutter_effect_rotate_y
 clutter_effect_rotate_z
 
 <SUBSECTION Standard>
-ClutterEffectTemplate
-ClutterEffectTemplateClass
 CLUTTER_TYPE_EFFECT_TEMPLATE
 CLUTTER_EFFECT_TEMPLATE
 CLUTTER_IS_EFFECT_TEMPLATE
@@ -1063,10 +1070,10 @@ clutter_effect_template_get_type
 <SECTION>
 <FILE>clutter-hbox</FILE>
 <TITLE>ClutterHBox</TITLE>
-clutter_hbox_new
-<SUBSECTION Standard>
 ClutterHBox
 ClutterHBoxClass
+clutter_hbox_new
+<SUBSECTION Standard>
 CLUTTER_TYPE_HBOX
 CLUTTER_HBOX
 CLUTTER_IS_HBOX
@@ -1080,10 +1087,10 @@ clutter_hbox_get_type
 <SECTION>
 <FILE>clutter-vbox</FILE>
 <TITLE>ClutterVBox</TITLE>
-clutter_vbox_new
-<SUBSECTION Standard>
 ClutterVBox
 ClutterVBoxClass
+clutter_vbox_new
+<SUBSECTION Standard>
 CLUTTER_TYPE_VBOX
 CLUTTER_VBOX
 CLUTTER_IS_VBOX
@@ -1097,10 +1104,10 @@ clutter_vbox_get_type
 <SECTION>
 <FILE>clutter-behaviour-depth</FILE>
 <TITLE>ClutterBehaviourDepth</TITLE>
-clutter_behaviour_depth_new
-<SUBSECTION Standard>
 ClutterBehaviourDepth
 ClutterBehaviourDepthClass
+clutter_behaviour_depth_new
+<SUBSECTION Standard>
 CLUTTER_BEHAVIOUR_DEPTH
 CLUTTER_IS_BEHAVIOUR_DEPTH
 CLUTTER_TYPE_BEHAVIOUR_DEPTH
@@ -1230,10 +1237,8 @@ CLUTTER_IS_MODEL_ITER
 CLUTTER_MODEL_ITER_CLASS
 CLUTTER_IS_MODEL_ITER_CLASS
 CLUTTER_MODEL_GET_CLASS
+CLUTTER_MODEL_ITER_GET_CLASS
 <SUBSECTION Private>
 ClutterModelIterPrivate
 clutter_model_iter_get_type
 </SECTION>
-
-
-