gnomemm r1980 - in cluttermm/trunk: . clutter clutter/src tools/extra_defs_gen tools/m4

[daniel svn gnome org]

Author: daniel
Date: Fri Jan  9 17:38:28 2009
New Revision: 1980
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1980&view=rev

Log:
* clutter/src/clutter_methods.defs: Regenerate.
* clutter/src/clutter_enums.defs: Regenerate and merge manual
changes.
* clutter/src/clutter_signals.defs: ditto.
* clutter/src/clutter_vfuncs.defs: Remove ClutterEntry vfuncs.

* clutter/src/text.{ccg,hg}: New files.  Clutter::Text is a new
actor that replaces both Clutter::Entry and Clutter::Label.
* clutter/src/entry.{ccg,hg}: Remove files.
* clutter/src/label.{ccg,hg}: ditto.

* clutter/cluttermm.h: Remove entry.h and label.h.  Add text.h.
* clutter/src/Makefile_list_of_hg.am_fragment (files_hg): Remove
entry.hg and label.hg.  Add text.hg.
* tools/extra_defs_gen/generate_defs_clutter.cc: Remove lookup of
CLUTTER_TYPE_ENTRY and CLUTTER_TYPE_LABEL.  Add CLUTTER_TYPE_TEXT.

* tools/m4/convert_cluttermm.m4: Add conversions from/to
ClutterGeometry.

Added:
   cluttermm/trunk/clutter/src/text.ccg
   cluttermm/trunk/clutter/src/text.hg
Removed:
   cluttermm/trunk/clutter/src/entry.ccg
   cluttermm/trunk/clutter/src/entry.hg
   cluttermm/trunk/clutter/src/label.ccg
   cluttermm/trunk/clutter/src/label.hg
Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/clutter/cluttermm.h
   cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment
   cluttermm/trunk/clutter/src/clutter_enums.defs
   cluttermm/trunk/clutter/src/clutter_methods.defs
   cluttermm/trunk/clutter/src/clutter_signals.defs
   cluttermm/trunk/clutter/src/clutter_vfuncs.defs
   cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc
   cluttermm/trunk/tools/m4/convert_cluttermm.m4

Modified: cluttermm/trunk/clutter/cluttermm.h
==============================================================================
--- cluttermm/trunk/clutter/cluttermm.h	(original)
+++ cluttermm/trunk/clutter/cluttermm.h	Fri Jan  9 17:38:28 2009
@@ -1,20 +1,20 @@
-/* cluttermm - a C++ wrapper for clutter
+/*
+ * cluttermm - a C++ wrapper for clutter
  *
- * Copyright 2007 The cluttermm Development Team
+ * Copyright (c) 2007-2009  The cluttermm Development Team
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIBCLUTTERMM_H
@@ -39,23 +39,22 @@
 #include <cluttermm/clone-texture.h>
 #include <cluttermm/color.h>
 #include <cluttermm/effecttemplate.h>
-#include <cluttermm/entry.h>
 #include <cluttermm/event.h>
 #include <cluttermm/frame-source.h>
 #include <cluttermm/group.h>
 #include <cluttermm/init.h>
-#include <cluttermm/label.h>
 #include <cluttermm/main.h>
 #include <cluttermm/media.h>
 #include <cluttermm/path.h>
 #include <cluttermm/rectangle.h>
+#include <cluttermm/score.h>
+#include <cluttermm/script.h>
+#include <cluttermm/shader.h>
 #include <cluttermm/stage.h>
+#include <cluttermm/text.h>
 #include <cluttermm/texture.h>
 #include <cluttermm/threads.h>
 #include <cluttermm/timeline.h>
-#include <cluttermm/score.h>
-#include <cluttermm/shader.h>
-#include <cluttermm/script.h>
 #include <cluttermm/types.h>
 #include <cluttermm/utility.h>
 

Modified: cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment	(original)
+++ cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment	Fri Jan  9 17:38:28 2009
@@ -3,32 +3,31 @@
 # so it's like copy-and-pasting this into each of those Makefile.am files.
 
 files_hg = \
-types.hg \
-actor.hg  \
-color.hg \
-media.hg \
-group.hg \
-stage.hg \
-rectangle.hg \
-texture.hg \
-clone-texture.hg \
-container.hg \
-label.hg \
-entry.hg \
-timeline.hg \
+actor.hg \
 alpha.hg \
-path.hg \
 behaviour.hg \
 behaviour-depth.hg \
+behaviour-ellipse.hg \
 behaviour-opacity.hg \
 behaviour-path.hg \
-behaviour-ellipse.hg \
 behaviour-rotate.hg \
 behaviour-scale.hg \
+clone-texture.hg \
+color.hg \
+container.hg \
+effecttemplate.hg \
+group.hg \
+media.hg \
+path.hg \
+rectangle.hg \
 score.hg \
-shader.hg \
-script.hg \
 scriptable.hg \
-effecttemplate.hg
+script.hg \
+shader.hg \
+stage.hg \
+text.hg \
+texture.hg \
+timeline.hg \
+types.hg
 
 #Not for bindings/applications: timeout-pool.hg

Modified: cluttermm/trunk/clutter/src/clutter_enums.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_enums.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_enums.defs	Fri Jan  9 17:38:28 2009
@@ -1,16 +1,48 @@
-;; From clutter/clutter-actor.h
+;; From clutter-main.h
 
-(define-flags-extended ActorFlags
+(define-enum-extended InitError
   (in-module "Clutter")
-  (c-name "ClutterActorFlags")
+  (c-name "ClutterInitError")
   (values
-    '("mapped" "CLUTTER_ACTOR_MAPPED" "1 << 1")
-    '("realized" "CLUTTER_ACTOR_REALIZED" "1 << 2")
-    '("reactive" "CLUTTER_ACTOR_REACTIVE" "1 << 3")
+    '("success" "CLUTTER_INIT_SUCCESS" "1")
+    '("error-unknown" "CLUTTER_INIT_ERROR_UNKNOWN" "0")
+    '("error-threads" "CLUTTER_INIT_ERROR_THREADS" "-1")
+    '("error-backend" "CLUTTER_INIT_ERROR_BACKEND" "-2")
+    '("error-internal" "CLUTTER_INIT_ERROR_INTERNAL" "-3")
+  )
+)
+
+;; From clutter-path.h
+;; hand-edited to deal with CLUTTER_PATH_RELATIVE flag
+
+(define-flags-extended PathNodeType
+  (in-module "Clutter")
+  (c-name "ClutterPathNodeType")
+  (values
+    '("move-to" "CLUTTER_PATH_MOVE_TO" "0")
+    '("line-to" "CLUTTER_PATH_LINE_TO" "1")
+    '("curve-to" "CLUTTER_PATH_CURVE_TO" "2")
+    '("close" "CLUTTER_PATH_CLOSE" "3")
+    '("relative" "CLUTTER_PATH_RELATIVE" "32")
+    '("rel-move-to" "CLUTTER_PATH_REL_MOVE_TO" "PATH_RELATIVE | PATH_MOVE_TO")
+    '("rel-line-to" "CLUTTER_PATH_REL_LINE_TO" "PATH_RELATIVE | PATH_LINE_TO")
+    '("rel-curve-to" "CLUTTER_PATH_REL_CURVE_TO" "PATH_RELATIVE | PATH_CURVE_TO")
+  )
+)
+
+;; From clutter-shader.h
+
+(define-enum-extended ShaderError
+  (in-module "Clutter")
+  (c-name "ClutterShaderError")
+  (values
+    '("no-asm" "CLUTTER_SHADER_ERROR_NO_ASM" "0")
+    '("no-glsl" "CLUTTER_SHADER_ERROR_NO_GLSL" "1")
+    '("compile" "CLUTTER_SHADER_ERROR_COMPILE" "2")
   )
 )
 
-;; From clutter/clutter-event.h
+;; From clutter-event.h
 
 (define-flags-extended ModifierType
   (in-module "Clutter")
@@ -37,11 +69,13 @@
   )
 )
 
+;; Hand-edited because enum.pl failed to find the correct common prefix
+
 (define-flags-extended EventFlags
   (in-module "Clutter")
   (c-name "ClutterEventFlags")
   (values
-    '("c" "CLUTTER_EVENT_FLAG_SYNTHETIC" "1 << 0")
+    '("synthetic" "CLUTTER_EVENT_FLAG_SYNTHETIC" "1 << 0")
   )
 )
 
@@ -86,58 +120,39 @@
   )
 )
 
-;; From clutter/clutter-feature.h
+;; From clutter-texture.h
 
-(define-flags-extended FeatureFlags
+(define-enum-extended TextureError
   (in-module "Clutter")
-  (c-name "ClutterFeatureFlags")
+  (c-name "ClutterTextureError")
   (values
-    '("texture-npot" "CLUTTER_FEATURE_TEXTURE_NPOT" "1 << 2")
-    '("sync-to-vblank" "CLUTTER_FEATURE_SYNC_TO_VBLANK" "1 << 3")
-    '("texture-yuv" "CLUTTER_FEATURE_TEXTURE_YUV" "1 << 4")
-    '("texture-read-pixels" "CLUTTER_FEATURE_TEXTURE_READ_PIXELS" "1 << 5")
-    '("stage-static" "CLUTTER_FEATURE_STAGE_STATIC" "1 << 6")
-    '("stage-user-resize" "CLUTTER_FEATURE_STAGE_USER_RESIZE" "1 << 7")
-    '("stage-cursor" "CLUTTER_FEATURE_STAGE_CURSOR" "1 << 8")
-    '("shaders-glsl" "CLUTTER_FEATURE_SHADERS_GLSL" "1 << 9")
-    '("offscreen" "CLUTTER_FEATURE_OFFSCREEN" "1 << 10")
-    '("stage-multiple" "CLUTTER_FEATURE_STAGE_MULTIPLE" "1 << 11")
+    '("out-of-memory" "CLUTTER_TEXTURE_ERROR_OUT_OF_MEMORY" "0")
+    '("no-yuv" "CLUTTER_TEXTURE_ERROR_NO_YUV" "1")
+    '("bad-format" "CLUTTER_TEXTURE_ERROR_BAD_FORMAT" "2")
   )
 )
 
-;; From clutter/clutter-main.h
-
-(define-enum-extended InitError
+(define-flags-extended TextureFlags
   (in-module "Clutter")
-  (c-name "ClutterInitError")
+  (c-name "ClutterTextureFlags")
   (values
-    '("success" "CLUTTER_INIT_SUCCESS" "1")
-    '("error-unknown" "CLUTTER_INIT_ERROR_UNKNOWN" "0")
-    '("error-threads" "CLUTTER_INIT_ERROR_THREADS" "-1")
-    '("error-backend" "CLUTTER_INIT_ERROR_BACKEND" "-2")
-    '("error-internal" "CLUTTER_INIT_ERROR_INTERNAL" "-3")
+    '("rgb-flag-bgr" "CLUTTER_TEXTURE_RGB_FLAG_BGR" "1 << 1")
+    '("rgb-flag-premult" "CLUTTER_TEXTURE_RGB_FLAG_PREMULT" "1 << 2")
+    '("yuv-flag-yuv2" "CLUTTER_TEXTURE_YUV_FLAG_YUV2" "1 << 3")
   )
 )
 
-;; From clutter/clutter-path.h
-;; hand-edited to deal with CLUTTER_PATH_RELATIVE flag
-
-(define-flags-extended PathNodeType
+(define-enum-extended TextureQuality
   (in-module "Clutter")
-  (c-name "ClutterPathNodeType")
+  (c-name "ClutterTextureQuality")
   (values
-    '("move-to" "CLUTTER_PATH_MOVE_TO" "0")
-    '("line-to" "CLUTTER_PATH_LINE_TO" "1")
-    '("curve-to" "CLUTTER_PATH_CURVE_TO" "2")
-    '("close" "CLUTTER_PATH_CLOSE" "3")
-    '("relative" "CLUTTER_PATH_RELATIVE" "32")
-    '("rel-move-to" "CLUTTER_PATH_REL_MOVE_TO" "PATH_MOVE_TO | PATH_RELATIVE")
-    '("rel-line-to" "CLUTTER_PATH_REL_LINE_TO" "PATH_LINE_TO | PATH_RELATIVE")
-    '("rel-curve-to" "CLUTTER_PATH_REL_CURVE_TO" "PATH_CURVE_TO | PATH_RELATIVE")
+    '("low" "CLUTTER_TEXTURE_QUALITY_LOW" "0")
+    '("medium" "CLUTTER_TEXTURE_QUALITY_MEDIUM" "1")
+    '("high" "CLUTTER_TEXTURE_QUALITY_HIGH" "2")
   )
 )
 
-;; From clutter/clutter-script.h
+;; From clutter-script.h
 
 (define-enum-extended ScriptError
   (in-module "Clutter")
@@ -149,51 +164,19 @@
   )
 )
 
-;; From clutter/clutter-shader.h
-
-(define-enum-extended ShaderError
-  (in-module "Clutter")
-  (c-name "ClutterShaderError")
-  (values
-    '("no-asm" "CLUTTER_SHADER_ERROR_NO_ASM" "0")
-    '("no-glsl" "CLUTTER_SHADER_ERROR_NO_GLSL" "1")
-    '("compile" "CLUTTER_SHADER_ERROR_COMPILE" "2")
-  )
-)
-
-;; From clutter/clutter-texture.h
-
-(define-enum-extended TextureError
-  (in-module "Clutter")
-  (c-name "ClutterTextureError")
-  (values
-    '("out-of-memory" "CLUTTER_TEXTURE_ERROR_OUT_OF_MEMORY" "0")
-    '("no-yuv" "CLUTTER_TEXTURE_ERROR_NO_YUV" "1")
-    '("bad-format" "CLUTTER_TEXTURE_ERROR_BAD_FORMAT" "2")
-  )
-)
-
-(define-flags-extended TextureFlags
-  (in-module "Clutter")
-  (c-name "ClutterTextureFlags")
-  (values
-    '("rgb-flag-bgr" "CLUTTER_TEXTURE_RGB_FLAG_BGR" "1 << 1")
-    '("rgb-flag-premult" "CLUTTER_TEXTURE_RGB_FLAG_PREMULT" "1 << 2")
-    '("yuv-flag-yuv2" "CLUTTER_TEXTURE_YUV_FLAG_YUV2" "1 << 3")
-  )
-)
+;; From clutter-actor.h
 
-(define-enum-extended TextureQuality
+(define-flags-extended ActorFlags
   (in-module "Clutter")
-  (c-name "ClutterTextureQuality")
+  (c-name "ClutterActorFlags")
   (values
-    '("low" "CLUTTER_TEXTURE_QUALITY_LOW" "0")
-    '("medium" "CLUTTER_TEXTURE_QUALITY_MEDIUM" "1")
-    '("high" "CLUTTER_TEXTURE_QUALITY_HIGH" "2")
+    '("mapped" "CLUTTER_ACTOR_MAPPED" "1 << 1")
+    '("realized" "CLUTTER_ACTOR_REALIZED" "1 << 2")
+    '("reactive" "CLUTTER_ACTOR_REACTIVE" "1 << 3")
   )
 )
 
-;; From clutter/clutter-timeline.h
+;; From clutter-timeline.h
 
 (define-enum-extended TimelineDirection
   (in-module "Clutter")
@@ -204,7 +187,7 @@
   )
 )
 
-;; From clutter/clutter-types.h
+;; From clutter-types.h
 
 (define-enum-extended Gravity
   (in-module "Clutter")
@@ -270,75 +253,22 @@
   )
 )
 
-;; From clutter/json/json-parser.h
-
-(define-enum-extended ParserError
-  (in-module "Json")
-  (c-name "JsonParserError")
-  (values
-    '("parse" "JSON_PARSER_ERROR_PARSE" "0")
-    '("unknown" "JSON_PARSER_ERROR_UNKNOWN" "1")
-  )
-)
-
-;; hand-edited to fix reference to G_TOKEN_LAST
-(define-enum-extended TokenType
-  (in-module "Json")
-  (c-name "JsonTokenType")
-  (values
-    '("invalid" "JSON_TOKEN_INVALID" "270")
-    '("true" "JSON_TOKEN_TRUE" "271")
-    '("false" "JSON_TOKEN_FALSE" "272")
-    '("null" "JSON_TOKEN_NULL" "273")
-    '("last" "JSON_TOKEN_LAST" "274")
-  )
-)
-
-;; From clutter/json/json-types.h
-
-(define-enum-extended NodeType
-  (in-module "Json")
-  (c-name "JsonNodeType")
-  (values
-    '("object" "JSON_NODE_OBJECT" "0")
-    '("array" "JSON_NODE_ARRAY" "1")
-    '("value" "JSON_NODE_VALUE" "2")
-    '("null" "JSON_NODE_NULL" "3")
-  )
-)
-
-;; From clutter/x11/clutter-x11.h
+;; From clutter-feature.h
 
-(define-enum-extended X11FilterReturn
-  (in-module "Clutter")
-  (c-name "ClutterX11FilterReturn")
-  (values
-    '("continue" "CLUTTER_X11_FILTER_CONTINUE" "0")
-    '("translate" "CLUTTER_X11_FILTER_TRANSLATE" "1")
-    '("remove" "CLUTTER_X11_FILTER_REMOVE" "2")
-  )
-)
-
-(define-enum-extended X11XInputEventTypes
-  (in-module "Clutter")
-  (c-name "ClutterX11XInputEventTypes")
-  (values
-    '("key-press-event" "CLUTTER_X11_XINPUT_KEY_PRESS_EVENT" "0")
-    '("key-release-event" "CLUTTER_X11_XINPUT_KEY_RELEASE_EVENT" "1")
-    '("button-press-event" "CLUTTER_X11_XINPUT_BUTTON_PRESS_EVENT" "2")
-    '("button-release-event" "CLUTTER_X11_XINPUT_BUTTON_RELEASE_EVENT" "3")
-    '("motion-notify-event" "CLUTTER_X11_XINPUT_MOTION_NOTIFY_EVENT" "4")
-    '("last-event" "CLUTTER_X11_XINPUT_LAST_EVENT" "5")
-  )
-)
-
-(define-enum-extended X11InputDeviceType
+(define-flags-extended FeatureFlags
   (in-module "Clutter")
-  (c-name "ClutterX11InputDeviceType")
+  (c-name "ClutterFeatureFlags")
   (values
-    '("pointer-device" "CLUTTER_X11_XINPUT_POINTER_DEVICE" "0")
-    '("keyboard-device" "CLUTTER_X11_XINPUT_KEYBOARD_DEVICE" "1")
-    '("extension-device" "CLUTTER_X11_XINPUT_EXTENSION_DEVICE" "2")
+    '("texture-npot" "CLUTTER_FEATURE_TEXTURE_NPOT" "1 << 2")
+    '("sync-to-vblank" "CLUTTER_FEATURE_SYNC_TO_VBLANK" "1 << 3")
+    '("texture-yuv" "CLUTTER_FEATURE_TEXTURE_YUV" "1 << 4")
+    '("texture-read-pixels" "CLUTTER_FEATURE_TEXTURE_READ_PIXELS" "1 << 5")
+    '("stage-static" "CLUTTER_FEATURE_STAGE_STATIC" "1 << 6")
+    '("stage-user-resize" "CLUTTER_FEATURE_STAGE_USER_RESIZE" "1 << 7")
+    '("stage-cursor" "CLUTTER_FEATURE_STAGE_CURSOR" "1 << 8")
+    '("shaders-glsl" "CLUTTER_FEATURE_SHADERS_GLSL" "1 << 9")
+    '("offscreen" "CLUTTER_FEATURE_OFFSCREEN" "1 << 10")
+    '("stage-multiple" "CLUTTER_FEATURE_STAGE_MULTIPLE" "1 << 11")
   )
 )
 

Modified: cluttermm/trunk/clutter/src/clutter_methods.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_methods.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_methods.defs	Fri Jan  9 17:38:28 2009
@@ -104,13 +104,6 @@
   (gtype-id "CLUTTER_TYPE_EFFECT_TEMPLATE")
 )
 
-(define-object Entry
-  (in-module "Clutter")
-  (parent "ClutterActor")
-  (c-name "ClutterEntry")
-  (gtype-id "CLUTTER_TYPE_ENTRY")
-)
-
 (define-object Group
   (in-module "Clutter")
   (parent "ClutterActor")
@@ -125,13 +118,6 @@
   (gtype-id "CLUTTER_TYPE_INTERVAL")
 )
 
-(define-object Label
-  (in-module "Clutter")
-  (parent "ClutterActor")
-  (c-name "ClutterLabel")
-  (gtype-id "CLUTTER_TYPE_LABEL")
-)
-
 (define-object Model
   (in-module "Clutter")
   (parent "GObject")
@@ -194,46 +180,32 @@
   (gtype-id "CLUTTER_TYPE_STAGE")
 )
 
-(define-object Texture
+(define-object Text
   (in-module "Clutter")
   (parent "ClutterActor")
-  (c-name "ClutterTexture")
-  (gtype-id "CLUTTER_TYPE_TEXTURE")
+  (c-name "ClutterText")
+  (gtype-id "CLUTTER_TYPE_TEXT")
 )
 
-(define-object Timeline
+(define-object Texture
   (in-module "Clutter")
-  (parent "GObject")
-  (c-name "ClutterTimeline")
-  (gtype-id "CLUTTER_TYPE_TIMELINE")
+  (parent "ClutterActor")
+  (c-name "ClutterTexture")
+  (gtype-id "CLUTTER_TYPE_TEXTURE")
 )
 
-(define-object X11TexturePixmap
+(define-object CairoTexture
   (in-module "Clutter")
   (parent "ClutterTexture")
-  (c-name "ClutterX11TexturePixmap")
-  (gtype-id "CLUTTER_TYPE_X11_TEXTURE_PIXMAP")
+  (c-name "ClutterCairoTexture")
+  (gtype-id "CLUTTER_TYPE_CAIRO_TEXTURE")
 )
 
-(define-object GLXTexturePixmap
+(define-object Timeline
   (in-module "Clutter")
-  (parent "ClutterX11TexturePixmap")
-  (c-name "ClutterGLXTexturePixmap")
-  (gtype-id "CLUTTER_TYPE_GLX_TEXTURE_PIXMAP")
-)
-
-(define-object Generator
-  (in-module "Json")
-  (parent "GObject")
-  (c-name "JsonGenerator")
-  (gtype-id "JSON_TYPE_GENERATOR")
-)
-
-(define-object Parser
-  (in-module "Json")
   (parent "GObject")
-  (c-name "JsonParser")
-  (gtype-id "JSON_TYPE_PARSER")
+  (c-name "ClutterTimeline")
+  (gtype-id "CLUTTER_TYPE_TIMELINE")
 )
 
 ;; Enumerations and flags ...
@@ -508,41 +480,6 @@
   )
 )
 
-(define-enum NodeType
-  (in-module "Json")
-  (c-name "JsonNodeType")
-  (gtype-id "JSON_TYPE_NODE_TYPE")
-  (values
-    '("object" "JSON_NODE_OBJECT")
-    '("array" "JSON_NODE_ARRAY")
-    '("value" "JSON_NODE_VALUE")
-    '("null" "JSON_NODE_NULL")
-  )
-)
-
-(define-enum ParserError
-  (in-module "Json")
-  (c-name "JsonParserError")
-  (gtype-id "JSON_TYPE_PARSER_ERROR")
-  (values
-    '("parse" "JSON_PARSER_ERROR_PARSE")
-    '("unknown" "JSON_PARSER_ERROR_UNKNOWN")
-  )
-)
-
-(define-enum TokenType
-  (in-module "Json")
-  (c-name "JsonTokenType")
-  (gtype-id "JSON_TYPE_TOKEN_TYPE")
-  (values
-    '("invalid" "JSON_TOKEN_INVALID")
-    '("true" "JSON_TOKEN_TRUE")
-    '("false" "JSON_TOKEN_FALSE")
-    '("null" "JSON_TOKEN_NULL")
-    '("last" "JSON_TOKEN_LAST")
-  )
-)
-
 
 ;; From clutter-backend.h
 
@@ -616,6979 +553,6420 @@
   (return-type "cairo_font_options_t*")
 )
 
-
-
-;; From clutter-frame-source.h
-
-(define-function clutter_frame_source_add
-  (c-name "clutter_frame_source_add")
-  (return-type "guint")
+(define-method set_font_name
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_set_font_name")
+  (return-type "none")
   (parameters
-    '("guint" "interval")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
+    '("const-gchar*" "font_name")
   )
 )
 
-(define-function clutter_frame_source_add_full
-  (c-name "clutter_frame_source_add_full")
-  (return-type "guint")
-  (parameters
-    '("gint" "priority")
-    '("guint" "interval")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
-  )
+(define-method get_font_name
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_get_font_name")
+  (return-type "const-gchar*")
 )
 
 
 
-;; From clutter-enum-types.h
+;; From clutter-text.h
 
-(define-function clutter_actor_flags_get_type
-  (c-name "clutter_actor_flags_get_type")
+(define-function clutter_text_get_type
+  (c-name "clutter_text_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_modifier_type_get_type
-  (c-name "clutter_modifier_type_get_type")
-  (return-type "GType")
+(define-function clutter_text_new
+  (c-name "clutter_text_new")
+  (is-constructor-of "ClutterText")
+  (return-type "ClutterActor*")
 )
 
-(define-function clutter_event_flags_get_type
-  (c-name "clutter_event_flags_get_type")
-  (return-type "GType")
+(define-function clutter_text_new_full
+  (c-name "clutter_text_new_full")
+  (return-type "ClutterActor*")
+  (parameters
+    '("const-gchar*" "font_name")
+    '("const-gchar*" "text")
+    '("const-ClutterColor*" "color")
+  )
 )
 
-(define-function clutter_event_type_get_type
-  (c-name "clutter_event_type_get_type")
-  (return-type "GType")
+(define-function clutter_text_new_with_text
+  (c-name "clutter_text_new_with_text")
+  (return-type "ClutterActor*")
+  (parameters
+    '("const-gchar*" "font_name")
+    '("const-gchar*" "text")
+  )
 )
 
-(define-function clutter_scroll_direction_get_type
-  (c-name "clutter_scroll_direction_get_type")
-  (return-type "GType")
+(define-method get_text
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_text")
+  (return-type "const-gchar*")
 )
 
-(define-function clutter_stage_state_get_type
-  (c-name "clutter_stage_state_get_type")
-  (return-type "GType")
+(define-method set_text
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_text")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "text")
+  )
 )
 
-(define-function clutter_feature_flags_get_type
-  (c-name "clutter_feature_flags_get_type")
-  (return-type "GType")
+(define-method get_layout
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_layout")
+  (return-type "PangoLayout*")
 )
 
-(define-function clutter_init_error_get_type
-  (c-name "clutter_init_error_get_type")
-  (return-type "GType")
+(define-method set_color
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_color")
+  (return-type "none")
+  (parameters
+    '("const-ClutterColor*" "color")
+  )
 )
 
-(define-function clutter_path_node_type_get_type
-  (c-name "clutter_path_node_type_get_type")
-  (return-type "GType")
+(define-method get_color
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_color")
+  (return-type "none")
+  (parameters
+    '("ClutterColor*" "color")
+  )
 )
 
-(define-function clutter_script_error_get_type
-  (c-name "clutter_script_error_get_type")
-  (return-type "GType")
+(define-method set_font_name
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_font_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "font_name")
+  )
 )
 
-(define-function clutter_shader_error_get_type
-  (c-name "clutter_shader_error_get_type")
-  (return-type "GType")
+(define-method get_font_name
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_font_name")
+  (return-type "const-gchar*")
 )
 
-(define-function clutter_texture_error_get_type
-  (c-name "clutter_texture_error_get_type")
-  (return-type "GType")
+(define-method set_ellipsize
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_ellipsize")
+  (return-type "none")
+  (parameters
+    '("PangoEllipsizeMode" "mode")
+  )
 )
 
-(define-function clutter_texture_flags_get_type
-  (c-name "clutter_texture_flags_get_type")
-  (return-type "GType")
+(define-method get_ellipsize
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_ellipsize")
+  (return-type "PangoEllipsizeMode")
 )
 
-(define-function clutter_texture_quality_get_type
-  (c-name "clutter_texture_quality_get_type")
-  (return-type "GType")
+(define-method set_line_wrap
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_line_wrap")
+  (return-type "none")
+  (parameters
+    '("gboolean" "line_wrap")
+  )
 )
 
-(define-function clutter_timeline_direction_get_type
-  (c-name "clutter_timeline_direction_get_type")
-  (return-type "GType")
+(define-method get_line_wrap
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_line_wrap")
+  (return-type "gboolean")
 )
 
-(define-function clutter_gravity_get_type
-  (c-name "clutter_gravity_get_type")
-  (return-type "GType")
+(define-method set_line_wrap_mode
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_line_wrap_mode")
+  (return-type "none")
+  (parameters
+    '("PangoWrapMode" "wrap_mode")
+  )
 )
 
-(define-function clutter_rotate_axis_get_type
-  (c-name "clutter_rotate_axis_get_type")
-  (return-type "GType")
+(define-method get_line_wrap_mode
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_line_wrap_mode")
+  (return-type "PangoWrapMode")
 )
 
-(define-function clutter_rotate_direction_get_type
-  (c-name "clutter_rotate_direction_get_type")
-  (return-type "GType")
+(define-method get_layout
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_layout")
+  (return-type "PangoLayout*")
 )
 
-(define-function clutter_request_mode_get_type
-  (c-name "clutter_request_mode_get_type")
-  (return-type "GType")
+(define-method set_attributes
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_attributes")
+  (return-type "none")
+  (parameters
+    '("PangoAttrList*" "attrs")
+  )
 )
 
-(define-function clutter_animation_mode_get_type
-  (c-name "clutter_animation_mode_get_type")
-  (return-type "GType")
+(define-method get_attributes
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_attributes")
+  (return-type "PangoAttrList*")
 )
 
-
-
-;; From clutter-fixed.h
-
-(define-function clutter_fixed_get_type
-  (c-name "clutter_fixed_get_type")
-  (return-type "GType")
+(define-method set_use_markup
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_use_markup")
+  (return-type "none")
+  (parameters
+    '("gboolean" "setting")
+  )
 )
 
-(define-function clutter_param_fixed_get_type
-  (c-name "clutter_param_fixed_get_type")
-  (return-type "GType")
+(define-method get_use_markup
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_use_markup")
+  (return-type "gboolean")
 )
 
-(define-function clutter_value_set_fixed
-  (c-name "clutter_value_set_fixed")
+(define-method set_alignment
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_alignment")
   (return-type "none")
   (parameters
-    '("GValue*" "value")
-    '("ClutterFixed" "fixed_")
+    '("PangoAlignment" "alignment")
   )
 )
 
-(define-function clutter_value_get_fixed
-  (c-name "clutter_value_get_fixed")
-  (return-type "ClutterFixed")
-  (parameters
-    '("const-GValue*" "value")
-  )
+(define-method get_alignment
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_alignment")
+  (return-type "PangoAlignment")
 )
 
-(define-function clutter_param_spec_fixed
-  (c-name "clutter_param_spec_fixed")
-  (return-type "GParamSpec*")
+(define-method set_justify
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_justify")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "name")
-    '("const-gchar*" "nick")
-    '("const-gchar*" "blurb")
-    '("ClutterFixed" "minimum")
-    '("ClutterFixed" "maximum")
-    '("ClutterFixed" "default_value")
-    '("GParamFlags" "flags")
+    '("gboolean" "justify")
   )
 )
 
+(define-method get_justify
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_justify")
+  (return-type "gboolean")
+)
 
-
-;; From clutter-main.h
-
-(define-function clutter_init_error_quark
-  (c-name "clutter_init_error_quark")
-  (return-type "GQuark")
+(define-method insert_unichar
+  (of-object "ClutterText")
+  (c-name "clutter_text_insert_unichar")
+  (return-type "none")
+  (parameters
+    '("gunichar" "wc")
+  )
 )
 
-(define-function clutter_base_init
-  (c-name "clutter_base_init")
+(define-method delete_chars
+  (of-object "ClutterText")
+  (c-name "clutter_text_delete_chars")
   (return-type "none")
+  (parameters
+    '("guint" "n_chars")
+  )
 )
 
-(define-function clutter_init
-  (c-name "clutter_init")
-  (return-type "ClutterInitError")
+(define-method insert_text
+  (of-object "ClutterText")
+  (c-name "clutter_text_insert_text")
+  (return-type "none")
   (parameters
-    '("int*" "argc")
-    '("char***" "argv")
+    '("const-gchar*" "text")
+    '("gssize" "position")
   )
 )
 
-(define-function clutter_init_with_args
-  (c-name "clutter_init_with_args")
-  (return-type "ClutterInitError")
+(define-method delete_text
+  (of-object "ClutterText")
+  (c-name "clutter_text_delete_text")
+  (return-type "none")
   (parameters
-    '("int*" "argc")
-    '("char***" "argv")
-    '("const-char*" "parameter_string")
-    '("GOptionEntry*" "entries")
-    '("const-char*" "translation_domain")
-    '("GError**" "error")
+    '("gssize" "start_pos")
+    '("gssize" "end_pos")
   )
 )
 
-(define-function clutter_get_option_group
-  (c-name "clutter_get_option_group")
-  (return-type "GOptionGroup*")
-)
-
-(define-function clutter_get_option_group_without_init
-  (c-name "clutter_get_option_group_without_init")
-  (return-type "GOptionGroup*")
-)
-
-(define-function clutter_main
-  (c-name "clutter_main")
-  (return-type "none")
-)
-
-(define-function clutter_main_quit
-  (c-name "clutter_main_quit")
-  (return-type "none")
-)
-
-(define-function clutter_main_level
-  (c-name "clutter_main_level")
-  (return-type "gint")
-)
-
-(define-function clutter_redraw
-  (c-name "clutter_redraw")
-  (return-type "none")
+(define-method get_chars
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_chars")
+  (return-type "gchar*")
   (parameters
-    '("ClutterStage*" "stage")
+    '("gssize" "start_pos")
+    '("gssize" "end_pos")
   )
 )
 
-(define-function clutter_do_event
-  (c-name "clutter_do_event")
+(define-method set_editable
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_editable")
   (return-type "none")
   (parameters
-    '("ClutterEvent*" "event")
+    '("gboolean" "editable")
   )
 )
 
-(define-function clutter_get_debug_enabled
-  (c-name "clutter_get_debug_enabled")
-  (return-type "gboolean")
-)
-
-(define-function clutter_get_show_fps
-  (c-name "clutter_get_show_fps")
+(define-method get_editable
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_editable")
   (return-type "gboolean")
 )
 
-(define-function clutter_get_timestamp
-  (c-name "clutter_get_timestamp")
-  (return-type "gulong")
-)
-
-(define-function clutter_threads_init
-  (c-name "clutter_threads_init")
+(define-method set_activatable
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_activatable")
   (return-type "none")
+  (parameters
+    '("gboolean" "activatable")
+  )
 )
 
-(define-function clutter_threads_enter
-  (c-name "clutter_threads_enter")
-  (return-type "none")
+(define-method get_activatable
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_activatable")
+  (return-type "gboolean")
 )
 
-(define-function clutter_threads_leave
-  (c-name "clutter_threads_leave")
-  (return-type "none")
+(define-method get_cursor_position
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_cursor_position")
+  (return-type "gint")
 )
 
-(define-function clutter_threads_set_lock_functions
-  (c-name "clutter_threads_set_lock_functions")
+(define-method set_cursor_position
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_cursor_position")
   (return-type "none")
   (parameters
-    '("GCallback" "enter_fn")
-    '("GCallback" "leave_fn")
+    '("gint" "position")
   )
 )
 
-(define-function clutter_threads_add_idle
-  (c-name "clutter_threads_add_idle")
-  (return-type "guint")
+(define-method set_cursor_visible
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_cursor_visible")
+  (return-type "none")
   (parameters
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
+    '("gboolean" "cursor_visible")
   )
 )
 
-(define-function clutter_threads_add_idle_full
-  (c-name "clutter_threads_add_idle_full")
-  (return-type "guint")
-  (parameters
-    '("gint" "priority")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
-  )
+(define-method get_cursor_visible
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_cursor_visible")
+  (return-type "gboolean")
 )
 
-(define-function clutter_threads_add_timeout
-  (c-name "clutter_threads_add_timeout")
-  (return-type "guint")
+(define-method set_cursor_color
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_cursor_color")
+  (return-type "none")
   (parameters
-    '("guint" "interval")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-function clutter_threads_add_timeout_full
-  (c-name "clutter_threads_add_timeout_full")
-  (return-type "guint")
+(define-method get_cursor_color
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_cursor_color")
+  (return-type "none")
   (parameters
-    '("gint" "priority")
-    '("guint" "interval")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
+    '("ClutterColor*" "color")
   )
 )
 
-(define-function clutter_threads_add_frame_source
-  (c-name "clutter_threads_add_frame_source")
-  (return-type "guint")
+(define-method set_cursor_size
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_cursor_size")
+  (return-type "none")
   (parameters
-    '("guint" "interval")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
+    '("gint" "size")
   )
 )
 
-(define-function clutter_threads_add_frame_source_full
-  (c-name "clutter_threads_add_frame_source_full")
+(define-method get_cursor_size
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_cursor_size")
   (return-type "guint")
-  (parameters
-    '("gint" "priority")
-    '("guint" "interval")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
-  )
 )
 
-(define-function clutter_set_motion_events_enabled
-  (c-name "clutter_set_motion_events_enabled")
+(define-method set_selectable
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_selectable")
   (return-type "none")
   (parameters
-    '("gboolean" "enable")
+    '("gboolean" "selectable")
   )
 )
 
-(define-function clutter_get_motion_events_enabled
-  (c-name "clutter_get_motion_events_enabled")
+(define-method get_selectable
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_selectable")
   (return-type "gboolean")
 )
 
-(define-function clutter_set_motion_events_frequency
-  (c-name "clutter_set_motion_events_frequency")
+(define-method set_selection_bound
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_selection_bound")
   (return-type "none")
   (parameters
-    '("guint" "frequency")
+    '("gint" "selection_bound")
   )
 )
 
-(define-function clutter_get_motion_events_frequency
-  (c-name "clutter_get_motion_events_frequency")
-  (return-type "guint")
+(define-method get_selection_bound
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_selection_bound")
+  (return-type "gint")
 )
 
-(define-function clutter_set_default_frame_rate
-  (c-name "clutter_set_default_frame_rate")
+(define-method set_selection
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_selection")
   (return-type "none")
   (parameters
-    '("guint" "frames_per_sec")
+    '("gssize" "start_pos")
+    '("gssize" "end_pos")
   )
 )
 
-(define-function clutter_get_default_frame_rate
-  (c-name "clutter_get_default_frame_rate")
-  (return-type "guint")
+(define-method get_selection
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_selection")
+  (return-type "gchar*")
 )
 
-(define-function clutter_grab_pointer
-  (c-name "clutter_grab_pointer")
+(define-method set_password_char
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_password_char")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
+    '("gunichar" "wc")
   )
 )
 
-(define-function clutter_ungrab_pointer
-  (c-name "clutter_ungrab_pointer")
-  (return-type "none")
-)
-
-(define-function clutter_get_pointer_grab
-  (c-name "clutter_get_pointer_grab")
-  (return-type "ClutterActor*")
+(define-method get_password_char
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_password_char")
+  (return-type "gunichar")
 )
 
-(define-function clutter_grab_keyboard
-  (c-name "clutter_grab_keyboard")
+(define-method set_max_length
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_max_length")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
+    '("gint" "max")
   )
 )
 
-(define-function clutter_ungrab_keyboard
-  (c-name "clutter_ungrab_keyboard")
-  (return-type "none")
-)
-
-(define-function clutter_get_keyboard_grab
-  (c-name "clutter_get_keyboard_grab")
-  (return-type "ClutterActor*")
-)
-
-(define-function clutter_clear_glyph_cache
-  (c-name "clutter_clear_glyph_cache")
-  (return-type "none")
+(define-method get_max_length
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_max_length")
+  (return-type "gint")
 )
 
-(define-function clutter_set_use_mipmapped_text
-  (c-name "clutter_set_use_mipmapped_text")
+(define-method set_single_line_mode
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_single_line_mode")
   (return-type "none")
   (parameters
-    '("gboolean" "value")
+    '("gboolean" "single_line")
   )
 )
 
-(define-function clutter_get_use_mipmapped_text
-  (c-name "clutter_get_use_mipmapped_text")
+(define-method get_single_line_mode
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_single_line_mode")
   (return-type "gboolean")
 )
 
-(define-function clutter_get_input_device_for_id
-  (c-name "clutter_get_input_device_for_id")
-  (return-type "ClutterInputDevice*")
-  (parameters
-    '("gint" "id")
-  )
+(define-method activate
+  (of-object "ClutterText")
+  (c-name "clutter_text_activate")
+  (return-type "gboolean")
 )
 
-(define-function clutter_grab_pointer_for_device
-  (c-name "clutter_grab_pointer_for_device")
-  (return-type "none")
+
+
+;; From clutter-frame-source.h
+
+(define-function clutter_frame_source_add
+  (c-name "clutter_frame_source_add")
+  (return-type "guint")
   (parameters
-    '("ClutterActor*" "actor")
-    '("gint" "id")
+    '("guint" "interval")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-function clutter_ungrab_pointer_for_device
-  (c-name "clutter_ungrab_pointer_for_device")
-  (return-type "none")
+(define-function clutter_frame_source_add_full
+  (c-name "clutter_frame_source_add_full")
+  (return-type "guint")
   (parameters
-    '("gint" "id")
+    '("gint" "priority")
+    '("guint" "interval")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-function clutter_get_font_map
-  (c-name "clutter_get_font_map")
-  (return-type "PangoFontMap*")
-)
 
 
+;; From clutter-enum-types.h
 
-;; From clutter-path.h
+(define-function clutter_actor_flags_get_type
+  (c-name "clutter_actor_flags_get_type")
+  (return-type "GType")
+)
 
-(define-function clutter_path_get_type
-  (c-name "clutter_path_get_type")
+(define-function clutter_modifier_type_get_type
+  (c-name "clutter_modifier_type_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_path_new
-  (c-name "clutter_path_new")
-  (is-constructor-of "ClutterPath")
-  (return-type "ClutterPath*")
+(define-function clutter_event_flags_get_type
+  (c-name "clutter_event_flags_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_path_new_with_description
-  (c-name "clutter_path_new_with_description")
-  (return-type "ClutterPath*")
-  (parameters
-    '("const-gchar*" "desc")
-  )
-)
-
-(define-method add_move_to
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_move_to")
-  (return-type "none")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-  )
-)
-
-(define-method add_rel_move_to
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_rel_move_to")
-  (return-type "none")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-  )
-)
-
-(define-method add_line_to
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_line_to")
-  (return-type "none")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-  )
-)
-
-(define-method add_rel_line_to
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_rel_line_to")
-  (return-type "none")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-  )
-)
-
-(define-method add_curve_to
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_curve_to")
-  (return-type "none")
-  (parameters
-    '("gint" "x1")
-    '("gint" "y1")
-    '("gint" "x2")
-    '("gint" "y2")
-    '("gint" "x3")
-    '("gint" "y3")
-  )
-)
-
-(define-method add_rel_curve_to
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_rel_curve_to")
-  (return-type "none")
-  (parameters
-    '("gint" "x1")
-    '("gint" "y1")
-    '("gint" "x2")
-    '("gint" "y2")
-    '("gint" "x3")
-    '("gint" "y3")
-  )
-)
-
-(define-method add_close
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_close")
-  (return-type "none")
-)
-
-(define-method add_string
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_string")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "str")
-  )
-)
-
-(define-method add_node
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_node")
-  (return-type "none")
-  (parameters
-    '("const-ClutterPathNode*" "node")
-  )
-)
-
-(define-method get_n_nodes
-  (of-object "ClutterPath")
-  (c-name "clutter_path_get_n_nodes")
-  (return-type "guint")
-)
-
-(define-method get_node
-  (of-object "ClutterPath")
-  (c-name "clutter_path_get_node")
-  (return-type "none")
-  (parameters
-    '("guint" "index")
-    '("ClutterPathNode*" "node")
-  )
-)
-
-(define-method get_nodes
-  (of-object "ClutterPath")
-  (c-name "clutter_path_get_nodes")
-  (return-type "GSList*")
-)
-
-(define-method foreach
-  (of-object "ClutterPath")
-  (c-name "clutter_path_foreach")
-  (return-type "none")
-  (parameters
-    '("ClutterPathCallback" "callback")
-    '("gpointer" "user_data")
-  )
-)
-
-(define-method insert_node
-  (of-object "ClutterPath")
-  (c-name "clutter_path_insert_node")
-  (return-type "none")
-  (parameters
-    '("gint" "index")
-    '("const-ClutterPathNode*" "node")
-  )
-)
-
-(define-method remove_node
-  (of-object "ClutterPath")
-  (c-name "clutter_path_remove_node")
-  (return-type "none")
-  (parameters
-    '("guint" "index")
-  )
-)
-
-(define-method replace_node
-  (of-object "ClutterPath")
-  (c-name "clutter_path_replace_node")
-  (return-type "none")
-  (parameters
-    '("guint" "index")
-    '("const-ClutterPathNode*" "node")
-  )
-)
-
-(define-method get_description
-  (of-object "ClutterPath")
-  (c-name "clutter_path_get_description")
-  (return-type "gchar*")
-)
-
-(define-method set_description
-  (of-object "ClutterPath")
-  (c-name "clutter_path_set_description")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "str")
-  )
-)
-
-(define-method clear
-  (of-object "ClutterPath")
-  (c-name "clutter_path_clear")
-  (return-type "none")
-)
-
-(define-method get_position
-  (of-object "ClutterPath")
-  (c-name "clutter_path_get_position")
-  (return-type "guint")
-  (parameters
-    '("guint" "alpha")
-    '("ClutterKnot*" "position")
-  )
-)
-
-(define-method get_length
-  (of-object "ClutterPath")
-  (c-name "clutter_path_get_length")
-  (return-type "guint")
-)
-
-(define-method copy
-  (of-object "ClutterPathNode")
-  (c-name "clutter_path_node_copy")
-  (return-type "ClutterPathNode*")
-)
-
-(define-method free
-  (of-object "ClutterPathNode")
-  (c-name "clutter_path_node_free")
-  (return-type "none")
-)
-
-(define-method equal
-  (of-object "ClutterPathNode")
-  (c-name "clutter_path_node_equal")
-  (return-type "gboolean")
-  (parameters
-    '("const-ClutterPathNode*" "node_b")
-  )
-)
-
-(define-function clutter_path_node_get_type
-  (c-name "clutter_path_node_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From clutter-interval.h
-
-(define-function clutter_interval_get_type
-  (c-name "clutter_interval_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_interval_new
-  (c-name "clutter_interval_new")
-  (is-constructor-of "ClutterInterval")
-  (return-type "ClutterInterval*")
-  (parameters
-    '("GType" "gtype")
-  )
-  (varargs #t)
-)
-
-(define-function clutter_interval_new_with_values
-  (c-name "clutter_interval_new_with_values")
-  (return-type "ClutterInterval*")
-  (parameters
-    '("GType" "gtype")
-    '("const-GValue*" "initial")
-    '("const-GValue*" "final")
-  )
-)
-
-(define-method clone
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_clone")
-  (return-type "ClutterInterval*")
-)
-
-(define-method get_value_type
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_get_value_type")
-  (return-type "GType")
-)
-
-(define-method set_initial_value
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_set_initial_value")
-  (return-type "none")
-  (parameters
-    '("const-GValue*" "value")
-  )
-)
-
-(define-method get_initial_value
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_get_initial_value")
-  (return-type "none")
-  (parameters
-    '("GValue*" "value")
-  )
-)
-
-(define-method peek_initial_value
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_peek_initial_value")
-  (return-type "GValue*")
-)
-
-(define-method set_final_value
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_set_final_value")
-  (return-type "none")
-  (parameters
-    '("const-GValue*" "value")
-  )
-)
-
-(define-method get_final_value
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_get_final_value")
-  (return-type "none")
-  (parameters
-    '("GValue*" "value")
-  )
-)
-
-(define-method peek_final_value
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_peek_final_value")
-  (return-type "GValue*")
-)
-
-(define-method set_interval
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_set_interval")
-  (return-type "none")
-  (parameters
-  )
-  (varargs #t)
-)
-
-(define-method get_interval
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_get_interval")
-  (return-type "none")
-  (parameters
-  )
-  (varargs #t)
-)
-
-(define-method validate
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_validate")
-  (return-type "gboolean")
-  (parameters
-    '("GParamSpec*" "pspec")
-  )
-)
-
-(define-method compute_value
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_compute_value")
-  (return-type "none")
-  (parameters
-    '("gdouble" "factor")
-    '("GValue*" "value")
-  )
-)
-
-
-
-;; From clutter-color.h
-
-(define-function clutter_color_new
-  (c-name "clutter_color_new")
-  (is-constructor-of "ClutterColor")
-  (return-type "ClutterColor*")
-  (parameters
-    '("guint8" "red")
-    '("guint8" "green")
-    '("guint8" "blue")
-    '("guint8" "alpha")
-  )
-)
-
-(define-method copy
-  (of-object "ClutterColor")
-  (c-name "clutter_color_copy")
-  (return-type "ClutterColor*")
-)
-
-(define-method free
-  (of-object "ClutterColor")
-  (c-name "clutter_color_free")
-  (return-type "none")
-)
-
-(define-function clutter_color_parse
-  (c-name "clutter_color_parse")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "color")
-    '("ClutterColor*" "dest")
-  )
-)
-
-(define-method equal
-  (of-object "ClutterColor")
-  (c-name "clutter_color_equal")
-  (return-type "gboolean")
-  (parameters
-    '("const-ClutterColor*" "b")
-  )
-)
-
-(define-method to_string
-  (of-object "ClutterColor")
-  (c-name "clutter_color_to_string")
-  (return-type "gchar*")
-)
-
-(define-function clutter_color_get_type
-  (c-name "clutter_color_get_type")
-  (return-type "GType")
-)
-
-(define-method add
-  (of-object "ClutterColor")
-  (c-name "clutter_color_add")
-  (return-type "none")
-  (parameters
-    '("const-ClutterColor*" "src2")
-    '("ClutterColor*" "dest")
-  )
-)
-
-(define-method subtract
-  (of-object "ClutterColor")
-  (c-name "clutter_color_subtract")
-  (return-type "none")
-  (parameters
-    '("const-ClutterColor*" "src2")
-    '("ClutterColor*" "dest")
-  )
-)
-
-(define-method lighten
-  (of-object "ClutterColor")
-  (c-name "clutter_color_lighten")
-  (return-type "none")
-  (parameters
-    '("ClutterColor*" "dest")
-  )
-)
-
-(define-method darken
-  (of-object "ClutterColor")
-  (c-name "clutter_color_darken")
-  (return-type "none")
-  (parameters
-    '("ClutterColor*" "dest")
-  )
-)
-
-(define-method shade
-  (of-object "ClutterColor")
-  (c-name "clutter_color_shade")
-  (return-type "none")
-  (parameters
-    '("ClutterColor*" "dest")
-    '("gdouble" "shade")
-  )
-)
-
-(define-method shadex
-  (of-object "ClutterColor")
-  (c-name "clutter_color_shadex")
-  (return-type "none")
-  (parameters
-    '("ClutterColor*" "dest")
-    '("ClutterFixed" "shade")
-  )
-)
-
-(define-method to_hlsx
-  (of-object "ClutterColor")
-  (c-name "clutter_color_to_hlsx")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed*" "hue")
-    '("ClutterFixed*" "luminance")
-    '("ClutterFixed*" "saturation")
-  )
-)
-
-(define-method from_hlsx
-  (of-object "ClutterColor")
-  (c-name "clutter_color_from_hlsx")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed" "hue")
-    '("ClutterFixed" "luminance")
-    '("ClutterFixed" "saturation")
-  )
-)
-
-(define-method to_hls
-  (of-object "ClutterColor")
-  (c-name "clutter_color_to_hls")
-  (return-type "none")
-  (parameters
-    '("guint8*" "hue")
-    '("guint8*" "luminance")
-    '("guint8*" "saturation")
-  )
-)
-
-(define-method from_hls
-  (of-object "ClutterColor")
-  (c-name "clutter_color_from_hls")
-  (return-type "none")
-  (parameters
-    '("guint8" "hue")
-    '("guint8" "luminance")
-    '("guint8" "saturation")
-  )
-)
-
-(define-method to_pixel
-  (of-object "ClutterColor")
-  (c-name "clutter_color_to_pixel")
-  (return-type "guint32")
-)
-
-(define-method from_pixel
-  (of-object "ClutterColor")
-  (c-name "clutter_color_from_pixel")
-  (return-type "none")
-  (parameters
-    '("guint32" "pixel")
-  )
-)
-
-(define-function clutter_value_set_color
-  (c-name "clutter_value_set_color")
-  (return-type "none")
-  (parameters
-    '("GValue*" "value")
-    '("const-ClutterColor*" "color")
-  )
-)
-
-(define-function clutter_value_get_color
-  (c-name "clutter_value_get_color")
-  (return-type "const-ClutterColor*")
-  (parameters
-    '("const-GValue*" "value")
-  )
-)
-
-(define-function clutter_param_color_get_type
-  (c-name "clutter_param_color_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_param_spec_color
-  (c-name "clutter_param_spec_color")
-  (return-type "GParamSpec*")
-  (parameters
-    '("const-gchar*" "name")
-    '("const-gchar*" "nick")
-    '("const-gchar*" "blurb")
-    '("const-ClutterColor*" "default_value")
-    '("GParamFlags" "flags")
-  )
-)
-
-
-
-;; From clutter-container.h
-
-(define-function clutter_container_get_type
-  (c-name "clutter_container_get_type")
-  (return-type "GType")
-)
-
-(define-method add
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_add")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "first_actor")
-  )
-  (varargs #t)
-)
-
-(define-method add_actor
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_add_actor")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
-)
-
-(define-method add_valist
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_add_valist")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "first_actor")
-    '("va_list" "var_args")
-  )
+(define-function clutter_event_type_get_type
+  (c-name "clutter_event_type_get_type")
+  (return-type "GType")
 )
 
-(define-method remove
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_remove")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "first_actor")
-  )
-  (varargs #t)
+(define-function clutter_scroll_direction_get_type
+  (c-name "clutter_scroll_direction_get_type")
+  (return-type "GType")
 )
 
-(define-method remove_actor
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_remove_actor")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
+(define-function clutter_stage_state_get_type
+  (c-name "clutter_stage_state_get_type")
+  (return-type "GType")
 )
 
-(define-method remove_valist
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_remove_valist")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "first_actor")
-    '("va_list" "var_args")
-  )
+(define-function clutter_feature_flags_get_type
+  (c-name "clutter_feature_flags_get_type")
+  (return-type "GType")
 )
 
-(define-method get_children
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_get_children")
-  (return-type "GList*")
+(define-function clutter_init_error_get_type
+  (c-name "clutter_init_error_get_type")
+  (return-type "GType")
 )
 
-(define-method foreach
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_foreach")
-  (return-type "none")
-  (parameters
-    '("ClutterCallback" "callback")
-    '("gpointer" "user_data")
-  )
+(define-function clutter_path_node_type_get_type
+  (c-name "clutter_path_node_type_get_type")
+  (return-type "GType")
 )
 
-(define-method find_child_by_name
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_find_child_by_name")
-  (return-type "ClutterActor*")
-  (parameters
-    '("const-gchar*" "child_name")
-  )
+(define-function clutter_script_error_get_type
+  (c-name "clutter_script_error_get_type")
+  (return-type "GType")
 )
 
-(define-method raise_child
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_raise_child")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterActor*" "sibling")
-  )
+(define-function clutter_shader_error_get_type
+  (c-name "clutter_shader_error_get_type")
+  (return-type "GType")
 )
 
-(define-method lower_child
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_lower_child")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterActor*" "sibling")
-  )
+(define-function clutter_texture_error_get_type
+  (c-name "clutter_texture_error_get_type")
+  (return-type "GType")
 )
 
-(define-method sort_depth_order
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_sort_depth_order")
-  (return-type "none")
+(define-function clutter_texture_flags_get_type
+  (c-name "clutter_texture_flags_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_container_class_find_child_property
-  (c-name "clutter_container_class_find_child_property")
-  (return-type "GParamSpec*")
-  (parameters
-    '("GObjectClass*" "klass")
-    '("const-gchar*" "property_name")
-  )
+(define-function clutter_texture_quality_get_type
+  (c-name "clutter_texture_quality_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_container_class_list_child_properties
-  (c-name "clutter_container_class_list_child_properties")
-  (return-type "GParamSpec**")
-  (parameters
-    '("GObjectClass*" "klass")
-    '("guint*" "n_properties")
-  )
+(define-function clutter_timeline_direction_get_type
+  (c-name "clutter_timeline_direction_get_type")
+  (return-type "GType")
 )
 
-(define-method get_child_meta
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_get_child_meta")
-  (return-type "ClutterChildMeta*")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
+(define-function clutter_gravity_get_type
+  (c-name "clutter_gravity_get_type")
+  (return-type "GType")
 )
 
-(define-method child_set_property
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_child_set_property")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "child")
-    '("const-gchar*" "property")
-    '("const-GValue*" "value")
-  )
+(define-function clutter_rotate_axis_get_type
+  (c-name "clutter_rotate_axis_get_type")
+  (return-type "GType")
 )
 
-(define-method child_get_property
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_child_get_property")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "child")
-    '("const-gchar*" "property")
-    '("GValue*" "value")
-  )
+(define-function clutter_rotate_direction_get_type
+  (c-name "clutter_rotate_direction_get_type")
+  (return-type "GType")
 )
 
-(define-method child_set
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_child_set")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-    '("const-gchar*" "first_prop")
-  )
-  (varargs #t)
+(define-function clutter_request_mode_get_type
+  (c-name "clutter_request_mode_get_type")
+  (return-type "GType")
 )
 
-(define-method child_get
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_child_get")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-    '("const-gchar*" "first_prop")
-  )
-  (varargs #t)
+(define-function clutter_animation_mode_get_type
+  (c-name "clutter_animation_mode_get_type")
+  (return-type "GType")
 )
 
 
 
-;; From clutter-json.h
-
-
-
-;; From clutter-animation.h
+;; From clutter-fixed.h
 
-(define-function clutter_animation_get_type
-  (c-name "clutter_animation_get_type")
+(define-function clutter_fixed_get_type
+  (c-name "clutter_fixed_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_animation_new
-  (c-name "clutter_animation_new")
-  (is-constructor-of "ClutterAnimation")
-  (return-type "ClutterAnimation*")
+(define-function clutter_param_fixed_get_type
+  (c-name "clutter_param_fixed_get_type")
+  (return-type "GType")
 )
 
-(define-method set_actor
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_actor")
+(define-function clutter_value_set_fixed
+  (c-name "clutter_value_set_fixed")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
+    '("GValue*" "value")
+    '("ClutterFixed" "fixed_")
   )
 )
 
-(define-method get_actor
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_actor")
-  (return-type "ClutterActor*")
-)
-
-(define-method set_mode
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_mode")
-  (return-type "none")
+(define-function clutter_value_get_fixed
+  (c-name "clutter_value_get_fixed")
+  (return-type "ClutterFixed")
   (parameters
-    '("ClutterAnimationMode" "mode")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method get_mode
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_mode")
-  (return-type "ClutterAnimationMode")
-)
-
-(define-method set_duration
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_duration")
-  (return-type "none")
+(define-function clutter_param_spec_fixed
+  (c-name "clutter_param_spec_fixed")
+  (return-type "GParamSpec*")
   (parameters
-    '("gint" "msecs")
+    '("const-gchar*" "name")
+    '("const-gchar*" "nick")
+    '("const-gchar*" "blurb")
+    '("ClutterFixed" "minimum")
+    '("ClutterFixed" "maximum")
+    '("ClutterFixed" "default_value")
+    '("GParamFlags" "flags")
   )
 )
 
-(define-method get_duration
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_duration")
-  (return-type "guint")
+
+
+;; From clutter-main.h
+
+(define-function clutter_init_error_quark
+  (c-name "clutter_init_error_quark")
+  (return-type "GQuark")
 )
 
-(define-method set_loop
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_loop")
+(define-function clutter_base_init
+  (c-name "clutter_base_init")
   (return-type "none")
-  (parameters
-    '("gboolean" "loop")
-  )
 )
 
-(define-method get_loop
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_loop")
-  (return-type "gboolean")
+(define-function clutter_init
+  (c-name "clutter_init")
+  (return-type "ClutterInitError")
+  (parameters
+    '("int*" "argc")
+    '("char***" "argv")
+  )
 )
 
-(define-method set_timeline
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_timeline")
-  (return-type "none")
+(define-function clutter_init_with_args
+  (c-name "clutter_init_with_args")
+  (return-type "ClutterInitError")
   (parameters
-    '("ClutterTimeline*" "timeline")
+    '("int*" "argc")
+    '("char***" "argv")
+    '("const-char*" "parameter_string")
+    '("GOptionEntry*" "entries")
+    '("const-char*" "translation_domain")
+    '("GError**" "error")
   )
 )
 
-(define-method get_timeline
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_timeline")
-  (return-type "ClutterTimeline*")
+(define-function clutter_get_option_group
+  (c-name "clutter_get_option_group")
+  (return-type "GOptionGroup*")
 )
 
-(define-method set_alpha
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_alpha")
-  (return-type "none")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-  )
+(define-function clutter_get_option_group_without_init
+  (c-name "clutter_get_option_group_without_init")
+  (return-type "GOptionGroup*")
 )
 
-(define-method get_alpha
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_alpha")
-  (return-type "ClutterAlpha*")
+(define-function clutter_main
+  (c-name "clutter_main")
+  (return-type "none")
 )
 
-(define-method bind_property
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_bind_property")
+(define-function clutter_main_quit
+  (c-name "clutter_main_quit")
   (return-type "none")
-  (parameters
-    '("const-gchar*" "property_name")
-    '("ClutterInterval*" "interval")
-  )
 )
 
-(define-method has_property
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_has_property")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "property_name")
-  )
+(define-function clutter_main_level
+  (c-name "clutter_main_level")
+  (return-type "gint")
 )
 
-(define-method update_property
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_update_property")
+(define-function clutter_redraw
+  (c-name "clutter_redraw")
   (return-type "none")
   (parameters
-    '("const-gchar*" "property_name")
-    '("ClutterInterval*" "interval")
+    '("ClutterStage*" "stage")
   )
 )
 
-(define-method unbind_property
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_unbind_property")
+(define-function clutter_do_event
+  (c-name "clutter_do_event")
   (return-type "none")
   (parameters
-    '("const-gchar*" "property_name")
+    '("ClutterEvent*" "event")
   )
 )
 
-(define-method get_interval
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_interval")
-  (return-type "ClutterInterval*")
-  (parameters
-    '("const-gchar*" "property_name")
-  )
+(define-function clutter_get_debug_enabled
+  (c-name "clutter_get_debug_enabled")
+  (return-type "gboolean")
 )
 
-(define-method animate
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_animate")
-  (return-type "ClutterAnimation*")
-  (parameters
-    '("ClutterAnimationMode" "mode")
-    '("guint" "duration")
-    '("const-gchar*" "first_property_name")
-  )
-  (varargs #t)
+(define-function clutter_get_show_fps
+  (c-name "clutter_get_show_fps")
+  (return-type "gboolean")
 )
 
-(define-method animate_with_timeline
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_animate_with_timeline")
-  (return-type "ClutterAnimation*")
-  (parameters
-    '("ClutterAnimationMode" "mode")
-    '("ClutterTimeline*" "timeline")
-    '("const-gchar*" "first_property_name")
-  )
-  (varargs #t)
+(define-function clutter_get_timestamp
+  (c-name "clutter_get_timestamp")
+  (return-type "gulong")
 )
 
-(define-method animate_with_alpha
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_animate_with_alpha")
-  (return-type "ClutterAnimation*")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("const-gchar*" "first_property_name")
-  )
-  (varargs #t)
+(define-function clutter_threads_init
+  (c-name "clutter_threads_init")
+  (return-type "none")
 )
 
-
-
-;; From clutter-stage-manager.h
-
-(define-function clutter_stage_manager_get_type
-  (c-name "clutter_stage_manager_get_type")
-  (return-type "GType")
+(define-function clutter_threads_enter
+  (c-name "clutter_threads_enter")
+  (return-type "none")
 )
 
-(define-function clutter_stage_manager_get_default
-  (c-name "clutter_stage_manager_get_default")
-  (return-type "ClutterStageManager*")
+(define-function clutter_threads_leave
+  (c-name "clutter_threads_leave")
+  (return-type "none")
 )
 
-(define-method set_default_stage
-  (of-object "ClutterStageManager")
-  (c-name "clutter_stage_manager_set_default_stage")
+(define-function clutter_threads_set_lock_functions
+  (c-name "clutter_threads_set_lock_functions")
   (return-type "none")
   (parameters
-    '("ClutterStage*" "stage")
+    '("GCallback" "enter_fn")
+    '("GCallback" "leave_fn")
   )
 )
 
-(define-method get_default_stage
-  (of-object "ClutterStageManager")
-  (c-name "clutter_stage_manager_get_default_stage")
-  (return-type "ClutterStage*")
-)
-
-(define-method list_stages
-  (of-object "ClutterStageManager")
-  (c-name "clutter_stage_manager_list_stages")
-  (return-type "GSList*")
-)
-
-
-
-;; From clutter-shader.h
-
-(define-function clutter_shader_error_quark
-  (c-name "clutter_shader_error_quark")
-  (return-type "GQuark")
+(define-function clutter_threads_add_idle
+  (c-name "clutter_threads_add_idle")
+  (return-type "guint")
+  (parameters
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+  )
 )
 
-(define-function clutter_shader_get_type
-  (c-name "clutter_shader_get_type")
-  (return-type "GType")
+(define-function clutter_threads_add_idle_full
+  (c-name "clutter_threads_add_idle_full")
+  (return-type "guint")
+  (parameters
+    '("gint" "priority")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
+  )
 )
 
-(define-function clutter_shader_new
-  (c-name "clutter_shader_new")
-  (is-constructor-of "ClutterShader")
-  (return-type "ClutterShader*")
+(define-function clutter_threads_add_timeout
+  (c-name "clutter_threads_add_timeout")
+  (return-type "guint")
+  (parameters
+    '("guint" "interval")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+  )
 )
 
-(define-method set_is_enabled
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_set_is_enabled")
-  (return-type "none")
+(define-function clutter_threads_add_timeout_full
+  (c-name "clutter_threads_add_timeout_full")
+  (return-type "guint")
   (parameters
-    '("gboolean" "enabled")
+    '("gint" "priority")
+    '("guint" "interval")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-method get_is_enabled
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_is_enabled")
-  (return-type "gboolean")
+(define-function clutter_threads_add_frame_source
+  (c-name "clutter_threads_add_frame_source")
+  (return-type "guint")
+  (parameters
+    '("guint" "interval")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+  )
 )
 
-(define-method compile
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_compile")
-  (return-type "gboolean")
+(define-function clutter_threads_add_frame_source_full
+  (c-name "clutter_threads_add_frame_source_full")
+  (return-type "guint")
   (parameters
-    '("GError**" "error")
+    '("gint" "priority")
+    '("guint" "interval")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-method release
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_release")
+(define-function clutter_set_motion_events_enabled
+  (c-name "clutter_set_motion_events_enabled")
   (return-type "none")
+  (parameters
+    '("gboolean" "enable")
+  )
 )
 
-(define-method is_compiled
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_is_compiled")
+(define-function clutter_get_motion_events_enabled
+  (c-name "clutter_get_motion_events_enabled")
   (return-type "gboolean")
 )
 
-(define-method set_vertex_source
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_set_vertex_source")
+(define-function clutter_set_motion_events_frequency
+  (c-name "clutter_set_motion_events_frequency")
   (return-type "none")
   (parameters
-    '("const-gchar*" "data")
-    '("gssize" "length")
+    '("guint" "frequency")
   )
 )
 
-(define-method set_fragment_source
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_set_fragment_source")
+(define-function clutter_get_motion_events_frequency
+  (c-name "clutter_get_motion_events_frequency")
+  (return-type "guint")
+)
+
+(define-function clutter_set_default_frame_rate
+  (c-name "clutter_set_default_frame_rate")
   (return-type "none")
   (parameters
-    '("const-gchar*" "data")
-    '("gssize" "length")
+    '("guint" "frames_per_sec")
   )
 )
 
-(define-method get_vertex_source
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_vertex_source")
-  (return-type "const-gchar*")
-)
-
-(define-method get_fragment_source
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_fragment_source")
-  (return-type "const-gchar*")
+(define-function clutter_get_default_frame_rate
+  (c-name "clutter_get_default_frame_rate")
+  (return-type "guint")
 )
 
-(define-method set_uniform
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_set_uniform")
+(define-function clutter_grab_pointer
+  (c-name "clutter_grab_pointer")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
-    '("const-GValue*" "value")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method get_cogl_program
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_cogl_program")
-  (return-type "CoglHandle")
-)
-
-(define-method get_cogl_fragment_shader
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_cogl_fragment_shader")
-  (return-type "CoglHandle")
+(define-function clutter_ungrab_pointer
+  (c-name "clutter_ungrab_pointer")
+  (return-type "none")
 )
 
-(define-method get_cogl_vertex_shader
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_cogl_vertex_shader")
-  (return-type "CoglHandle")
+(define-function clutter_get_pointer_grab
+  (c-name "clutter_get_pointer_grab")
+  (return-type "ClutterActor*")
 )
 
-(define-method set_uniform_1f
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_set_uniform_1f")
+(define-function clutter_grab_keyboard
+  (c-name "clutter_grab_keyboard")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
-    '("gfloat" "value")
+    '("ClutterActor*" "actor")
   )
 )
 
-
-
-;; From clutter-event.h
-
-(define-function clutter_event_get_type
-  (c-name "clutter_event_get_type")
-  (return-type "GType")
+(define-function clutter_ungrab_keyboard
+  (c-name "clutter_ungrab_keyboard")
+  (return-type "none")
 )
 
-(define-function clutter_events_pending
-  (c-name "clutter_events_pending")
-  (return-type "gboolean")
+(define-function clutter_get_keyboard_grab
+  (c-name "clutter_get_keyboard_grab")
+  (return-type "ClutterActor*")
 )
 
-(define-function clutter_event_get
-  (c-name "clutter_event_get")
-  (return-type "ClutterEvent*")
+(define-function clutter_clear_glyph_cache
+  (c-name "clutter_clear_glyph_cache")
+  (return-type "none")
 )
 
-(define-function clutter_event_peek
-  (c-name "clutter_event_peek")
-  (return-type "ClutterEvent*")
+(define-function clutter_set_use_mipmapped_text
+  (c-name "clutter_set_use_mipmapped_text")
+  (return-type "none")
+  (parameters
+    '("gboolean" "value")
+  )
 )
 
-(define-method put
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_put")
-  (return-type "none")
+(define-function clutter_get_use_mipmapped_text
+  (c-name "clutter_get_use_mipmapped_text")
+  (return-type "gboolean")
 )
 
-(define-function clutter_event_new
-  (c-name "clutter_event_new")
-  (is-constructor-of "ClutterEvent")
-  (return-type "ClutterEvent*")
+(define-function clutter_get_input_device_for_id
+  (c-name "clutter_get_input_device_for_id")
+  (return-type "ClutterInputDevice*")
   (parameters
-    '("ClutterEventType" "type")
+    '("gint" "id")
   )
 )
 
-(define-method copy
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_copy")
-  (return-type "ClutterEvent*")
+(define-function clutter_grab_pointer_for_device
+  (c-name "clutter_grab_pointer_for_device")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "actor")
+    '("gint" "id")
+  )
 )
 
-(define-method free
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_free")
+(define-function clutter_ungrab_pointer_for_device
+  (c-name "clutter_ungrab_pointer_for_device")
   (return-type "none")
+  (parameters
+    '("gint" "id")
+  )
 )
 
-(define-method type
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_type")
-  (return-type "ClutterEventType")
+(define-function clutter_get_font_map
+  (c-name "clutter_get_font_map")
+  (return-type "PangoFontMap*")
 )
 
-(define-method get_time
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_time")
-  (return-type "guint32")
-)
 
-(define-method get_state
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_state")
-  (return-type "ClutterModifierType")
-)
 
-(define-method get_coords
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_coords")
-  (return-type "none")
-  (parameters
-    '("gint*" "x")
-    '("gint*" "y")
-  )
+;; From clutter-path.h
+
+(define-function clutter_path_get_type
+  (c-name "clutter_path_get_type")
+  (return-type "GType")
 )
 
-(define-method get_device_id
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_device_id")
-  (return-type "gint")
+(define-function clutter_path_node_get_type
+  (c-name "clutter_path_node_get_type")
+  (return-type "GType")
 )
 
-(define-method get_source
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_source")
-  (return-type "ClutterActor*")
+(define-function clutter_path_new
+  (c-name "clutter_path_new")
+  (is-constructor-of "ClutterPath")
+  (return-type "ClutterPath*")
 )
 
-(define-method symbol
-  (of-object "ClutterKeyEvent")
-  (c-name "clutter_key_event_symbol")
-  (return-type "guint")
+(define-function clutter_path_new_with_description
+  (c-name "clutter_path_new_with_description")
+  (return-type "ClutterPath*")
+  (parameters
+    '("const-gchar*" "desc")
+  )
 )
 
-(define-method code
-  (of-object "ClutterKeyEvent")
-  (c-name "clutter_key_event_code")
-  (return-type "guint16")
+(define-method add_move_to
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_move_to")
+  (return-type "none")
+  (parameters
+    '("gint" "x")
+    '("gint" "y")
+  )
 )
 
-(define-method unicode
-  (of-object "ClutterKeyEvent")
-  (c-name "clutter_key_event_unicode")
-  (return-type "guint32")
+(define-method add_rel_move_to
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_rel_move_to")
+  (return-type "none")
+  (parameters
+    '("gint" "x")
+    '("gint" "y")
+  )
 )
 
-(define-method button
-  (of-object "ClutterButtonEvent")
-  (c-name "clutter_button_event_button")
-  (return-type "guint32")
+(define-method add_line_to
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_line_to")
+  (return-type "none")
+  (parameters
+    '("gint" "x")
+    '("gint" "y")
+  )
 )
 
-(define-function clutter_keysym_to_unicode
-  (c-name "clutter_keysym_to_unicode")
-  (return-type "guint32")
+(define-method add_rel_line_to
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_rel_line_to")
+  (return-type "none")
   (parameters
-    '("guint" "keyval")
+    '("gint" "x")
+    '("gint" "y")
   )
 )
 
-(define-method get_stage
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_stage")
-  (return-type "ClutterStage*")
+(define-method add_curve_to
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_curve_to")
+  (return-type "none")
+  (parameters
+    '("gint" "x_1")
+    '("gint" "y_1")
+    '("gint" "x_2")
+    '("gint" "y_2")
+    '("gint" "x_3")
+    '("gint" "y_3")
+  )
 )
 
+(define-method add_rel_curve_to
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_rel_curve_to")
+  (return-type "none")
+  (parameters
+    '("gint" "x_1")
+    '("gint" "y_1")
+    '("gint" "x_2")
+    '("gint" "y_2")
+    '("gint" "x_3")
+    '("gint" "y_3")
+  )
+)
 
-
-;; From clutter-behaviour-depth.h
-
-(define-function clutter_behaviour_depth_get_type
-  (c-name "clutter_behaviour_depth_get_type")
-  (return-type "GType")
+(define-method add_close
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_close")
+  (return-type "none")
 )
 
-(define-function clutter_behaviour_depth_new
-  (c-name "clutter_behaviour_depth_new")
-  (is-constructor-of "ClutterBehaviourDepth")
-  (return-type "ClutterBehaviour*")
+(define-method add_string
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_string")
+  (return-type "gboolean")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gint" "depth_start")
-    '("gint" "depth_end")
+    '("const-gchar*" "str")
   )
 )
 
-(define-method set_bounds
-  (of-object "ClutterBehaviourDepth")
-  (c-name "clutter_behaviour_depth_set_bounds")
+(define-method add_node
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_node")
   (return-type "none")
   (parameters
-    '("gint" "depth_start")
-    '("gint" "depth_end")
+    '("const-ClutterPathNode*" "node")
   )
 )
 
-(define-method get_bounds
-  (of-object "ClutterBehaviourDepth")
-  (c-name "clutter_behaviour_depth_get_bounds")
+(define-method add_cairo_path
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_cairo_path")
   (return-type "none")
   (parameters
-    '("gint*" "depth_start")
-    '("gint*" "depth_end")
+    '("const-cairo_path_t*" "cpath")
   )
 )
 
-
-
-;; From clutter-model.h
-
-(define-function clutter_model_get_type
-  (c-name "clutter_model_get_type")
-  (return-type "GType")
+(define-method get_n_nodes
+  (of-object "ClutterPath")
+  (c-name "clutter_path_get_n_nodes")
+  (return-type "guint")
 )
 
-(define-method set_types
-  (of-object "ClutterModel")
-  (c-name "clutter_model_set_types")
+(define-method get_node
+  (of-object "ClutterPath")
+  (c-name "clutter_path_get_node")
   (return-type "none")
   (parameters
-    '("guint" "n_columns")
-    '("GType*" "types")
+    '("guint" "index_")
+    '("ClutterPathNode*" "node")
   )
 )
 
-(define-method set_names
-  (of-object "ClutterModel")
-  (c-name "clutter_model_set_names")
+(define-method get_nodes
+  (of-object "ClutterPath")
+  (c-name "clutter_path_get_nodes")
+  (return-type "GSList*")
+)
+
+(define-method foreach
+  (of-object "ClutterPath")
+  (c-name "clutter_path_foreach")
   (return-type "none")
   (parameters
-    '("guint" "n_columns")
-    '("const-gchar*-const[]" "names")
+    '("ClutterPathCallback" "callback")
+    '("gpointer" "user_data")
   )
 )
 
-(define-method append
-  (of-object "ClutterModel")
-  (c-name "clutter_model_append")
+(define-method insert_node
+  (of-object "ClutterPath")
+  (c-name "clutter_path_insert_node")
   (return-type "none")
   (parameters
+    '("gint" "index_")
+    '("const-ClutterPathNode*" "node")
   )
-  (varargs #t)
 )
 
-(define-method appendv
-  (of-object "ClutterModel")
-  (c-name "clutter_model_appendv")
+(define-method remove_node
+  (of-object "ClutterPath")
+  (c-name "clutter_path_remove_node")
   (return-type "none")
   (parameters
-    '("guint" "n_columns")
-    '("guint*" "columns")
-    '("GValue*" "values")
+    '("guint" "index_")
   )
 )
 
-(define-method prepend
-  (of-object "ClutterModel")
-  (c-name "clutter_model_prepend")
+(define-method replace_node
+  (of-object "ClutterPath")
+  (c-name "clutter_path_replace_node")
   (return-type "none")
   (parameters
+    '("guint" "index_")
+    '("const-ClutterPathNode*" "node")
   )
-  (varargs #t)
 )
 
-(define-method prependv
-  (of-object "ClutterModel")
-  (c-name "clutter_model_prependv")
-  (return-type "none")
+(define-method get_description
+  (of-object "ClutterPath")
+  (c-name "clutter_path_get_description")
+  (return-type "gchar*")
+)
+
+(define-method set_description
+  (of-object "ClutterPath")
+  (c-name "clutter_path_set_description")
+  (return-type "gboolean")
   (parameters
-    '("guint" "n_columns")
-    '("guint*" "columns")
-    '("GValue*" "values")
+    '("const-gchar*" "str")
   )
 )
 
-(define-method insert
-  (of-object "ClutterModel")
-  (c-name "clutter_model_insert")
+(define-method clear
+  (of-object "ClutterPath")
+  (c-name "clutter_path_clear")
   (return-type "none")
-  (parameters
-    '("guint" "row")
-  )
-  (varargs #t)
 )
 
-(define-method insertv
-  (of-object "ClutterModel")
-  (c-name "clutter_model_insertv")
+(define-method to_cairo_path
+  (of-object "ClutterPath")
+  (c-name "clutter_path_to_cairo_path")
   (return-type "none")
   (parameters
-    '("guint" "row")
-    '("guint" "n_columns")
-    '("guint*" "columns")
-    '("GValue*" "values")
+    '("cairo_t*" "cr")
   )
 )
 
-(define-method insert_value
-  (of-object "ClutterModel")
-  (c-name "clutter_model_insert_value")
-  (return-type "none")
+(define-method get_position
+  (of-object "ClutterPath")
+  (c-name "clutter_path_get_position")
+  (return-type "guint")
   (parameters
-    '("guint" "row")
-    '("guint" "column")
-    '("const-GValue*" "value")
+    '("gdouble" "progress")
+    '("ClutterKnot*" "position")
   )
 )
 
-(define-method remove
-  (of-object "ClutterModel")
-  (c-name "clutter_model_remove")
+(define-method get_length
+  (of-object "ClutterPath")
+  (c-name "clutter_path_get_length")
+  (return-type "guint")
+)
+
+(define-method copy
+  (of-object "ClutterPathNode")
+  (c-name "clutter_path_node_copy")
+  (return-type "ClutterPathNode*")
+)
+
+(define-method free
+  (of-object "ClutterPathNode")
+  (c-name "clutter_path_node_free")
   (return-type "none")
+)
+
+(define-method equal
+  (of-object "ClutterPathNode")
+  (c-name "clutter_path_node_equal")
+  (return-type "gboolean")
   (parameters
-    '("guint" "row")
+    '("const-ClutterPathNode*" "node_b")
   )
 )
 
-(define-method get_n_rows
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_n_rows")
-  (return-type "guint")
+
+
+;; From clutter-interval.h
+
+(define-function clutter_interval_get_type
+  (c-name "clutter_interval_get_type")
+  (return-type "GType")
 )
 
-(define-method get_n_columns
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_n_columns")
-  (return-type "guint")
+(define-function clutter_interval_new
+  (c-name "clutter_interval_new")
+  (is-constructor-of "ClutterInterval")
+  (return-type "ClutterInterval*")
+  (parameters
+    '("GType" "gtype")
+  )
+  (varargs #t)
 )
 
-(define-method get_column_name
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_column_name")
-  (return-type "const-gchar*")
+(define-function clutter_interval_new_with_values
+  (c-name "clutter_interval_new_with_values")
+  (return-type "ClutterInterval*")
   (parameters
-    '("guint" "column")
+    '("GType" "gtype")
+    '("const-GValue*" "initial")
+    '("const-GValue*" "final")
   )
 )
 
-(define-method get_column_type
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_column_type")
+(define-method clone
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_clone")
+  (return-type "ClutterInterval*")
+)
+
+(define-method get_value_type
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_get_value_type")
   (return-type "GType")
+)
+
+(define-method set_initial_value
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_set_initial_value")
+  (return-type "none")
   (parameters
-    '("guint" "column")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method get_first_iter
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_first_iter")
-  (return-type "ClutterModelIter*")
+(define-method get_initial_value
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_get_initial_value")
+  (return-type "none")
+  (parameters
+    '("GValue*" "value")
+  )
 )
 
-(define-method get_last_iter
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_last_iter")
-  (return-type "ClutterModelIter*")
+(define-method peek_initial_value
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_peek_initial_value")
+  (return-type "GValue*")
 )
 
-(define-method get_iter_at_row
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_iter_at_row")
-  (return-type "ClutterModelIter*")
+(define-method set_final_value
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_set_final_value")
+  (return-type "none")
   (parameters
-    '("guint" "row")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method set_sorting_column
-  (of-object "ClutterModel")
-  (c-name "clutter_model_set_sorting_column")
+(define-method get_final_value
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_get_final_value")
   (return-type "none")
   (parameters
-    '("gint" "column")
+    '("GValue*" "value")
   )
 )
 
-(define-method get_sorting_column
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_sorting_column")
-  (return-type "gint")
+(define-method peek_final_value
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_peek_final_value")
+  (return-type "GValue*")
 )
 
-(define-method foreach
-  (of-object "ClutterModel")
-  (c-name "clutter_model_foreach")
+(define-method set_interval
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_set_interval")
   (return-type "none")
   (parameters
-    '("ClutterModelForeachFunc" "func")
-    '("gpointer" "user_data")
   )
+  (varargs #t)
 )
 
-(define-method set_sort
-  (of-object "ClutterModel")
-  (c-name "clutter_model_set_sort")
+(define-method get_interval
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_get_interval")
   (return-type "none")
   (parameters
-    '("guint" "column")
-    '("ClutterModelSortFunc" "func")
-    '("gpointer" "user_data")
-    '("GDestroyNotify" "notify")
   )
+  (varargs #t)
 )
 
-(define-method set_filter
-  (of-object "ClutterModel")
-  (c-name "clutter_model_set_filter")
+(define-method validate
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_validate")
+  (return-type "gboolean")
+  (parameters
+    '("GParamSpec*" "pspec")
+  )
+)
+
+(define-method compute_value
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_compute_value")
   (return-type "none")
   (parameters
-    '("ClutterModelFilterFunc" "func")
-    '("gpointer" "user_data")
-    '("GDestroyNotify" "notify")
+    '("gdouble" "factor")
+    '("GValue*" "value")
   )
 )
 
-(define-method resort
-  (of-object "ClutterModel")
-  (c-name "clutter_model_resort")
+
+
+;; From clutter-color.h
+
+(define-function clutter_color_new
+  (c-name "clutter_color_new")
+  (is-constructor-of "ClutterColor")
+  (return-type "ClutterColor*")
+  (parameters
+    '("guint8" "red")
+    '("guint8" "green")
+    '("guint8" "blue")
+    '("guint8" "alpha")
+  )
+)
+
+(define-method copy
+  (of-object "ClutterColor")
+  (c-name "clutter_color_copy")
+  (return-type "ClutterColor*")
+)
+
+(define-method free
+  (of-object "ClutterColor")
+  (c-name "clutter_color_free")
   (return-type "none")
 )
 
-(define-method filter_row
-  (of-object "ClutterModel")
-  (c-name "clutter_model_filter_row")
+(define-function clutter_color_parse
+  (c-name "clutter_color_parse")
   (return-type "gboolean")
   (parameters
-    '("guint" "row")
+    '("const-gchar*" "color")
+    '("ClutterColor*" "dest")
   )
 )
 
-(define-method filter_iter
-  (of-object "ClutterModel")
-  (c-name "clutter_model_filter_iter")
+(define-method equal
+  (of-object "ClutterColor")
+  (c-name "clutter_color_equal")
   (return-type "gboolean")
   (parameters
-    '("ClutterModelIter*" "iter")
+    '("const-ClutterColor*" "b")
   )
 )
 
-(define-function clutter_model_iter_get_type
-  (c-name "clutter_model_iter_get_type")
+(define-method to_string
+  (of-object "ClutterColor")
+  (c-name "clutter_color_to_string")
+  (return-type "gchar*")
+)
+
+(define-function clutter_color_get_type
+  (c-name "clutter_color_get_type")
   (return-type "GType")
 )
 
-(define-method get
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_get")
+(define-method add
+  (of-object "ClutterColor")
+  (c-name "clutter_color_add")
   (return-type "none")
   (parameters
+    '("const-ClutterColor*" "src2")
+    '("ClutterColor*" "dest")
   )
-  (varargs #t)
 )
 
-(define-method get_valist
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_get_valist")
+(define-method subtract
+  (of-object "ClutterColor")
+  (c-name "clutter_color_subtract")
   (return-type "none")
   (parameters
-    '("va_list" "args")
+    '("const-ClutterColor*" "src2")
+    '("ClutterColor*" "dest")
   )
 )
 
-(define-method get_value
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_get_value")
+(define-method lighten
+  (of-object "ClutterColor")
+  (c-name "clutter_color_lighten")
   (return-type "none")
   (parameters
-    '("guint" "column")
-    '("GValue*" "value")
+    '("ClutterColor*" "dest")
   )
 )
 
-(define-method set
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_set")
+(define-method darken
+  (of-object "ClutterColor")
+  (c-name "clutter_color_darken")
   (return-type "none")
   (parameters
+    '("ClutterColor*" "dest")
   )
-  (varargs #t)
 )
 
-(define-method set_valist
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_set_valist")
+(define-method shade
+  (of-object "ClutterColor")
+  (c-name "clutter_color_shade")
   (return-type "none")
   (parameters
-    '("va_list" "args")
+    '("ClutterColor*" "dest")
+    '("gdouble" "shade")
   )
 )
 
-(define-method set_value
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_set_value")
+(define-method shadex
+  (of-object "ClutterColor")
+  (c-name "clutter_color_shadex")
   (return-type "none")
   (parameters
-    '("guint" "column")
-    '("const-GValue*" "value")
+    '("ClutterColor*" "dest")
+    '("ClutterFixed" "shade")
   )
 )
 
-(define-method is_first
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_is_first")
-  (return-type "gboolean")
-)
-
-(define-method is_last
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_is_last")
-  (return-type "gboolean")
-)
-
-(define-method next
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_next")
-  (return-type "ClutterModelIter*")
-)
-
-(define-method prev
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_prev")
-  (return-type "ClutterModelIter*")
-)
-
-(define-method get_model
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_get_model")
-  (return-type "ClutterModel*")
-)
-
-(define-method get_row
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_get_row")
-  (return-type "guint")
-)
-
-(define-method copy
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_copy")
-  (return-type "ClutterModelIter*")
-)
-
-
-
-;; From clutter-util.h
-
-(define-function clutter_util_next_p2
-  (c-name "clutter_util_next_p2")
-  (return-type "int")
+(define-method to_hlsx
+  (of-object "ClutterColor")
+  (c-name "clutter_color_to_hlsx")
+  (return-type "none")
   (parameters
-    '("int" "a")
+    '("ClutterFixed*" "hue")
+    '("ClutterFixed*" "luminance")
+    '("ClutterFixed*" "saturation")
   )
 )
 
-
-
-;; From clutter-shader-types.h
-
-(define-function clutter_shader_float_get_type
-  (c-name "clutter_shader_float_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_shader_int_get_type
-  (c-name "clutter_shader_int_get_type")
-  (return-type "GType")
+(define-method from_hlsx
+  (of-object "ClutterColor")
+  (c-name "clutter_color_from_hlsx")
+  (return-type "none")
+  (parameters
+    '("ClutterFixed" "hue")
+    '("ClutterFixed" "luminance")
+    '("ClutterFixed" "saturation")
+  )
 )
 
-(define-function clutter_shader_matrix_get_type
-  (c-name "clutter_shader_matrix_get_type")
-  (return-type "GType")
+(define-method to_hls
+  (of-object "ClutterColor")
+  (c-name "clutter_color_to_hls")
+  (return-type "none")
+  (parameters
+    '("guint8*" "hue")
+    '("guint8*" "luminance")
+    '("guint8*" "saturation")
+  )
 )
 
-(define-function clutter_value_set_shader_float
-  (c-name "clutter_value_set_shader_float")
+(define-method from_hls
+  (of-object "ClutterColor")
+  (c-name "clutter_color_from_hls")
   (return-type "none")
   (parameters
-    '("GValue*" "value")
-    '("gint" "size")
-    '("const-gfloat*" "floats")
+    '("guint8" "hue")
+    '("guint8" "luminance")
+    '("guint8" "saturation")
   )
 )
 
-(define-function clutter_value_set_shader_int
-  (c-name "clutter_value_set_shader_int")
+(define-method to_pixel
+  (of-object "ClutterColor")
+  (c-name "clutter_color_to_pixel")
+  (return-type "guint32")
+)
+
+(define-method from_pixel
+  (of-object "ClutterColor")
+  (c-name "clutter_color_from_pixel")
   (return-type "none")
   (parameters
-    '("GValue*" "value")
-    '("gint" "size")
-    '("const-gint*" "ints")
+    '("guint32" "pixel")
   )
 )
 
-(define-function clutter_value_set_shader_matrix
-  (c-name "clutter_value_set_shader_matrix")
+(define-function clutter_value_set_color
+  (c-name "clutter_value_set_color")
   (return-type "none")
   (parameters
     '("GValue*" "value")
-    '("gint" "size")
-    '("const-gfloat*" "matrix")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-function clutter_value_get_shader_float
-  (c-name "clutter_value_get_shader_float")
-  (return-type "const-gfloat*")
+(define-function clutter_value_get_color
+  (c-name "clutter_value_get_color")
+  (return-type "const-ClutterColor*")
   (parameters
     '("const-GValue*" "value")
-    '("gsize*" "length")
   )
 )
 
-(define-function clutter_value_get_shader_int
-  (c-name "clutter_value_get_shader_int")
-  (return-type "const-COGLint*")
-  (parameters
-    '("const-GValue*" "value")
-    '("gsize*" "length")
-  )
+(define-function clutter_param_color_get_type
+  (c-name "clutter_param_color_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_value_get_shader_matrix
-  (c-name "clutter_value_get_shader_matrix")
-  (return-type "const-GLfloat*")
+(define-function clutter_param_spec_color
+  (c-name "clutter_param_spec_color")
+  (return-type "GParamSpec*")
   (parameters
-    '("const-GValue*" "value")
-    '("gsize*" "length")
+    '("const-gchar*" "name")
+    '("const-gchar*" "nick")
+    '("const-gchar*" "blurb")
+    '("const-ClutterColor*" "default_value")
+    '("GParamFlags" "flags")
   )
 )
 
 
 
-;; From clutter-stage.h
-
-(define-function clutter_perspective_get_type
-  (c-name "clutter_perspective_get_type")
-  (return-type "GType")
-)
+;; From clutter-cairo-texture.h
 
-(define-function clutter_fog_get_type
-  (c-name "clutter_fog_get_type")
+(define-function clutter_cairo_texture_get_type
+  (c-name "clutter_cairo_texture_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_stage_get_type
-  (c-name "clutter_stage_get_type")
-  (return-type "GType")
+(define-function clutter_cairo_texture_new
+  (c-name "clutter_cairo_texture_new")
+  (is-constructor-of "ClutterCairoTexture")
+  (return-type "ClutterActor*")
+  (parameters
+    '("guint" "width")
+    '("guint" "height")
+  )
 )
 
-(define-function clutter_stage_get_default
-  (c-name "clutter_stage_get_default")
-  (return-type "ClutterActor*")
+(define-method create_region
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_create_region")
+  (return-type "cairo_t*")
+  (parameters
+    '("gint" "x_offset")
+    '("gint" "y_offset")
+    '("gint" "width")
+    '("gint" "height")
+  )
 )
 
-(define-function clutter_stage_new
-  (c-name "clutter_stage_new")
-  (is-constructor-of "ClutterStage")
-  (return-type "ClutterActor*")
+(define-method create
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_create")
+  (return-type "cairo_t*")
 )
 
-(define-method set_color
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_color")
+(define-method set_surface_size
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_set_surface_size")
   (return-type "none")
   (parameters
-    '("const-ClutterColor*" "color")
+    '("guint" "width")
+    '("guint" "height")
   )
 )
 
-(define-method get_color
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_color")
+(define-method get_surface_size
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_get_surface_size")
   (return-type "none")
   (parameters
-    '("ClutterColor*" "color")
+    '("guint*" "width")
+    '("guint*" "height")
   )
 )
 
-(define-method set_perspectivex
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_perspectivex")
+(define-function clutter_cairo_set_source_color
+  (c-name "clutter_cairo_set_source_color")
   (return-type "none")
   (parameters
-    '("ClutterPerspective*" "perspective")
+    '("cairo_t*" "cr")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-method get_perspectivex
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_perspectivex")
+
+
+;; From clutter-container.h
+
+(define-function clutter_container_get_type
+  (c-name "clutter_container_get_type")
+  (return-type "GType")
+)
+
+(define-method add
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_add")
   (return-type "none")
   (parameters
-    '("ClutterPerspective*" "perspective")
+    '("ClutterActor*" "first_actor")
   )
+  (varargs #t)
 )
 
-(define-method set_perspective
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_perspective")
+(define-method add_actor
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_add_actor")
   (return-type "none")
   (parameters
-    '("gfloat" "fovy")
-    '("gfloat" "aspect")
-    '("gfloat" "z_near")
-    '("gfloat" "z_far")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method get_perspective
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_perspective")
+(define-method add_valist
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_add_valist")
   (return-type "none")
   (parameters
-    '("gfloat*" "fovy")
-    '("gfloat*" "aspect")
-    '("gfloat*" "z_near")
-    '("gfloat*" "z_far")
+    '("ClutterActor*" "first_actor")
+    '("va_list" "var_args")
   )
 )
 
-(define-method fullscreen
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_fullscreen")
+(define-method remove
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_remove")
   (return-type "none")
+  (parameters
+    '("ClutterActor*" "first_actor")
+  )
+  (varargs #t)
 )
 
-(define-method unfullscreen
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_unfullscreen")
+(define-method remove_actor
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_remove_actor")
   (return-type "none")
+  (parameters
+    '("ClutterActor*" "actor")
+  )
 )
 
-(define-method show_cursor
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_show_cursor")
+(define-method remove_valist
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_remove_valist")
   (return-type "none")
+  (parameters
+    '("ClutterActor*" "first_actor")
+    '("va_list" "var_args")
+  )
 )
 
-(define-method hide_cursor
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_hide_cursor")
-  (return-type "none")
+(define-method get_children
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_get_children")
+  (return-type "GList*")
 )
 
-(define-method get_actor_at_pos
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_actor_at_pos")
-  (return-type "ClutterActor*")
+(define-method foreach
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_foreach")
+  (return-type "none")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("ClutterCallback" "callback")
+    '("gpointer" "user_data")
   )
 )
 
-(define-method read_pixels
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_read_pixels")
-  (return-type "guchar*")
+(define-method find_child_by_name
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_find_child_by_name")
+  (return-type "ClutterActor*")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
+    '("const-gchar*" "child_name")
   )
 )
 
-(define-method event
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_event")
-  (return-type "gboolean")
+(define-method raise_child
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_raise_child")
+  (return-type "none")
   (parameters
-    '("ClutterEvent*" "event")
+    '("ClutterActor*" "actor")
+    '("ClutterActor*" "sibling")
   )
 )
 
-(define-method set_title
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_title")
+(define-method lower_child
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_lower_child")
   (return-type "none")
   (parameters
-    '("const-gchar*" "title")
+    '("ClutterActor*" "actor")
+    '("ClutterActor*" "sibling")
   )
 )
 
-(define-method get_title
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_title")
-  (return-type "const-gchar*")
+(define-method sort_depth_order
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_sort_depth_order")
+  (return-type "none")
 )
 
-(define-method set_user_resizable
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_user_resizable")
-  (return-type "none")
+(define-function clutter_container_class_find_child_property
+  (c-name "clutter_container_class_find_child_property")
+  (return-type "GParamSpec*")
   (parameters
-    '("gboolean" "resizable")
+    '("GObjectClass*" "klass")
+    '("const-gchar*" "property_name")
   )
 )
 
-(define-method get_user_resizable
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_user_resizable")
-  (return-type "gboolean")
-)
-
-(define-method set_use_fog
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_use_fog")
-  (return-type "none")
+(define-function clutter_container_class_list_child_properties
+  (c-name "clutter_container_class_list_child_properties")
+  (return-type "GParamSpec**")
   (parameters
-    '("gboolean" "fog")
+    '("GObjectClass*" "klass")
+    '("guint*" "n_properties")
   )
 )
 
-(define-method get_use_fog
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_use_fog")
-  (return-type "gboolean")
+(define-method get_child_meta
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_get_child_meta")
+  (return-type "ClutterChildMeta*")
+  (parameters
+    '("ClutterActor*" "actor")
+  )
 )
 
-(define-method set_fog
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_fog")
+(define-method child_set_property
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_child_set_property")
   (return-type "none")
   (parameters
-    '("gdouble" "density")
-    '("gdouble" "z_near")
-    '("gdouble" "z_far")
+    '("ClutterActor*" "child")
+    '("const-gchar*" "property")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method get_fog
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_fog")
+(define-method child_get_property
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_child_get_property")
   (return-type "none")
   (parameters
-    '("gdouble*" "density")
-    '("gdouble*" "z_near")
-    '("gdouble*" "z_far")
+    '("ClutterActor*" "child")
+    '("const-gchar*" "property")
+    '("GValue*" "value")
   )
 )
 
-(define-method set_fogx
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_fogx")
+(define-method child_set
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_child_set")
   (return-type "none")
   (parameters
-    '("ClutterFog*" "fog")
+    '("ClutterActor*" "actor")
+    '("const-gchar*" "first_prop")
   )
+  (varargs #t)
 )
 
-(define-method get_fogx
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_fogx")
+(define-method child_get
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_child_get")
   (return-type "none")
   (parameters
-    '("ClutterFog*" "fog")
+    '("ClutterActor*" "actor")
+    '("const-gchar*" "first_prop")
   )
+  (varargs #t)
 )
 
-(define-method get_resolution
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_resolution")
-  (return-type "gdouble")
+
+
+;; From clutter-json.h
+
+
+
+;; From clutter-animation.h
+
+(define-function clutter_animation_get_type
+  (c-name "clutter_animation_get_type")
+  (return-type "GType")
 )
 
-(define-method get_resolutionx
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_resolutionx")
-  (return-type "ClutterFixed")
+(define-function clutter_animation_new
+  (c-name "clutter_animation_new")
+  (is-constructor-of "ClutterAnimation")
+  (return-type "ClutterAnimation*")
 )
 
-(define-method set_key_focus
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_key_focus")
+(define-method set_actor
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_set_actor")
   (return-type "none")
   (parameters
     '("ClutterActor*" "actor")
   )
 )
 
-(define-method get_key_focus
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_key_focus")
+(define-method get_actor
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_actor")
   (return-type "ClutterActor*")
 )
 
-(define-method ensure_current
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_ensure_current")
+(define-method set_mode
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_set_mode")
   (return-type "none")
+  (parameters
+    '("ClutterAnimationMode" "mode")
+  )
 )
 
-(define-method queue_redraw
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_queue_redraw")
-  (return-type "none")
+(define-method get_mode
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_mode")
+  (return-type "ClutterAnimationMode")
 )
 
-(define-method is_default
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_is_default")
-  (return-type "gboolean")
+(define-method set_duration
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_set_duration")
+  (return-type "none")
+  (parameters
+    '("gint" "msecs")
+  )
 )
 
+(define-method get_duration
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_duration")
+  (return-type "guint")
+)
 
-
-;; From clutter-child-meta.h
-
-(define-function clutter_child_meta_get_type
-  (c-name "clutter_child_meta_get_type")
-  (return-type "GType")
+(define-method set_loop
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_set_loop")
+  (return-type "none")
+  (parameters
+    '("gboolean" "loop")
+  )
 )
 
-(define-method get_container
-  (of-object "ClutterChildMeta")
-  (c-name "clutter_child_meta_get_container")
-  (return-type "ClutterContainer*")
+(define-method get_loop
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_loop")
+  (return-type "gboolean")
 )
 
-(define-method get_actor
-  (of-object "ClutterChildMeta")
-  (c-name "clutter_child_meta_get_actor")
-  (return-type "ClutterActor*")
+(define-method set_timeline
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_set_timeline")
+  (return-type "none")
+  (parameters
+    '("ClutterTimeline*" "timeline")
+  )
 )
 
+(define-method get_timeline
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_timeline")
+  (return-type "ClutterTimeline*")
+)
 
+(define-method set_alpha
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_set_alpha")
+  (return-type "none")
+  (parameters
+    '("ClutterAlpha*" "alpha")
+  )
+)
 
-;; From clutter-score.h
+(define-method get_alpha
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_alpha")
+  (return-type "ClutterAlpha*")
+)
 
-(define-function clutter_score_get_type
-  (c-name "clutter_score_get_type")
-  (return-type "GType")
+(define-method bind_property
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_bind_property")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "property_name")
+    '("ClutterInterval*" "interval")
+  )
 )
 
-(define-function clutter_score_new
-  (c-name "clutter_score_new")
-  (is-constructor-of "ClutterScore")
-  (return-type "ClutterScore*")
+(define-method has_property
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_has_property")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "property_name")
+  )
 )
 
-(define-method set_loop
-  (of-object "ClutterScore")
-  (c-name "clutter_score_set_loop")
+(define-method update_property
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_update_property")
   (return-type "none")
   (parameters
-    '("gboolean" "loop")
+    '("const-gchar*" "property_name")
+    '("ClutterInterval*" "interval")
   )
 )
 
-(define-method get_loop
-  (of-object "ClutterScore")
-  (c-name "clutter_score_get_loop")
-  (return-type "gboolean")
+(define-method unbind_property
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_unbind_property")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "property_name")
+  )
 )
 
-(define-method append
-  (of-object "ClutterScore")
-  (c-name "clutter_score_append")
-  (return-type "gulong")
+(define-method get_interval
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_interval")
+  (return-type "ClutterInterval*")
   (parameters
-    '("ClutterTimeline*" "parent")
-    '("ClutterTimeline*" "timeline")
+    '("const-gchar*" "property_name")
   )
 )
 
-(define-method append_at_marker
-  (of-object "ClutterScore")
-  (c-name "clutter_score_append_at_marker")
-  (return-type "gulong")
+(define-method animate
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_animate")
+  (return-type "ClutterAnimation*")
   (parameters
-    '("ClutterTimeline*" "parent")
-    '("const-gchar*" "marker_name")
-    '("ClutterTimeline*" "timeline")
+    '("ClutterAnimationMode" "mode")
+    '("guint" "duration")
+    '("const-gchar*" "first_property_name")
   )
+  (varargs #t)
 )
 
-(define-method remove
-  (of-object "ClutterScore")
-  (c-name "clutter_score_remove")
-  (return-type "none")
+(define-method animate_with_timeline
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_animate_with_timeline")
+  (return-type "ClutterAnimation*")
   (parameters
-    '("gulong" "id")
+    '("ClutterAnimationMode" "mode")
+    '("ClutterTimeline*" "timeline")
+    '("const-gchar*" "first_property_name")
   )
+  (varargs #t)
 )
 
-(define-method remove_all
-  (of-object "ClutterScore")
-  (c-name "clutter_score_remove_all")
-  (return-type "none")
-)
-
-(define-method get_timeline
-  (of-object "ClutterScore")
-  (c-name "clutter_score_get_timeline")
-  (return-type "ClutterTimeline*")
+(define-method animate_with_alpha
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_animate_with_alpha")
+  (return-type "ClutterAnimation*")
   (parameters
-    '("gulong" "id")
+    '("ClutterAlpha*" "alpha")
+    '("const-gchar*" "first_property_name")
   )
+  (varargs #t)
 )
 
-(define-method list_timelines
-  (of-object "ClutterScore")
-  (c-name "clutter_score_list_timelines")
-  (return-type "GSList*")
-)
 
-(define-method start
-  (of-object "ClutterScore")
-  (c-name "clutter_score_start")
-  (return-type "none")
+
+;; From clutter-stage-manager.h
+
+(define-function clutter_stage_manager_get_type
+  (c-name "clutter_stage_manager_get_type")
+  (return-type "GType")
 )
 
-(define-method stop
-  (of-object "ClutterScore")
-  (c-name "clutter_score_stop")
-  (return-type "none")
+(define-function clutter_stage_manager_get_default
+  (c-name "clutter_stage_manager_get_default")
+  (return-type "ClutterStageManager*")
 )
 
-(define-method pause
-  (of-object "ClutterScore")
-  (c-name "clutter_score_pause")
+(define-method set_default_stage
+  (of-object "ClutterStageManager")
+  (c-name "clutter_stage_manager_set_default_stage")
   (return-type "none")
+  (parameters
+    '("ClutterStage*" "stage")
+  )
 )
 
-(define-method rewind
-  (of-object "ClutterScore")
-  (c-name "clutter_score_rewind")
-  (return-type "none")
+(define-method get_default_stage
+  (of-object "ClutterStageManager")
+  (c-name "clutter_stage_manager_get_default_stage")
+  (return-type "ClutterStage*")
 )
 
-(define-method is_playing
-  (of-object "ClutterScore")
-  (c-name "clutter_score_is_playing")
-  (return-type "gboolean")
+(define-method list_stages
+  (of-object "ClutterStageManager")
+  (c-name "clutter_stage_manager_list_stages")
+  (return-type "GSList*")
 )
 
 
 
-;; From clutter-effect.h
+;; From clutter-shader.h
 
-(define-function clutter_effect_template_get_type
-  (c-name "clutter_effect_template_get_type")
+(define-function clutter_shader_error_quark
+  (c-name "clutter_shader_error_quark")
+  (return-type "GQuark")
+)
+
+(define-function clutter_shader_get_type
+  (c-name "clutter_shader_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_effect_template_new
-  (c-name "clutter_effect_template_new")
-  (is-constructor-of "ClutterEffectTemplate")
-  (return-type "ClutterEffectTemplate*")
-  (parameters
-    '("ClutterTimeline*" "timeline")
-    '("ClutterAlphaFunc" "alpha_func")
-  )
+(define-function clutter_shader_new
+  (c-name "clutter_shader_new")
+  (is-constructor-of "ClutterShader")
+  (return-type "ClutterShader*")
 )
 
-(define-function clutter_effect_template_new_full
-  (c-name "clutter_effect_template_new_full")
-  (return-type "ClutterEffectTemplate*")
+(define-method set_is_enabled
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_is_enabled")
+  (return-type "none")
   (parameters
-    '("ClutterTimeline*" "timeline")
-    '("ClutterAlphaFunc" "alpha_func")
-    '("gpointer" "user_data")
-    '("GDestroyNotify" "notify")
+    '("gboolean" "enabled")
   )
 )
 
-(define-function clutter_effect_template_new_for_duration
-  (c-name "clutter_effect_template_new_for_duration")
-  (return-type "ClutterEffectTemplate*")
-  (parameters
-    '("guint" "msecs")
-    '("ClutterAlphaFunc" "alpha_func")
-  )
+(define-method get_is_enabled
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_is_enabled")
+  (return-type "gboolean")
 )
 
-(define-method construct
-  (of-object "ClutterEffectTemplate")
-  (c-name "clutter_effect_template_construct")
-  (return-type "none")
+(define-method compile
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_compile")
+  (return-type "gboolean")
   (parameters
-    '("ClutterTimeline*" "timeline")
-    '("ClutterAlphaFunc" "alpha_func")
-    '("gpointer" "user_data")
-    '("GDestroyNotify" "notify")
+    '("GError**" "error")
   )
 )
 
-(define-method set_timeline_clone
-  (of-object "ClutterEffectTemplate")
-  (c-name "clutter_effect_template_set_timeline_clone")
+(define-method release
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_release")
   (return-type "none")
-  (parameters
-    '("gboolean" "setting")
-  )
 )
 
-(define-method get_timeline_clone
-  (of-object "ClutterEffectTemplate")
-  (c-name "clutter_effect_template_get_timeline_clone")
+(define-method is_compiled
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_is_compiled")
   (return-type "gboolean")
 )
 
-(define-function clutter_effect_fade
-  (c-name "clutter_effect_fade")
-  (return-type "ClutterTimeline*")
+(define-method set_vertex_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_vertex_source")
+  (return-type "none")
   (parameters
-    '("ClutterEffectTemplate*" "template_")
-    '("ClutterActor*" "actor")
-    '("guint8" "opacity_end")
-    '("ClutterEffectCompleteFunc" "func")
-    '("gpointer" "data")
+    '("const-gchar*" "data")
+    '("gssize" "length")
   )
 )
 
-(define-function clutter_effect_depth
-  (c-name "clutter_effect_depth")
-  (return-type "ClutterTimeline*")
+(define-method set_fragment_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_fragment_source")
+  (return-type "none")
   (parameters
-    '("ClutterEffectTemplate*" "template_")
-    '("ClutterActor*" "actor")
-    '("gint" "depth_end")
-    '("ClutterEffectCompleteFunc" "func")
-    '("gpointer" "data")
+    '("const-gchar*" "data")
+    '("gssize" "length")
   )
 )
 
-(define-function clutter_effect_move
-  (c-name "clutter_effect_move")
-  (return-type "ClutterTimeline*")
-  (parameters
-    '("ClutterEffectTemplate*" "template_")
-    '("ClutterActor*" "actor")
-    '("gint" "x")
-    '("gint" "y")
-    '("ClutterEffectCompleteFunc" "func")
-    '("gpointer" "data")
-  )
+(define-method get_vertex_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_vertex_source")
+  (return-type "const-gchar*")
 )
 
-(define-function clutter_effect_path
-  (c-name "clutter_effect_path")
-  (return-type "ClutterTimeline*")
-  (parameters
-    '("ClutterEffectTemplate*" "template_")
-    '("ClutterActor*" "actor")
-    '("const-ClutterKnot*" "knots")
-    '("guint" "n_knots")
-    '("ClutterEffectCompleteFunc" "func")
-    '("gpointer" "data")
-  )
+(define-method get_fragment_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_fragment_source")
+  (return-type "const-gchar*")
 )
 
-(define-function clutter_effect_scale
-  (c-name "clutter_effect_scale")
-  (return-type "ClutterTimeline*")
+(define-method set_uniform
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_uniform")
+  (return-type "none")
   (parameters
-    '("ClutterEffectTemplate*" "template_")
-    '("ClutterActor*" "actor")
-    '("gdouble" "x_scale_end")
-    '("gdouble" "y_scale_end")
-    '("ClutterEffectCompleteFunc" "func")
-    '("gpointer" "data")
+    '("const-gchar*" "name")
+    '("const-GValue*" "value")
   )
 )
 
-(define-function clutter_effect_rotate
-  (c-name "clutter_effect_rotate")
-  (return-type "ClutterTimeline*")
-  (parameters
-    '("ClutterEffectTemplate*" "template_")
-    '("ClutterActor*" "actor")
-    '("ClutterRotateAxis" "axis")
-    '("gdouble" "angle")
-    '("gint" "center_x")
-    '("gint" "center_y")
-    '("gint" "center_z")
-    '("ClutterRotateDirection" "direction")
-    '("ClutterEffectCompleteFunc" "func")
-    '("gpointer" "data")
+(define-method get_cogl_program
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_cogl_program")
+  (return-type "CoglHandle")
+)
+
+(define-method get_cogl_fragment_shader
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_cogl_fragment_shader")
+  (return-type "CoglHandle")
+)
+
+(define-method get_cogl_vertex_shader
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_cogl_vertex_shader")
+  (return-type "CoglHandle")
+)
+
+(define-method set_uniform_1f
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_uniform_1f")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+    '("gfloat" "value")
   )
 )
 
 
 
-;; From clutter-group.h
+;; From clutter-event.h
 
-(define-function clutter_group_get_type
-  (c-name "clutter_group_get_type")
+(define-function clutter_event_get_type
+  (c-name "clutter_event_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_group_new
-  (c-name "clutter_group_new")
-  (is-constructor-of "ClutterGroup")
-  (return-type "ClutterActor*")
+(define-function clutter_events_pending
+  (c-name "clutter_events_pending")
+  (return-type "gboolean")
 )
 
-(define-method get_nth_child
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_get_nth_child")
-  (return-type "ClutterActor*")
-  (parameters
-    '("gint" "index_")
-  )
+(define-function clutter_event_get
+  (c-name "clutter_event_get")
+  (return-type "ClutterEvent*")
 )
 
-(define-method get_n_children
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_get_n_children")
-  (return-type "gint")
+(define-function clutter_event_peek
+  (c-name "clutter_event_peek")
+  (return-type "ClutterEvent*")
 )
 
-(define-method remove_all
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_remove_all")
+(define-method put
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_put")
   (return-type "none")
 )
 
-(define-method add_many
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_add_many")
-  (return-type "none")
+(define-function clutter_event_new
+  (c-name "clutter_event_new")
+  (is-constructor-of "ClutterEvent")
+  (return-type "ClutterEvent*")
   (parameters
-    '("ClutterActor*" "first_actor")
+    '("ClutterEventType" "type")
   )
-  (varargs #t)
 )
 
-(define-method add_many_valist
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_add_many_valist")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "first_actor")
-    '("va_list" "var_args")
-  )
+(define-method copy
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_copy")
+  (return-type "ClutterEvent*")
 )
 
-(define-method remove
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_remove")
+(define-method free
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_free")
   (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
 )
 
-(define-method raise
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_raise")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterActor*" "sibling")
-  )
+(define-method type
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_type")
+  (return-type "ClutterEventType")
 )
 
-(define-method lower
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_lower")
+(define-method get_time
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_time")
+  (return-type "guint32")
+)
+
+(define-method get_state
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_state")
+  (return-type "ClutterModifierType")
+)
+
+(define-method get_coords
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_coords")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterActor*" "sibling")
+    '("gint*" "x")
+    '("gint*" "y")
   )
 )
 
-(define-method sort_depth_order
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_sort_depth_order")
-  (return-type "none")
+(define-method get_device_id
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_device_id")
+  (return-type "gint")
+)
+
+(define-method get_source
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_source")
+  (return-type "ClutterActor*")
+)
+
+(define-method symbol
+  (of-object "ClutterKeyEvent")
+  (c-name "clutter_key_event_symbol")
+  (return-type "guint")
 )
 
+(define-method code
+  (of-object "ClutterKeyEvent")
+  (c-name "clutter_key_event_code")
+  (return-type "guint16")
+)
 
+(define-method unicode
+  (of-object "ClutterKeyEvent")
+  (c-name "clutter_key_event_unicode")
+  (return-type "guint32")
+)
 
-;; From clutter-units.h
+(define-method button
+  (of-object "ClutterButtonEvent")
+  (c-name "clutter_button_event_button")
+  (return-type "guint32")
+)
 
-(define-function clutter_unit_get_type
-  (c-name "clutter_unit_get_type")
-  (return-type "GType")
+(define-function clutter_keysym_to_unicode
+  (c-name "clutter_keysym_to_unicode")
+  (return-type "guint32")
+  (parameters
+    '("guint" "keyval")
+  )
 )
 
-(define-function clutter_param_unit_get_type
-  (c-name "clutter_param_unit_get_type")
+(define-method get_stage
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_stage")
+  (return-type "ClutterStage*")
+)
+
+
+
+;; From clutter-behaviour-depth.h
+
+(define-function clutter_behaviour_depth_get_type
+  (c-name "clutter_behaviour_depth_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_value_set_unit
-  (c-name "clutter_value_set_unit")
-  (return-type "none")
+(define-function clutter_behaviour_depth_new
+  (c-name "clutter_behaviour_depth_new")
+  (is-constructor-of "ClutterBehaviourDepth")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("GValue*" "value")
-    '("ClutterUnit" "units")
+    '("ClutterAlpha*" "alpha")
+    '("gint" "depth_start")
+    '("gint" "depth_end")
   )
 )
 
-(define-function clutter_value_get_unit
-  (c-name "clutter_value_get_unit")
-  (return-type "ClutterUnit")
+(define-method set_bounds
+  (of-object "ClutterBehaviourDepth")
+  (c-name "clutter_behaviour_depth_set_bounds")
+  (return-type "none")
   (parameters
-    '("const-GValue*" "value")
+    '("gint" "depth_start")
+    '("gint" "depth_end")
   )
 )
 
-(define-function clutter_param_spec_unit
-  (c-name "clutter_param_spec_unit")
-  (return-type "GParamSpec*")
+(define-method get_bounds
+  (of-object "ClutterBehaviourDepth")
+  (c-name "clutter_behaviour_depth_get_bounds")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "name")
-    '("const-gchar*" "nick")
-    '("const-gchar*" "blurb")
-    '("ClutterUnit" "minimum")
-    '("ClutterUnit" "maximum")
-    '("ClutterUnit" "default_value")
-    '("GParamFlags" "flags")
+    '("gint*" "depth_start")
+    '("gint*" "depth_end")
   )
 )
 
 
 
-;; From clutter-texture.h
-
-(define-function clutter_texture_error_quark
-  (c-name "clutter_texture_error_quark")
-  (return-type "GQuark")
-)
-
-(define-function clutter_texture_get_type
-  (c-name "clutter_texture_get_type")
-  (return-type "GType")
-)
+;; From clutter-model.h
 
-(define-function clutter_texture_handle_get_type
-  (c-name "clutter_texture_handle_get_type")
+(define-function clutter_model_get_type
+  (c-name "clutter_model_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_texture_new
-  (c-name "clutter_texture_new")
-  (is-constructor-of "ClutterTexture")
-  (return-type "ClutterActor*")
+(define-method set_types
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_types")
+  (return-type "none")
+  (parameters
+    '("guint" "n_columns")
+    '("GType*" "types")
+  )
 )
 
-(define-function clutter_texture_new_from_file
-  (c-name "clutter_texture_new_from_file")
-  (return-type "ClutterActor*")
+(define-method set_names
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_names")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "filename")
-    '("GError**" "error")
+    '("guint" "n_columns")
+    '("const-gchar*-const[]" "names")
   )
 )
 
-(define-function clutter_texture_new_from_actor
-  (c-name "clutter_texture_new_from_actor")
-  (return-type "ClutterActor*")
+(define-method append
+  (of-object "ClutterModel")
+  (c-name "clutter_model_append")
+  (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
   )
+  (varargs #t)
 )
 
-(define-method set_from_file
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_from_file")
-  (return-type "gboolean")
+(define-method appendv
+  (of-object "ClutterModel")
+  (c-name "clutter_model_appendv")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "filename")
-    '("GError**" "error")
+    '("guint" "n_columns")
+    '("guint*" "columns")
+    '("GValue*" "values")
   )
 )
 
-(define-method set_from_rgb_data
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_from_rgb_data")
-  (return-type "gboolean")
+(define-method prepend
+  (of-object "ClutterModel")
+  (c-name "clutter_model_prepend")
+  (return-type "none")
   (parameters
-    '("const-guchar*" "data")
-    '("gboolean" "has_alpha")
-    '("gint" "width")
-    '("gint" "height")
-    '("gint" "rowstride")
-    '("gint" "bpp")
-    '("ClutterTextureFlags" "flags")
-    '("GError**" "error")
   )
+  (varargs #t)
 )
 
-(define-method set_from_yuv_data
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_from_yuv_data")
-  (return-type "gboolean")
+(define-method prependv
+  (of-object "ClutterModel")
+  (c-name "clutter_model_prependv")
+  (return-type "none")
   (parameters
-    '("const-guchar*" "data")
-    '("gint" "width")
-    '("gint" "height")
-    '("ClutterTextureFlags" "flags")
-    '("GError**" "error")
+    '("guint" "n_columns")
+    '("guint*" "columns")
+    '("GValue*" "values")
   )
 )
 
-(define-method set_area_from_rgb_data
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_area_from_rgb_data")
-  (return-type "gboolean")
+(define-method insert
+  (of-object "ClutterModel")
+  (c-name "clutter_model_insert")
+  (return-type "none")
   (parameters
-    '("const-guchar*" "data")
-    '("gboolean" "has_alpha")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-    '("gint" "rowstride")
-    '("gint" "bpp")
-    '("ClutterTextureFlags" "flags")
-    '("GError**" "error")
+    '("guint" "row")
   )
+  (varargs #t)
 )
 
-(define-method get_base_size
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_base_size")
+(define-method insertv
+  (of-object "ClutterModel")
+  (c-name "clutter_model_insertv")
   (return-type "none")
   (parameters
-    '("gint*" "width")
-    '("gint*" "height")
+    '("guint" "row")
+    '("guint" "n_columns")
+    '("guint*" "columns")
+    '("GValue*" "values")
   )
 )
 
-(define-method set_filter_quality
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_filter_quality")
+(define-method insert_value
+  (of-object "ClutterModel")
+  (c-name "clutter_model_insert_value")
   (return-type "none")
   (parameters
-    '("ClutterTextureQuality" "filter_quality")
+    '("guint" "row")
+    '("guint" "column")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method get_filter_quality
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_filter_quality")
-  (return-type "ClutterTextureQuality")
-)
-
-(define-method set_max_tile_waste
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_max_tile_waste")
+(define-method remove
+  (of-object "ClutterModel")
+  (c-name "clutter_model_remove")
   (return-type "none")
   (parameters
-    '("gint" "max_tile_waste")
+    '("guint" "row")
   )
 )
 
-(define-method get_max_tile_waste
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_max_tile_waste")
-  (return-type "gint")
+(define-method get_n_rows
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_n_rows")
+  (return-type "guint")
 )
 
-(define-method get_cogl_texture
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_cogl_texture")
-  (return-type "CoglHandle")
+(define-method get_n_columns
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_n_columns")
+  (return-type "guint")
 )
 
-(define-method set_cogl_texture
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_cogl_texture")
-  (return-type "none")
+(define-method get_column_name
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_column_name")
+  (return-type "const-gchar*")
   (parameters
-    '("CoglHandle" "cogl_tex")
+    '("guint" "column")
   )
 )
 
+(define-method get_column_type
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_column_type")
+  (return-type "GType")
+  (parameters
+    '("guint" "column")
+  )
+)
 
+(define-method get_first_iter
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_first_iter")
+  (return-type "ClutterModelIter*")
+)
 
-;; From clutter-behaviour.h
-
-(define-function clutter_behaviour_get_type
-  (c-name "clutter_behaviour_get_type")
-  (return-type "GType")
+(define-method get_last_iter
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_last_iter")
+  (return-type "ClutterModelIter*")
 )
 
-(define-method apply
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_apply")
-  (return-type "none")
+(define-method get_iter_at_row
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_iter_at_row")
+  (return-type "ClutterModelIter*")
   (parameters
-    '("ClutterActor*" "actor")
+    '("guint" "row")
   )
 )
 
-(define-method remove
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_remove")
+(define-method set_sorting_column
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_sorting_column")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
+    '("gint" "column")
   )
 )
 
-(define-method remove_all
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_remove_all")
-  (return-type "none")
+(define-method get_sorting_column
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_sorting_column")
+  (return-type "gint")
 )
 
-(define-method actors_foreach
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_actors_foreach")
+(define-method foreach
+  (of-object "ClutterModel")
+  (c-name "clutter_model_foreach")
   (return-type "none")
   (parameters
-    '("ClutterBehaviourForeachFunc" "func")
-    '("gpointer" "data")
+    '("ClutterModelForeachFunc" "func")
+    '("gpointer" "user_data")
   )
 )
 
-(define-method get_n_actors
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_n_actors")
-  (return-type "gint")
-)
-
-(define-method get_nth_actor
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_nth_actor")
-  (return-type "ClutterActor*")
+(define-method set_sort
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_sort")
+  (return-type "none")
   (parameters
-    '("gint" "index_")
+    '("guint" "column")
+    '("ClutterModelSortFunc" "func")
+    '("gpointer" "user_data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-method get_actors
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_actors")
-  (return-type "GSList*")
+(define-method set_filter
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_filter")
+  (return-type "none")
+  (parameters
+    '("ClutterModelFilterFunc" "func")
+    '("gpointer" "user_data")
+    '("GDestroyNotify" "notify")
+  )
 )
 
-(define-method get_alpha
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_alpha")
-  (return-type "ClutterAlpha*")
+(define-method resort
+  (of-object "ClutterModel")
+  (c-name "clutter_model_resort")
+  (return-type "none")
 )
 
-(define-method set_alpha
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_set_alpha")
-  (return-type "none")
+(define-method filter_row
+  (of-object "ClutterModel")
+  (c-name "clutter_model_filter_row")
+  (return-type "gboolean")
   (parameters
-    '("ClutterAlpha*" "alpha")
+    '("guint" "row")
   )
 )
 
-(define-method is_applied
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_is_applied")
+(define-method filter_iter
+  (of-object "ClutterModel")
+  (c-name "clutter_model_filter_iter")
   (return-type "gboolean")
   (parameters
-    '("ClutterActor*" "actor")
+    '("ClutterModelIter*" "iter")
   )
 )
 
-
-
-;; From clutter-media.h
-
-(define-function clutter_media_get_type
-  (c-name "clutter_media_get_type")
+(define-function clutter_model_iter_get_type
+  (c-name "clutter_model_iter_get_type")
   (return-type "GType")
 )
 
-(define-method set_uri
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_set_uri")
+(define-method get
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_get")
   (return-type "none")
   (parameters
-    '("const-char*" "uri")
   )
+  (varargs #t)
 )
 
-(define-method get_uri
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_get_uri")
-  (return-type "const-char*")
-)
-
-(define-method set_playing
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_set_playing")
+(define-method get_valist
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_get_valist")
   (return-type "none")
   (parameters
-    '("gboolean" "playing")
+    '("va_list" "args")
   )
 )
 
-(define-method get_playing
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_get_playing")
-  (return-type "gboolean")
+(define-method get_value
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_get_value")
+  (return-type "none")
+  (parameters
+    '("guint" "column")
+    '("GValue*" "value")
+  )
 )
 
-(define-method set_position
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_set_position")
+(define-method set
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_set")
   (return-type "none")
   (parameters
-    '("int" "position")
   )
+  (varargs #t)
 )
 
-(define-method get_position
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_get_position")
-  (return-type "int")
+(define-method set_valist
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_set_valist")
+  (return-type "none")
+  (parameters
+    '("va_list" "args")
+  )
 )
 
-(define-method set_volume
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_set_volume")
+(define-method set_value
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_set_value")
   (return-type "none")
   (parameters
-    '("double" "volume")
+    '("guint" "column")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method get_volume
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_get_volume")
-  (return-type "double")
+(define-method is_first
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_is_first")
+  (return-type "gboolean")
 )
 
-(define-method get_can_seek
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_get_can_seek")
+(define-method is_last
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_is_last")
   (return-type "gboolean")
 )
 
-(define-method get_buffer_percent
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_get_buffer_percent")
-  (return-type "int")
+(define-method next
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_next")
+  (return-type "ClutterModelIter*")
 )
 
-(define-method get_duration
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_get_duration")
-  (return-type "int")
+(define-method prev
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_prev")
+  (return-type "ClutterModelIter*")
 )
 
-(define-method set_filename
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_set_filename")
-  (return-type "none")
+(define-method get_model
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_get_model")
+  (return-type "ClutterModel*")
+)
+
+(define-method get_row
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_get_row")
+  (return-type "guint")
+)
+
+(define-method copy
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_copy")
+  (return-type "ClutterModelIter*")
+)
+
+
+
+;; From clutter-util.h
+
+(define-function clutter_util_next_p2
+  (c-name "clutter_util_next_p2")
+  (return-type "int")
   (parameters
-    '("const-gchar*" "filename")
+    '("int" "a")
   )
 )
 
 
 
-;; From clutter-script.h
+;; From clutter-shader-types.h
 
-(define-function clutter_script_error_quark
-  (c-name "clutter_script_error_quark")
-  (return-type "GQuark")
+(define-function clutter_shader_float_get_type
+  (c-name "clutter_shader_float_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_script_get_type
-  (c-name "clutter_script_get_type")
+(define-function clutter_shader_int_get_type
+  (c-name "clutter_shader_int_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_script_new
-  (c-name "clutter_script_new")
-  (is-constructor-of "ClutterScript")
-  (return-type "ClutterScript*")
+(define-function clutter_shader_matrix_get_type
+  (c-name "clutter_shader_matrix_get_type")
+  (return-type "GType")
 )
 
-(define-method load_from_file
-  (of-object "ClutterScript")
-  (c-name "clutter_script_load_from_file")
-  (return-type "guint")
+(define-function clutter_value_set_shader_float
+  (c-name "clutter_value_set_shader_float")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "filename")
-    '("GError**" "error")
+    '("GValue*" "value")
+    '("gint" "size")
+    '("const-gfloat*" "floats")
   )
 )
 
-(define-method load_from_data
-  (of-object "ClutterScript")
-  (c-name "clutter_script_load_from_data")
-  (return-type "guint")
+(define-function clutter_value_set_shader_int
+  (c-name "clutter_value_set_shader_int")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "data")
-    '("gssize" "length")
-    '("GError**" "error")
+    '("GValue*" "value")
+    '("gint" "size")
+    '("const-gint*" "ints")
   )
 )
 
-(define-method get_object
-  (of-object "ClutterScript")
-  (c-name "clutter_script_get_object")
-  (return-type "GObject*")
+(define-function clutter_value_set_shader_matrix
+  (c-name "clutter_value_set_shader_matrix")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("GValue*" "value")
+    '("gint" "size")
+    '("const-gfloat*" "matrix")
   )
 )
 
-(define-method get_objects
-  (of-object "ClutterScript")
-  (c-name "clutter_script_get_objects")
-  (return-type "gint")
+(define-function clutter_value_get_shader_float
+  (c-name "clutter_value_get_shader_float")
+  (return-type "const-gfloat*")
   (parameters
-    '("const-gchar*" "first_name")
+    '("const-GValue*" "value")
+    '("gsize*" "length")
   )
-  (varargs #t)
 )
 
-(define-method list_objects
-  (of-object "ClutterScript")
-  (c-name "clutter_script_list_objects")
-  (return-type "GList*")
+(define-function clutter_value_get_shader_int
+  (c-name "clutter_value_get_shader_int")
+  (return-type "const-COGLint*")
+  (parameters
+    '("const-GValue*" "value")
+    '("gsize*" "length")
+  )
 )
 
-(define-method unmerge_objects
-  (of-object "ClutterScript")
-  (c-name "clutter_script_unmerge_objects")
-  (return-type "none")
+(define-function clutter_value_get_shader_matrix
+  (c-name "clutter_value_get_shader_matrix")
+  (return-type "const-GLfloat*")
   (parameters
-    '("guint" "merge_id")
+    '("const-GValue*" "value")
+    '("gsize*" "length")
   )
 )
 
-(define-method ensure_objects
-  (of-object "ClutterScript")
-  (c-name "clutter_script_ensure_objects")
-  (return-type "none")
+
+
+;; From clutter-stage.h
+
+(define-function clutter_perspective_get_type
+  (c-name "clutter_perspective_get_type")
+  (return-type "GType")
 )
 
-(define-method get_type_from_name
-  (of-object "ClutterScript")
-  (c-name "clutter_script_get_type_from_name")
+(define-function clutter_fog_get_type
+  (c-name "clutter_fog_get_type")
   (return-type "GType")
-  (parameters
-    '("const-gchar*" "type_name")
-  )
 )
 
-(define-function clutter_get_script_id
-  (c-name "clutter_get_script_id")
-  (return-type "const-gchar*")
-  (parameters
-    '("GObject*" "gobject")
-  )
+(define-function clutter_stage_get_type
+  (c-name "clutter_stage_get_type")
+  (return-type "GType")
 )
 
-(define-method connect_signals
-  (of-object "ClutterScript")
-  (c-name "clutter_script_connect_signals")
-  (return-type "none")
-  (parameters
-    '("gpointer" "user_data")
-  )
+(define-function clutter_stage_get_default
+  (c-name "clutter_stage_get_default")
+  (return-type "ClutterActor*")
 )
 
-(define-method connect_signals_full
-  (of-object "ClutterScript")
-  (c-name "clutter_script_connect_signals_full")
-  (return-type "none")
-  (parameters
-    '("ClutterScriptConnectFunc" "func")
-    '("gpointer" "user_data")
-  )
+(define-function clutter_stage_new
+  (c-name "clutter_stage_new")
+  (is-constructor-of "ClutterStage")
+  (return-type "ClutterActor*")
 )
 
-(define-method add_search_paths
-  (of-object "ClutterScript")
-  (c-name "clutter_script_add_search_paths")
+(define-method set_color
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_color")
   (return-type "none")
   (parameters
-    '("const-gchar*-const[]" "paths")
-    '("gsize" "n_paths")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-method lookup_filename
-  (of-object "ClutterScript")
-  (c-name "clutter_script_lookup_filename")
-  (return-type "gchar*")
+(define-method get_color
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_color")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "filename")
+    '("ClutterColor*" "color")
   )
 )
 
-
-
-;; From clutter-behaviour-rotate.h
-
-(define-function clutter_behaviour_rotate_get_type
-  (c-name "clutter_behaviour_rotate_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_behaviour_rotate_new
-  (c-name "clutter_behaviour_rotate_new")
-  (is-constructor-of "ClutterBehaviourRotate")
-  (return-type "ClutterBehaviour*")
+(define-method set_perspectivex
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_perspectivex")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("ClutterRotateAxis" "axis")
-    '("ClutterRotateDirection" "direction")
-    '("gdouble" "angle_start")
-    '("gdouble" "angle_end")
+    '("ClutterPerspective*" "perspective")
   )
 )
 
-(define-function clutter_behaviour_rotate_newx
-  (c-name "clutter_behaviour_rotate_newx")
-  (return-type "ClutterBehaviour*")
+(define-method get_perspectivex
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_perspectivex")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("ClutterRotateAxis" "axis")
-    '("ClutterRotateDirection" "direction")
-    '("ClutterFixed" "angle_start")
-    '("ClutterFixed" "angle_end")
+    '("ClutterPerspective*" "perspective")
   )
 )
 
-(define-method get_center
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_get_center")
+(define-method set_perspective
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_perspective")
   (return-type "none")
   (parameters
-    '("gint*" "x")
-    '("gint*" "y")
-    '("gint*" "z")
+    '("gfloat" "fovy")
+    '("gfloat" "aspect")
+    '("gfloat" "z_near")
+    '("gfloat" "z_far")
   )
 )
 
-(define-method set_center
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_set_center")
+(define-method get_perspective
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_perspective")
   (return-type "none")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "z")
+    '("gfloat*" "fovy")
+    '("gfloat*" "aspect")
+    '("gfloat*" "z_near")
+    '("gfloat*" "z_far")
   )
 )
 
-(define-method get_axis
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_get_axis")
-  (return-type "ClutterRotateAxis")
+(define-method fullscreen
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_fullscreen")
+  (return-type "none")
 )
 
-(define-method set_axis
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_set_axis")
+(define-method unfullscreen
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_unfullscreen")
   (return-type "none")
-  (parameters
-    '("ClutterRotateAxis" "axis")
-  )
 )
 
-(define-method get_direction
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_get_direction")
-  (return-type "ClutterRotateDirection")
+(define-method show_cursor
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_show_cursor")
+  (return-type "none")
 )
 
-(define-method set_direction
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_set_direction")
+(define-method hide_cursor
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_hide_cursor")
   (return-type "none")
-  (parameters
-    '("ClutterRotateDirection" "direction")
-  )
 )
 
-(define-method get_bounds
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_get_bounds")
-  (return-type "none")
+(define-method get_actor_at_pos
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_actor_at_pos")
+  (return-type "ClutterActor*")
   (parameters
-    '("gdouble*" "angle_start")
-    '("gdouble*" "angle_end")
+    '("gint" "x")
+    '("gint" "y")
   )
 )
 
-(define-method set_bounds
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_set_bounds")
-  (return-type "none")
+(define-method read_pixels
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_read_pixels")
+  (return-type "guchar*")
   (parameters
-    '("gdouble" "angle_start")
-    '("gdouble" "angle_end")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
   )
 )
 
-(define-method get_boundsx
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_get_boundsx")
-  (return-type "none")
+(define-method event
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_event")
+  (return-type "gboolean")
   (parameters
-    '("ClutterFixed*" "angle_start")
-    '("ClutterFixed*" "angle_end")
+    '("ClutterEvent*" "event")
   )
 )
 
-(define-method set_boundsx
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_set_boundsx")
+(define-method set_title
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_title")
   (return-type "none")
   (parameters
-    '("ClutterFixed" "angle_start")
-    '("ClutterFixed" "angle_end")
+    '("const-gchar*" "title")
   )
 )
 
-
-
-;; From clutter-scriptable.h
-
-(define-function clutter_scriptable_get_type
-  (c-name "clutter_scriptable_get_type")
-  (return-type "GType")
+(define-method get_title
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_title")
+  (return-type "const-gchar*")
 )
 
-(define-method set_id
-  (of-object "ClutterScriptable")
-  (c-name "clutter_scriptable_set_id")
+(define-method set_user_resizable
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_user_resizable")
   (return-type "none")
   (parameters
-    '("const-gchar*" "id")
+    '("gboolean" "resizable")
   )
 )
 
-(define-method get_id
-  (of-object "ClutterScriptable")
-  (c-name "clutter_scriptable_get_id")
-  (return-type "const-gchar*")
-)
-
-(define-method parse_custom_node
-  (of-object "ClutterScriptable")
-  (c-name "clutter_scriptable_parse_custom_node")
+(define-method get_user_resizable
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_user_resizable")
   (return-type "gboolean")
-  (parameters
-    '("ClutterScript*" "script")
-    '("GValue*" "value")
-    '("const-gchar*" "name")
-    '("JsonNode*" "node")
-  )
 )
 
-(define-method set_custom_property
-  (of-object "ClutterScriptable")
-  (c-name "clutter_scriptable_set_custom_property")
+(define-method set_use_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_use_fog")
   (return-type "none")
   (parameters
-    '("ClutterScript*" "script")
-    '("const-gchar*" "name")
-    '("const-GValue*" "value")
+    '("gboolean" "fog")
   )
 )
 
-
-
-;; From clutter-behaviour-opacity.h
-
-(define-function clutter_behaviour_opacity_get_type
-  (c-name "clutter_behaviour_opacity_get_type")
-  (return-type "GType")
+(define-method get_use_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_use_fog")
+  (return-type "gboolean")
 )
 
-(define-function clutter_behaviour_opacity_new
-  (c-name "clutter_behaviour_opacity_new")
-  (is-constructor-of "ClutterBehaviourOpacity")
-  (return-type "ClutterBehaviour*")
+(define-method set_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_fog")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("guint8" "opacity_start")
-    '("guint8" "opacity_end")
+    '("gdouble" "density")
+    '("gdouble" "z_near")
+    '("gdouble" "z_far")
   )
 )
 
-(define-method set_bounds
-  (of-object "ClutterBehaviourOpacity")
-  (c-name "clutter_behaviour_opacity_set_bounds")
+(define-method get_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_fog")
   (return-type "none")
   (parameters
-    '("guint8" "opacity_start")
-    '("guint8" "opacity_end")
+    '("gdouble*" "density")
+    '("gdouble*" "z_near")
+    '("gdouble*" "z_far")
   )
 )
 
-(define-method get_bounds
-  (of-object "ClutterBehaviourOpacity")
-  (c-name "clutter_behaviour_opacity_get_bounds")
+(define-method set_fogx
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_fogx")
+  (return-type "none")
+  (parameters
+    '("ClutterFog*" "fog")
+  )
+)
+
+(define-method get_fogx
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_fogx")
   (return-type "none")
   (parameters
-    '("guint8*" "opacity_start")
-    '("guint8*" "opacity_end")
+    '("ClutterFog*" "fog")
   )
 )
 
+(define-method get_resolution
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_resolution")
+  (return-type "gdouble")
+)
 
-
-;; From clutter.h
-
-
-
-;; From clutter-behaviour-path.h
-
-(define-function clutter_behaviour_path_get_type
-  (c-name "clutter_behaviour_path_get_type")
-  (return-type "GType")
+(define-method get_resolutionx
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_resolutionx")
+  (return-type "ClutterFixed")
 )
 
-(define-function clutter_behaviour_path_new
-  (c-name "clutter_behaviour_path_new")
-  (is-constructor-of "ClutterBehaviourPath")
-  (return-type "ClutterBehaviour*")
+(define-method set_key_focus
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_key_focus")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("ClutterPath*" "path")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-function clutter_behaviour_path_new_with_description
-  (c-name "clutter_behaviour_path_new_with_description")
-  (return-type "ClutterBehaviour*")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("const-gchar*" "desc")
-  )
+(define-method get_key_focus
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_key_focus")
+  (return-type "ClutterActor*")
 )
 
-(define-function clutter_behaviour_path_new_with_knots
-  (c-name "clutter_behaviour_path_new_with_knots")
-  (return-type "ClutterBehaviour*")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("const-ClutterKnot*" "knots")
-    '("guint" "n_knots")
-  )
+(define-method ensure_current
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_ensure_current")
+  (return-type "none")
 )
 
-(define-method set_path
-  (of-object "ClutterBehaviourPath")
-  (c-name "clutter_behaviour_path_set_path")
+(define-method queue_redraw
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_queue_redraw")
   (return-type "none")
-  (parameters
-    '("ClutterPath*" "path")
-  )
 )
 
-(define-method get_path
-  (of-object "ClutterBehaviourPath")
-  (c-name "clutter_behaviour_path_get_path")
-  (return-type "ClutterPath*")
+(define-method is_default
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_is_default")
+  (return-type "gboolean")
 )
 
 
 
-;; From clutter-clone-texture.h
+;; From clutter-child-meta.h
 
-(define-function clutter_clone_texture_get_type
-  (c-name "clutter_clone_texture_get_type")
+(define-function clutter_child_meta_get_type
+  (c-name "clutter_child_meta_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_clone_texture_new
-  (c-name "clutter_clone_texture_new")
-  (is-constructor-of "ClutterCloneTexture")
-  (return-type "ClutterActor*")
-  (parameters
-    '("ClutterTexture*" "texture")
-  )
-)
-
-(define-method get_parent_texture
-  (of-object "ClutterCloneTexture")
-  (c-name "clutter_clone_texture_get_parent_texture")
-  (return-type "ClutterTexture*")
+(define-method get_container
+  (of-object "ClutterChildMeta")
+  (c-name "clutter_child_meta_get_container")
+  (return-type "ClutterContainer*")
 )
 
-(define-method set_parent_texture
-  (of-object "ClutterCloneTexture")
-  (c-name "clutter_clone_texture_set_parent_texture")
-  (return-type "none")
-  (parameters
-    '("ClutterTexture*" "texture")
-  )
+(define-method get_actor
+  (of-object "ClutterChildMeta")
+  (c-name "clutter_child_meta_get_actor")
+  (return-type "ClutterActor*")
 )
 
 
 
-;; From clutter-alpha.h
+;; From clutter-score.h
 
-(define-function clutter_alpha_get_type
-  (c-name "clutter_alpha_get_type")
+(define-function clutter_score_get_type
+  (c-name "clutter_score_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_alpha_new
-  (c-name "clutter_alpha_new")
-  (is-constructor-of "ClutterAlpha")
-  (return-type "ClutterAlpha*")
+(define-function clutter_score_new
+  (c-name "clutter_score_new")
+  (is-constructor-of "ClutterScore")
+  (return-type "ClutterScore*")
 )
 
-(define-function clutter_alpha_new_full
-  (c-name "clutter_alpha_new_full")
-  (return-type "ClutterAlpha*")
+(define-method set_loop
+  (of-object "ClutterScore")
+  (c-name "clutter_score_set_loop")
+  (return-type "none")
   (parameters
-    '("ClutterTimeline*" "timeline")
-    '("ClutterAlphaFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "destroy")
+    '("gboolean" "loop")
   )
 )
 
-(define-function clutter_alpha_new_for_mode
-  (c-name "clutter_alpha_new_for_mode")
-  (return-type "ClutterAlpha*")
+(define-method get_loop
+  (of-object "ClutterScore")
+  (c-name "clutter_score_get_loop")
+  (return-type "gboolean")
+)
+
+(define-method append
+  (of-object "ClutterScore")
+  (c-name "clutter_score_append")
+  (return-type "gulong")
   (parameters
-    '("ClutterAnimationMode" "mode")
+    '("ClutterTimeline*" "parent")
+    '("ClutterTimeline*" "timeline")
   )
 )
 
-(define-method get_alpha
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_get_alpha")
-  (return-type "guint32")
+(define-method append_at_marker
+  (of-object "ClutterScore")
+  (c-name "clutter_score_append_at_marker")
+  (return-type "gulong")
+  (parameters
+    '("ClutterTimeline*" "parent")
+    '("const-gchar*" "marker_name")
+    '("ClutterTimeline*" "timeline")
+  )
 )
 
-(define-method set_func
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_set_func")
+(define-method remove
+  (of-object "ClutterScore")
+  (c-name "clutter_score_remove")
   (return-type "none")
   (parameters
-    '("ClutterAlphaFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "destroy")
+    '("gulong" "id")
   )
 )
 
-(define-method set_closure
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_set_closure")
+(define-method remove_all
+  (of-object "ClutterScore")
+  (c-name "clutter_score_remove_all")
   (return-type "none")
+)
+
+(define-method get_timeline
+  (of-object "ClutterScore")
+  (c-name "clutter_score_get_timeline")
+  (return-type "ClutterTimeline*")
   (parameters
-    '("GClosure*" "closure")
+    '("gulong" "id")
   )
 )
 
-(define-method set_timeline
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_set_timeline")
+(define-method list_timelines
+  (of-object "ClutterScore")
+  (c-name "clutter_score_list_timelines")
+  (return-type "GSList*")
+)
+
+(define-method start
+  (of-object "ClutterScore")
+  (c-name "clutter_score_start")
   (return-type "none")
-  (parameters
-    '("ClutterTimeline*" "timeline")
-  )
 )
 
-(define-method get_timeline
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_get_timeline")
-  (return-type "ClutterTimeline*")
+(define-method stop
+  (of-object "ClutterScore")
+  (c-name "clutter_score_stop")
+  (return-type "none")
 )
 
-(define-method set_mode
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_set_mode")
+(define-method pause
+  (of-object "ClutterScore")
+  (c-name "clutter_score_pause")
   (return-type "none")
-  (parameters
-    '("ClutterAnimationMode" "mode")
-  )
 )
 
-(define-method get_mode
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_get_mode")
-  (return-type "ClutterAnimationMode")
+(define-method rewind
+  (of-object "ClutterScore")
+  (c-name "clutter_score_rewind")
+  (return-type "none")
 )
 
-(define-function clutter_ramp_inc_func
-  (c-name "clutter_ramp_inc_func")
-  (return-type "guint32")
+(define-method is_playing
+  (of-object "ClutterScore")
+  (c-name "clutter_score_is_playing")
+  (return-type "gboolean")
+)
+
+
+
+;; From clutter-effect.h
+
+(define-function clutter_effect_template_get_type
+  (c-name "clutter_effect_template_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_effect_template_new
+  (c-name "clutter_effect_template_new")
+  (is-constructor-of "ClutterEffectTemplate")
+  (return-type "ClutterEffectTemplate*")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterTimeline*" "timeline")
+    '("ClutterAlphaFunc" "alpha_func")
   )
 )
 
-(define-function clutter_ramp_dec_func
-  (c-name "clutter_ramp_dec_func")
-  (return-type "guint32")
+(define-function clutter_effect_template_new_full
+  (c-name "clutter_effect_template_new_full")
+  (return-type "ClutterEffectTemplate*")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterTimeline*" "timeline")
+    '("ClutterAlphaFunc" "alpha_func")
+    '("gpointer" "user_data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-function clutter_ramp_func
-  (c-name "clutter_ramp_func")
-  (return-type "guint32")
+(define-function clutter_effect_template_new_for_duration
+  (c-name "clutter_effect_template_new_for_duration")
+  (return-type "ClutterEffectTemplate*")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("guint" "msecs")
+    '("ClutterAlphaFunc" "alpha_func")
   )
 )
 
-(define-function clutter_sine_func
-  (c-name "clutter_sine_func")
-  (return-type "guint32")
+(define-method construct
+  (of-object "ClutterEffectTemplate")
+  (c-name "clutter_effect_template_construct")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterTimeline*" "timeline")
+    '("ClutterAlphaFunc" "alpha_func")
+    '("gpointer" "user_data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-function clutter_sine_inc_func
-  (c-name "clutter_sine_inc_func")
-  (return-type "guint32")
+(define-method set_timeline_clone
+  (of-object "ClutterEffectTemplate")
+  (c-name "clutter_effect_template_set_timeline_clone")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("gboolean" "setting")
   )
 )
 
-(define-function clutter_sine_dec_func
-  (c-name "clutter_sine_dec_func")
-  (return-type "guint32")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
-  )
+(define-method get_timeline_clone
+  (of-object "ClutterEffectTemplate")
+  (c-name "clutter_effect_template_get_timeline_clone")
+  (return-type "gboolean")
 )
 
-(define-function clutter_sine_half_func
-  (c-name "clutter_sine_half_func")
-  (return-type "guint32")
+(define-function clutter_effect_fade
+  (c-name "clutter_effect_fade")
+  (return-type "ClutterTimeline*")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterEffectTemplate*" "template_")
+    '("ClutterActor*" "actor")
+    '("guint8" "opacity_end")
+    '("ClutterEffectCompleteFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-function clutter_sine_in_func
-  (c-name "clutter_sine_in_func")
-  (return-type "guint32")
+(define-function clutter_effect_depth
+  (c-name "clutter_effect_depth")
+  (return-type "ClutterTimeline*")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterEffectTemplate*" "template_")
+    '("ClutterActor*" "actor")
+    '("gint" "depth_end")
+    '("ClutterEffectCompleteFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-function clutter_sine_out_func
-  (c-name "clutter_sine_out_func")
-  (return-type "guint32")
+(define-function clutter_effect_move
+  (c-name "clutter_effect_move")
+  (return-type "ClutterTimeline*")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterEffectTemplate*" "template_")
+    '("ClutterActor*" "actor")
+    '("gint" "x")
+    '("gint" "y")
+    '("ClutterEffectCompleteFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-function clutter_sine_in_out_func
-  (c-name "clutter_sine_in_out_func")
-  (return-type "guint32")
+(define-function clutter_effect_path
+  (c-name "clutter_effect_path")
+  (return-type "ClutterTimeline*")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterEffectTemplate*" "template_")
+    '("ClutterActor*" "actor")
+    '("const-ClutterKnot*" "knots")
+    '("guint" "n_knots")
+    '("ClutterEffectCompleteFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-function clutter_square_func
-  (c-name "clutter_square_func")
-  (return-type "guint32")
+(define-function clutter_effect_scale
+  (c-name "clutter_effect_scale")
+  (return-type "ClutterTimeline*")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterEffectTemplate*" "template_")
+    '("ClutterActor*" "actor")
+    '("gdouble" "x_scale_end")
+    '("gdouble" "y_scale_end")
+    '("ClutterEffectCompleteFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-function clutter_smoothstep_inc_func
-  (c-name "clutter_smoothstep_inc_func")
-  (return-type "guint32")
+(define-function clutter_effect_rotate
+  (c-name "clutter_effect_rotate")
+  (return-type "ClutterTimeline*")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterEffectTemplate*" "template_")
+    '("ClutterActor*" "actor")
+    '("ClutterRotateAxis" "axis")
+    '("gdouble" "angle")
+    '("gint" "center_x")
+    '("gint" "center_y")
+    '("gint" "center_z")
+    '("ClutterRotateDirection" "direction")
+    '("ClutterEffectCompleteFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-function clutter_smoothstep_dec_func
-  (c-name "clutter_smoothstep_dec_func")
-  (return-type "guint32")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
-  )
+
+
+;; From clutter-group.h
+
+(define-function clutter_group_get_type
+  (c-name "clutter_group_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_exp_inc_func
-  (c-name "clutter_exp_inc_func")
-  (return-type "guint32")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
-  )
+(define-function clutter_group_new
+  (c-name "clutter_group_new")
+  (is-constructor-of "ClutterGroup")
+  (return-type "ClutterActor*")
 )
 
-(define-function clutter_exp_dec_func
-  (c-name "clutter_exp_dec_func")
-  (return-type "guint32")
+(define-method get_nth_child
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_get_nth_child")
+  (return-type "ClutterActor*")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("gint" "index_")
   )
 )
 
-(define-function clutter_ease_in_func
-  (c-name "clutter_ease_in_func")
-  (return-type "guint32")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
-  )
+(define-method get_n_children
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_get_n_children")
+  (return-type "gint")
 )
 
-(define-function clutter_ease_out_func
-  (c-name "clutter_ease_out_func")
-  (return-type "guint32")
+(define-method remove_all
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_remove_all")
+  (return-type "none")
+)
+
+(define-method add_many
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_add_many")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterActor*" "first_actor")
   )
+  (varargs #t)
 )
 
-(define-function clutter_ease_in_out_func
-  (c-name "clutter_ease_in_out_func")
-  (return-type "guint32")
+(define-method add_many_valist
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_add_many_valist")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterActor*" "first_actor")
+    '("va_list" "var_args")
   )
 )
 
-(define-function clutter_exp_in_func
-  (c-name "clutter_exp_in_func")
-  (return-type "guint32")
+(define-method remove
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_remove")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-function clutter_exp_out_func
-  (c-name "clutter_exp_out_func")
-  (return-type "guint32")
+(define-method raise
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_raise")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterActor*" "actor")
+    '("ClutterActor*" "sibling")
   )
 )
 
-(define-function clutter_exp_in_out_func
-  (c-name "clutter_exp_in_out_func")
-  (return-type "guint32")
+(define-method lower
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_lower")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterActor*" "actor")
+    '("ClutterActor*" "sibling")
   )
 )
 
-
-
-;; From clutter-deprecated.h
+(define-method sort_depth_order
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_sort_depth_order")
+  (return-type "none")
+)
 
 
 
-;; From clutter-actor.h
+;; From clutter-units.h
 
-(define-function clutter_actor_box_get_type
-  (c-name "clutter_actor_box_get_type")
+(define-function clutter_unit_get_type
+  (c-name "clutter_unit_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_actor_get_type
-  (c-name "clutter_actor_get_type")
+(define-function clutter_param_unit_get_type
+  (c-name "clutter_param_unit_get_type")
   (return-type "GType")
 )
 
-(define-method show
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_show")
-  (return-type "none")
-)
-
-(define-method show_all
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_show_all")
+(define-function clutter_value_set_unit
+  (c-name "clutter_value_set_unit")
   (return-type "none")
+  (parameters
+    '("GValue*" "value")
+    '("ClutterUnit" "units")
+  )
 )
 
-(define-method hide
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_hide")
-  (return-type "none")
+(define-function clutter_value_get_unit
+  (c-name "clutter_value_get_unit")
+  (return-type "ClutterUnit")
+  (parameters
+    '("const-GValue*" "value")
+  )
 )
 
-(define-method hide_all
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_hide_all")
-  (return-type "none")
+(define-function clutter_param_spec_unit
+  (c-name "clutter_param_spec_unit")
+  (return-type "GParamSpec*")
+  (parameters
+    '("const-gchar*" "name")
+    '("const-gchar*" "nick")
+    '("const-gchar*" "blurb")
+    '("ClutterUnit" "minimum")
+    '("ClutterUnit" "maximum")
+    '("ClutterUnit" "default_value")
+    '("GParamFlags" "flags")
+  )
 )
 
-(define-method realize
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_realize")
-  (return-type "none")
-)
 
-(define-method unrealize
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_unrealize")
-  (return-type "none")
-)
 
-(define-method paint
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_paint")
-  (return-type "none")
-)
+;; From clutter-texture.h
 
-(define-method pick
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_pick")
-  (return-type "none")
-  (parameters
-    '("const-ClutterColor*" "color")
-  )
+(define-function clutter_texture_error_quark
+  (c-name "clutter_texture_error_quark")
+  (return-type "GQuark")
 )
 
-(define-method queue_redraw
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_queue_redraw")
-  (return-type "none")
+(define-function clutter_texture_get_type
+  (c-name "clutter_texture_get_type")
+  (return-type "GType")
 )
 
-(define-method queue_relayout
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_queue_relayout")
-  (return-type "none")
+(define-function clutter_texture_handle_get_type
+  (c-name "clutter_texture_handle_get_type")
+  (return-type "GType")
 )
 
-(define-method destroy
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_destroy")
-  (return-type "none")
+(define-function clutter_texture_new
+  (c-name "clutter_texture_new")
+  (is-constructor-of "ClutterTexture")
+  (return-type "ClutterActor*")
 )
 
-(define-method get_preferred_width
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_preferred_width")
-  (return-type "none")
+(define-function clutter_texture_new_from_file
+  (c-name "clutter_texture_new_from_file")
+  (return-type "ClutterActor*")
   (parameters
-    '("ClutterUnit" "for_height")
-    '("ClutterUnit*" "min_width_p")
-    '("ClutterUnit*" "natural_width_p")
+    '("const-gchar*" "filename")
+    '("GError**" "error")
   )
 )
 
-(define-method get_preferred_height
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_preferred_height")
-  (return-type "none")
+(define-function clutter_texture_new_from_actor
+  (c-name "clutter_texture_new_from_actor")
+  (return-type "ClutterActor*")
   (parameters
-    '("ClutterUnit" "for_width")
-    '("ClutterUnit*" "min_height_p")
-    '("ClutterUnit*" "natural_height_p")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method get_preferred_size
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_preferred_size")
-  (return-type "none")
+(define-method set_from_file
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_from_file")
+  (return-type "gboolean")
   (parameters
-    '("ClutterUnit*" "min_width_p")
-    '("ClutterUnit*" "min_height_p")
-    '("ClutterUnit*" "natural_width_p")
-    '("ClutterUnit*" "natural_height_p")
+    '("const-gchar*" "filename")
+    '("GError**" "error")
   )
 )
 
-(define-method allocate
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_allocate")
-  (return-type "none")
+(define-method set_from_rgb_data
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_from_rgb_data")
+  (return-type "gboolean")
   (parameters
-    '("const-ClutterActorBox*" "box")
-    '("gboolean" "absolute_origin_changed")
+    '("const-guchar*" "data")
+    '("gboolean" "has_alpha")
+    '("gint" "width")
+    '("gint" "height")
+    '("gint" "rowstride")
+    '("gint" "bpp")
+    '("ClutterTextureFlags" "flags")
+    '("GError**" "error")
   )
 )
 
-(define-method allocate_preferred_size
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_allocate_preferred_size")
-  (return-type "none")
+(define-method set_from_yuv_data
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_from_yuv_data")
+  (return-type "gboolean")
   (parameters
-    '("gboolean" "absolute_origin_changed")
+    '("const-guchar*" "data")
+    '("gint" "width")
+    '("gint" "height")
+    '("ClutterTextureFlags" "flags")
+    '("GError**" "error")
   )
 )
 
-(define-method get_allocation_coords
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_allocation_coords")
-  (return-type "none")
+(define-method set_area_from_rgb_data
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_area_from_rgb_data")
+  (return-type "gboolean")
   (parameters
-    '("gint*" "x_1")
-    '("gint*" "y_1")
-    '("gint*" "x_2")
-    '("gint*" "y_2")
+    '("const-guchar*" "data")
+    '("gboolean" "has_alpha")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
+    '("gint" "rowstride")
+    '("gint" "bpp")
+    '("ClutterTextureFlags" "flags")
+    '("GError**" "error")
   )
 )
 
-(define-method get_allocation_box
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_allocation_box")
+(define-method get_base_size
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_base_size")
   (return-type "none")
   (parameters
-    '("ClutterActorBox*" "box")
+    '("gint*" "width")
+    '("gint*" "height")
   )
 )
 
-(define-method get_allocation_geometry
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_allocation_geometry")
+(define-method set_filter_quality
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_filter_quality")
   (return-type "none")
   (parameters
-    '("ClutterGeometry*" "geom")
+    '("ClutterTextureQuality" "filter_quality")
   )
 )
 
-(define-method get_allocation_vertices
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_allocation_vertices")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "ancestor")
-    '("ClutterVertex" "verts[4]")
-  )
+(define-method get_filter_quality
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_filter_quality")
+  (return-type "ClutterTextureQuality")
 )
 
-(define-method set_geometry
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_geometry")
+(define-method set_max_tile_waste
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_max_tile_waste")
   (return-type "none")
   (parameters
-    '("const-ClutterGeometry*" "geometry")
+    '("gint" "max_tile_waste")
   )
 )
 
-(define-method get_geometry
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_geometry")
+(define-method get_max_tile_waste
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_max_tile_waste")
+  (return-type "gint")
+)
+
+(define-method get_cogl_texture
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_cogl_texture")
+  (return-type "CoglHandle")
+)
+
+(define-method set_cogl_texture
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_cogl_texture")
   (return-type "none")
   (parameters
-    '("ClutterGeometry*" "geometry")
+    '("CoglHandle" "cogl_tex")
   )
 )
 
-(define-method set_size
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_size")
+
+
+;; From clutter-behaviour.h
+
+(define-function clutter_behaviour_get_type
+  (c-name "clutter_behaviour_get_type")
+  (return-type "GType")
+)
+
+(define-method apply
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_apply")
   (return-type "none")
   (parameters
-    '("gint" "width")
-    '("gint" "height")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method set_sizeu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_sizeu")
+(define-method remove
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_remove")
   (return-type "none")
   (parameters
-    '("ClutterUnit" "width")
-    '("ClutterUnit" "height")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method get_size
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_size")
+(define-method remove_all
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_remove_all")
   (return-type "none")
-  (parameters
-    '("guint*" "width")
-    '("guint*" "height")
-  )
 )
 
-(define-method get_sizeu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_sizeu")
+(define-method actors_foreach
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_actors_foreach")
   (return-type "none")
   (parameters
-    '("ClutterUnit*" "width")
-    '("ClutterUnit*" "height")
+    '("ClutterBehaviourForeachFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-method get_transformed_size
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_transformed_size")
-  (return-type "none")
-  (parameters
-    '("guint*" "width")
-    '("guint*" "height")
-  )
+(define-method get_n_actors
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_n_actors")
+  (return-type "gint")
 )
 
-(define-method get_transformed_sizeu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_transformed_sizeu")
-  (return-type "none")
+(define-method get_nth_actor
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_nth_actor")
+  (return-type "ClutterActor*")
   (parameters
-    '("ClutterUnit*" "width")
-    '("ClutterUnit*" "height")
+    '("gint" "index_")
   )
 )
 
-(define-method set_position
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_position")
-  (return-type "none")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-  )
+(define-method get_actors
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_actors")
+  (return-type "GSList*")
 )
 
-(define-method set_positionu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_positionu")
+(define-method get_alpha
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_alpha")
+  (return-type "ClutterAlpha*")
+)
+
+(define-method set_alpha
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_set_alpha")
   (return-type "none")
   (parameters
-    '("ClutterUnit" "x")
-    '("ClutterUnit" "y")
+    '("ClutterAlpha*" "alpha")
   )
 )
 
-(define-method get_position
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_position")
-  (return-type "none")
+(define-method is_applied
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_is_applied")
+  (return-type "gboolean")
   (parameters
-    '("gint*" "x")
-    '("gint*" "y")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method get_positionu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_positionu")
+
+
+;; From clutter-media.h
+
+(define-function clutter_media_get_type
+  (c-name "clutter_media_get_type")
+  (return-type "GType")
+)
+
+(define-method set_uri
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_uri")
   (return-type "none")
   (parameters
-    '("ClutterUnit*" "x")
-    '("ClutterUnit*" "y")
+    '("const-char*" "uri")
   )
 )
 
-(define-method get_transformed_position
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_transformed_position")
+(define-method get_uri
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_uri")
+  (return-type "const-char*")
+)
+
+(define-method set_playing
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_playing")
   (return-type "none")
   (parameters
-    '("gint*" "x")
-    '("gint*" "y")
+    '("gboolean" "playing")
   )
 )
 
-(define-method get_transformed_positionu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_transformed_positionu")
+(define-method get_playing
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_playing")
+  (return-type "gboolean")
+)
+
+(define-method set_position
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_position")
   (return-type "none")
   (parameters
-    '("ClutterUnit*" "x")
-    '("ClutterUnit*" "y")
+    '("int" "position")
   )
 )
 
-(define-method get_fixed_position_set
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_fixed_position_set")
-  (return-type "gboolean")
+(define-method get_position
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_position")
+  (return-type "int")
 )
 
-(define-method set_fixed_position_set
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_fixed_position_set")
+(define-method set_volume
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_volume")
   (return-type "none")
   (parameters
-    '("gboolean" "is_set")
+    '("double" "volume")
   )
 )
 
-(define-method get_width
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_width")
-  (return-type "guint")
+(define-method get_volume
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_volume")
+  (return-type "double")
 )
 
-(define-method get_widthu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_widthu")
-  (return-type "ClutterUnit")
+(define-method get_can_seek
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_can_seek")
+  (return-type "gboolean")
 )
 
-(define-method get_height
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_height")
-  (return-type "guint")
+(define-method get_buffer_percent
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_buffer_percent")
+  (return-type "int")
 )
 
-(define-method get_heightu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_heightu")
-  (return-type "ClutterUnit")
+(define-method get_duration
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_duration")
+  (return-type "int")
 )
 
-(define-method set_width
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_width")
+(define-method set_filename
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_filename")
   (return-type "none")
   (parameters
-    '("guint" "width")
+    '("const-gchar*" "filename")
   )
 )
 
-(define-method set_widthu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_widthu")
-  (return-type "none")
+
+
+;; From clutter-script.h
+
+(define-function clutter_script_error_quark
+  (c-name "clutter_script_error_quark")
+  (return-type "GQuark")
+)
+
+(define-function clutter_script_get_type
+  (c-name "clutter_script_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_script_new
+  (c-name "clutter_script_new")
+  (is-constructor-of "ClutterScript")
+  (return-type "ClutterScript*")
+)
+
+(define-method load_from_file
+  (of-object "ClutterScript")
+  (c-name "clutter_script_load_from_file")
+  (return-type "guint")
   (parameters
-    '("ClutterUnit" "width")
+    '("const-gchar*" "filename")
+    '("GError**" "error")
   )
 )
 
-(define-method set_height
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_height")
-  (return-type "none")
+(define-method load_from_data
+  (of-object "ClutterScript")
+  (c-name "clutter_script_load_from_data")
+  (return-type "guint")
   (parameters
-    '("guint" "height")
+    '("const-gchar*" "data")
+    '("gssize" "length")
+    '("GError**" "error")
   )
 )
 
-(define-method set_heightu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_heightu")
-  (return-type "none")
+(define-method get_object
+  (of-object "ClutterScript")
+  (c-name "clutter_script_get_object")
+  (return-type "GObject*")
   (parameters
-    '("ClutterUnit" "height")
+    '("const-gchar*" "name")
   )
 )
 
-(define-method get_x
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_x")
+(define-method get_objects
+  (of-object "ClutterScript")
+  (c-name "clutter_script_get_objects")
   (return-type "gint")
+  (parameters
+    '("const-gchar*" "first_name")
+  )
+  (varargs #t)
 )
 
-(define-method get_xu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_xu")
-  (return-type "ClutterUnit")
+(define-method list_objects
+  (of-object "ClutterScript")
+  (c-name "clutter_script_list_objects")
+  (return-type "GList*")
 )
 
-(define-method get_y
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_y")
-  (return-type "gint")
+(define-method unmerge_objects
+  (of-object "ClutterScript")
+  (c-name "clutter_script_unmerge_objects")
+  (return-type "none")
+  (parameters
+    '("guint" "merge_id")
+  )
 )
 
-(define-method get_yu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_yu")
-  (return-type "ClutterUnit")
+(define-method ensure_objects
+  (of-object "ClutterScript")
+  (c-name "clutter_script_ensure_objects")
+  (return-type "none")
 )
 
-(define-method set_x
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_x")
-  (return-type "none")
+(define-method get_type_from_name
+  (of-object "ClutterScript")
+  (c-name "clutter_script_get_type_from_name")
+  (return-type "GType")
   (parameters
-    '("gint" "x")
+    '("const-gchar*" "type_name")
   )
 )
 
-(define-method set_xu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_xu")
-  (return-type "none")
+(define-function clutter_get_script_id
+  (c-name "clutter_get_script_id")
+  (return-type "const-gchar*")
   (parameters
-    '("ClutterUnit" "x")
+    '("GObject*" "gobject")
   )
 )
 
-(define-method set_y
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_y")
+(define-method connect_signals
+  (of-object "ClutterScript")
+  (c-name "clutter_script_connect_signals")
   (return-type "none")
   (parameters
-    '("gint" "y")
+    '("gpointer" "user_data")
   )
 )
 
-(define-method set_yu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_yu")
+(define-method connect_signals_full
+  (of-object "ClutterScript")
+  (c-name "clutter_script_connect_signals_full")
   (return-type "none")
   (parameters
-    '("ClutterUnit" "y")
+    '("ClutterScriptConnectFunc" "func")
+    '("gpointer" "user_data")
   )
 )
 
-(define-method set_rotation
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_rotation")
+(define-method add_search_paths
+  (of-object "ClutterScript")
+  (c-name "clutter_script_add_search_paths")
   (return-type "none")
   (parameters
-    '("ClutterRotateAxis" "axis")
-    '("gdouble" "angle")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "z")
+    '("const-gchar*-const[]" "paths")
+    '("gsize" "n_paths")
   )
 )
 
-(define-method set_rotationx
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_rotationx")
-  (return-type "none")
+(define-method lookup_filename
+  (of-object "ClutterScript")
+  (c-name "clutter_script_lookup_filename")
+  (return-type "gchar*")
   (parameters
-    '("ClutterRotateAxis" "axis")
-    '("ClutterFixed" "angle")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "z")
+    '("const-gchar*" "filename")
   )
 )
 
-(define-method set_rotationu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_rotationu")
-  (return-type "none")
+
+
+;; From clutter-behaviour-rotate.h
+
+(define-function clutter_behaviour_rotate_get_type
+  (c-name "clutter_behaviour_rotate_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_behaviour_rotate_new
+  (c-name "clutter_behaviour_rotate_new")
+  (is-constructor-of "ClutterBehaviourRotate")
+  (return-type "ClutterBehaviour*")
   (parameters
+    '("ClutterAlpha*" "alpha")
     '("ClutterRotateAxis" "axis")
-    '("gdouble" "angle")
-    '("ClutterUnit" "x")
-    '("ClutterUnit" "y")
-    '("ClutterUnit" "z")
+    '("ClutterRotateDirection" "direction")
+    '("gdouble" "angle_start")
+    '("gdouble" "angle_end")
   )
 )
 
-(define-method get_rotation
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_rotation")
-  (return-type "gdouble")
+(define-function clutter_behaviour_rotate_newx
+  (c-name "clutter_behaviour_rotate_newx")
+  (return-type "ClutterBehaviour*")
   (parameters
+    '("ClutterAlpha*" "alpha")
     '("ClutterRotateAxis" "axis")
-    '("gint*" "x")
-    '("gint*" "y")
-    '("gint*" "z")
+    '("ClutterRotateDirection" "direction")
+    '("ClutterFixed" "angle_start")
+    '("ClutterFixed" "angle_end")
   )
 )
 
-(define-method get_rotationx
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_rotationx")
-  (return-type "ClutterFixed")
+(define-method get_center
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_get_center")
+  (return-type "none")
   (parameters
-    '("ClutterRotateAxis" "axis")
     '("gint*" "x")
     '("gint*" "y")
     '("gint*" "z")
   )
 )
 
-(define-method get_rotationu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_rotationu")
-  (return-type "gdouble")
-  (parameters
-    '("ClutterRotateAxis" "axis")
-    '("ClutterUnit*" "x")
-    '("ClutterUnit*" "y")
-    '("ClutterUnit*" "z")
-  )
-)
-
-(define-method set_opacity
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_opacity")
+(define-method set_center
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_set_center")
   (return-type "none")
   (parameters
-    '("guint8" "opacity")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "z")
   )
 )
 
-(define-method get_opacity
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_opacity")
-  (return-type "guint8")
-)
-
-(define-method get_paint_opacity
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_paint_opacity")
-  (return-type "guint8")
+(define-method get_axis
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_get_axis")
+  (return-type "ClutterRotateAxis")
 )
 
-(define-method set_name
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_name")
+(define-method set_axis
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_set_axis")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("ClutterRotateAxis" "axis")
   )
 )
 
-(define-method get_name
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_name")
-  (return-type "const-gchar*")
-)
-
-(define-method get_gid
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_gid")
-  (return-type "guint32")
+(define-method get_direction
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_get_direction")
+  (return-type "ClutterRotateDirection")
 )
 
-(define-method set_clip
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_clip")
+(define-method set_direction
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_set_direction")
   (return-type "none")
   (parameters
-    '("gint" "xoff")
-    '("gint" "yoff")
-    '("gint" "width")
-    '("gint" "height")
+    '("ClutterRotateDirection" "direction")
   )
 )
 
-(define-method set_clipu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_clipu")
+(define-method get_bounds
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_get_bounds")
   (return-type "none")
   (parameters
-    '("ClutterUnit" "xoff")
-    '("ClutterUnit" "yoff")
-    '("ClutterUnit" "width")
-    '("ClutterUnit" "height")
+    '("gdouble*" "angle_start")
+    '("gdouble*" "angle_end")
   )
 )
 
-(define-method remove_clip
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_remove_clip")
-  (return-type "none")
-)
-
-(define-method has_clip
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_has_clip")
-  (return-type "gboolean")
-)
-
-(define-method get_clip
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_clip")
+(define-method set_bounds
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_set_bounds")
   (return-type "none")
   (parameters
-    '("gint*" "xoff")
-    '("gint*" "yoff")
-    '("gint*" "width")
-    '("gint*" "height")
+    '("gdouble" "angle_start")
+    '("gdouble" "angle_end")
   )
 )
 
-(define-method get_clipu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_clipu")
+(define-method get_boundsx
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_get_boundsx")
   (return-type "none")
   (parameters
-    '("ClutterUnit*" "xoff")
-    '("ClutterUnit*" "yoff")
-    '("ClutterUnit*" "width")
-    '("ClutterUnit*" "height")
+    '("ClutterFixed*" "angle_start")
+    '("ClutterFixed*" "angle_end")
   )
 )
 
-(define-method set_parent
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_parent")
+(define-method set_boundsx
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_set_boundsx")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "parent")
+    '("ClutterFixed" "angle_start")
+    '("ClutterFixed" "angle_end")
   )
 )
 
-(define-method get_parent
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_parent")
-  (return-type "ClutterActor*")
+
+
+;; From clutter-scriptable.h
+
+(define-function clutter_scriptable_get_type
+  (c-name "clutter_scriptable_get_type")
+  (return-type "GType")
 )
 
-(define-method reparent
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_reparent")
+(define-method set_id
+  (of-object "ClutterScriptable")
+  (c-name "clutter_scriptable_set_id")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "new_parent")
+    '("const-gchar*" "id")
   )
 )
 
-(define-method unparent
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_unparent")
-  (return-type "none")
-)
-
-(define-method get_stage
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_stage")
-  (return-type "ClutterActor*")
+(define-method get_id
+  (of-object "ClutterScriptable")
+  (c-name "clutter_scriptable_get_id")
+  (return-type "const-gchar*")
 )
 
-(define-method raise
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_raise")
-  (return-type "none")
+(define-method parse_custom_node
+  (of-object "ClutterScriptable")
+  (c-name "clutter_scriptable_parse_custom_node")
+  (return-type "gboolean")
   (parameters
-    '("ClutterActor*" "below")
+    '("ClutterScript*" "script")
+    '("GValue*" "value")
+    '("const-gchar*" "name")
+    '("JsonNode*" "node")
   )
 )
 
-(define-method lower
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_lower")
+(define-method set_custom_property
+  (of-object "ClutterScriptable")
+  (c-name "clutter_scriptable_set_custom_property")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "above")
+    '("ClutterScript*" "script")
+    '("const-gchar*" "name")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method raise_top
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_raise_top")
-  (return-type "none")
-)
 
-(define-method lower_bottom
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_lower_bottom")
-  (return-type "none")
+
+;; From clutter-behaviour-opacity.h
+
+(define-function clutter_behaviour_opacity_get_type
+  (c-name "clutter_behaviour_opacity_get_type")
+  (return-type "GType")
 )
 
-(define-method set_depth
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_depth")
-  (return-type "none")
+(define-function clutter_behaviour_opacity_new
+  (c-name "clutter_behaviour_opacity_new")
+  (is-constructor-of "ClutterBehaviourOpacity")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("gint" "depth")
+    '("ClutterAlpha*" "alpha")
+    '("guint8" "opacity_start")
+    '("guint8" "opacity_end")
   )
 )
 
-(define-method get_depth
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_depth")
-  (return-type "gint")
+(define-method set_bounds
+  (of-object "ClutterBehaviourOpacity")
+  (c-name "clutter_behaviour_opacity_set_bounds")
+  (return-type "none")
+  (parameters
+    '("guint8" "opacity_start")
+    '("guint8" "opacity_end")
+  )
 )
 
-(define-method set_depthu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_depthu")
+(define-method get_bounds
+  (of-object "ClutterBehaviourOpacity")
+  (c-name "clutter_behaviour_opacity_get_bounds")
   (return-type "none")
   (parameters
-    '("ClutterUnit" "depth")
+    '("guint8*" "opacity_start")
+    '("guint8*" "opacity_end")
   )
 )
 
-(define-method get_depthu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_depthu")
-  (return-type "ClutterUnit")
+
+
+;; From clutter.h
+
+
+
+;; From clutter-behaviour-path.h
+
+(define-function clutter_behaviour_path_get_type
+  (c-name "clutter_behaviour_path_get_type")
+  (return-type "GType")
 )
 
-(define-method set_scalex
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_scalex")
-  (return-type "none")
+(define-function clutter_behaviour_path_new
+  (c-name "clutter_behaviour_path_new")
+  (is-constructor-of "ClutterBehaviourPath")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("ClutterFixed" "scale_x")
-    '("ClutterFixed" "scale_y")
+    '("ClutterAlpha*" "alpha")
+    '("ClutterPath*" "path")
   )
 )
 
-(define-method set_scale
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_scale")
-  (return-type "none")
+(define-function clutter_behaviour_path_new_with_description
+  (c-name "clutter_behaviour_path_new_with_description")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("gdouble" "scale_x")
-    '("gdouble" "scale_y")
+    '("ClutterAlpha*" "alpha")
+    '("const-gchar*" "desc")
   )
 )
 
-(define-method get_scalex
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_scalex")
-  (return-type "none")
+(define-function clutter_behaviour_path_new_with_knots
+  (c-name "clutter_behaviour_path_new_with_knots")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("ClutterFixed*" "scale_x")
-    '("ClutterFixed*" "scale_y")
+    '("ClutterAlpha*" "alpha")
+    '("const-ClutterKnot*" "knots")
+    '("guint" "n_knots")
   )
 )
 
-(define-method get_scale
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_scale")
+(define-method set_path
+  (of-object "ClutterBehaviourPath")
+  (c-name "clutter_behaviour_path_set_path")
   (return-type "none")
   (parameters
-    '("gdouble*" "scale_x")
-    '("gdouble*" "scale_y")
+    '("ClutterPath*" "path")
   )
 )
 
-(define-method move_by
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_move_by")
-  (return-type "none")
-  (parameters
-    '("gint" "dx")
-    '("gint" "dy")
-  )
+(define-method get_path
+  (of-object "ClutterBehaviourPath")
+  (c-name "clutter_behaviour_path_get_path")
+  (return-type "ClutterPath*")
 )
 
-(define-method move_byu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_move_byu")
-  (return-type "none")
+
+
+;; From clutter-clone-texture.h
+
+(define-function clutter_clone_texture_get_type
+  (c-name "clutter_clone_texture_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_clone_texture_new
+  (c-name "clutter_clone_texture_new")
+  (is-constructor-of "ClutterCloneTexture")
+  (return-type "ClutterActor*")
   (parameters
-    '("ClutterUnit" "dx")
-    '("ClutterUnit" "dy")
+    '("ClutterTexture*" "texture")
   )
 )
 
-(define-method set_reactive
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_reactive")
+(define-method get_parent_texture
+  (of-object "ClutterCloneTexture")
+  (c-name "clutter_clone_texture_get_parent_texture")
+  (return-type "ClutterTexture*")
+)
+
+(define-method set_parent_texture
+  (of-object "ClutterCloneTexture")
+  (c-name "clutter_clone_texture_set_parent_texture")
   (return-type "none")
   (parameters
-    '("gboolean" "reactive")
+    '("ClutterTexture*" "texture")
   )
 )
 
-(define-method get_reactive
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_reactive")
-  (return-type "gboolean")
+
+
+;; From clutter-alpha.h
+
+(define-function clutter_alpha_get_type
+  (c-name "clutter_alpha_get_type")
+  (return-type "GType")
 )
 
-(define-method event
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_event")
-  (return-type "gboolean")
-  (parameters
-    '("ClutterEvent*" "event")
-    '("gboolean" "capture")
-  )
+(define-function clutter_alpha_new
+  (c-name "clutter_alpha_new")
+  (is-constructor-of "ClutterAlpha")
+  (return-type "ClutterAlpha*")
 )
 
-(define-function clutter_get_actor_by_gid
-  (c-name "clutter_get_actor_by_gid")
-  (return-type "ClutterActor*")
+(define-function clutter_alpha_new_full
+  (c-name "clutter_alpha_new_full")
+  (return-type "ClutterAlpha*")
   (parameters
-    '("guint32" "id")
+    '("ClutterTimeline*" "timeline")
+    '("ClutterAlphaFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "destroy")
   )
 )
 
-(define-method set_shader
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_shader")
-  (return-type "gboolean")
+(define-function clutter_alpha_new_for_mode
+  (c-name "clutter_alpha_new_for_mode")
+  (return-type "ClutterAlpha*")
   (parameters
-    '("ClutterShader*" "shader")
+    '("ClutterAnimationMode" "mode")
   )
 )
 
-(define-method get_shader
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_shader")
-  (return-type "ClutterShader*")
+(define-method get_alpha
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_get_alpha")
+  (return-type "guint32")
 )
 
-(define-method set_shader_param
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_shader_param")
+(define-method set_func
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_set_func")
   (return-type "none")
   (parameters
-    '("const-gchar*" "param")
-    '("const-GValue*" "value")
+    '("ClutterAlphaFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "destroy")
   )
 )
 
-(define-method set_shader_param_int
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_shader_param_int")
+(define-method set_closure
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_set_closure")
   (return-type "none")
   (parameters
-    '("const-gchar*" "param")
-    '("gint" "value")
+    '("GClosure*" "closure")
   )
 )
 
-(define-method set_shader_param_float
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_shader_param_float")
+(define-method set_timeline
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_set_timeline")
   (return-type "none")
   (parameters
-    '("const-gchar*" "param")
-    '("gfloat" "value")
+    '("ClutterTimeline*" "timeline")
   )
 )
 
-(define-method set_anchor_point
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_anchor_point")
-  (return-type "none")
-  (parameters
-    '("gint" "anchor_x")
-    '("gint" "anchor_y")
-  )
+(define-method get_timeline
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_get_timeline")
+  (return-type "ClutterTimeline*")
 )
 
-(define-method move_anchor_point
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_move_anchor_point")
+(define-method set_mode
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_set_mode")
   (return-type "none")
   (parameters
-    '("gint" "anchor_x")
-    '("gint" "anchor_y")
+    '("ClutterAnimationMode" "mode")
   )
 )
 
-(define-method get_anchor_point
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_anchor_point")
-  (return-type "none")
-  (parameters
-    '("gint*" "anchor_x")
-    '("gint*" "anchor_y")
-  )
+(define-method get_mode
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_get_mode")
+  (return-type "ClutterAnimationMode")
 )
 
-(define-method set_anchor_pointu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_anchor_pointu")
-  (return-type "none")
+(define-function clutter_ramp_inc_func
+  (c-name "clutter_ramp_inc_func")
+  (return-type "guint32")
   (parameters
-    '("ClutterUnit" "anchor_x")
-    '("ClutterUnit" "anchor_y")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
-(define-method move_anchor_pointu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_move_anchor_pointu")
-  (return-type "none")
+(define-function clutter_ramp_dec_func
+  (c-name "clutter_ramp_dec_func")
+  (return-type "guint32")
   (parameters
-    '("ClutterUnit" "anchor_x")
-    '("ClutterUnit" "anchor_y")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
-(define-method get_anchor_pointu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_anchor_pointu")
-  (return-type "none")
+(define-function clutter_ramp_func
+  (c-name "clutter_ramp_func")
+  (return-type "guint32")
   (parameters
-    '("ClutterUnit*" "anchor_x")
-    '("ClutterUnit*" "anchor_y")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
-(define-method set_anchor_point_from_gravity
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_anchor_point_from_gravity")
-  (return-type "none")
+(define-function clutter_sine_func
+  (c-name "clutter_sine_func")
+  (return-type "guint32")
   (parameters
-    '("ClutterGravity" "gravity")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
-(define-method move_anchor_point_from_gravity
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_move_anchor_point_from_gravity")
-  (return-type "none")
+(define-function clutter_sine_inc_func
+  (c-name "clutter_sine_inc_func")
+  (return-type "guint32")
   (parameters
-    '("ClutterGravity" "gravity")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
-(define-method transform_stage_point
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_transform_stage_point")
-  (return-type "gboolean")
+(define-function clutter_sine_dec_func
+  (c-name "clutter_sine_dec_func")
+  (return-type "guint32")
   (parameters
-    '("ClutterUnit" "x")
-    '("ClutterUnit" "y")
-    '("ClutterUnit*" "x_out")
-    '("ClutterUnit*" "y_out")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
-(define-method is_rotated
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_is_rotated")
-  (return-type "gboolean")
-)
-
-(define-method is_scaled
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_is_scaled")
-  (return-type "gboolean")
-)
-
-(define-method should_pick_paint
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_should_pick_paint")
-  (return-type "gboolean")
+(define-function clutter_sine_half_func
+  (c-name "clutter_sine_half_func")
+  (return-type "guint32")
+  (parameters
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
+  )
 )
 
-(define-function clutter_actor_box_get_from_vertices
-  (c-name "clutter_actor_box_get_from_vertices")
-  (return-type "none")
+(define-function clutter_sine_in_func
+  (c-name "clutter_sine_in_func")
+  (return-type "guint32")
   (parameters
-    '("ClutterVertex" "vtx[4]")
-    '("ClutterActorBox*" "box")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
-(define-method get_abs_allocation_vertices
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_abs_allocation_vertices")
-  (return-type "none")
+(define-function clutter_sine_out_func
+  (c-name "clutter_sine_out_func")
+  (return-type "guint32")
   (parameters
-    '("ClutterVertex" "verts[4]")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
-(define-method apply_transform_to_point
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_apply_transform_to_point")
-  (return-type "none")
+(define-function clutter_sine_in_out_func
+  (c-name "clutter_sine_in_out_func")
+  (return-type "guint32")
   (parameters
-    '("const-ClutterVertex*" "point")
-    '("ClutterVertex*" "vertex")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
-(define-method apply_relative_transform_to_point
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_apply_relative_transform_to_point")
-  (return-type "none")
+(define-function clutter_square_func
+  (c-name "clutter_square_func")
+  (return-type "guint32")
   (parameters
-    '("ClutterActor*" "ancestor")
-    '("const-ClutterVertex*" "point")
-    '("ClutterVertex*" "vertex")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
-(define-method get_paint_visibility
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_paint_visibility")
-  (return-type "gboolean")
+(define-function clutter_smoothstep_inc_func
+  (c-name "clutter_smoothstep_inc_func")
+  (return-type "guint32")
+  (parameters
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
+  )
 )
 
-
-
-;; From clutter-keysyms.h
-
-
-
-;; From clutter-rectangle.h
-
-(define-function clutter_rectangle_get_type
-  (c-name "clutter_rectangle_get_type")
-  (return-type "GType")
+(define-function clutter_smoothstep_dec_func
+  (c-name "clutter_smoothstep_dec_func")
+  (return-type "guint32")
+  (parameters
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
+  )
 )
 
-(define-function clutter_rectangle_new
-  (c-name "clutter_rectangle_new")
-  (is-constructor-of "ClutterRectangle")
-  (return-type "ClutterActor*")
+(define-function clutter_exp_inc_func
+  (c-name "clutter_exp_inc_func")
+  (return-type "guint32")
+  (parameters
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
+  )
 )
 
-(define-function clutter_rectangle_new_with_color
-  (c-name "clutter_rectangle_new_with_color")
-  (return-type "ClutterActor*")
+(define-function clutter_exp_dec_func
+  (c-name "clutter_exp_dec_func")
+  (return-type "guint32")
   (parameters
-    '("const-ClutterColor*" "color")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
-(define-method get_color
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_get_color")
-  (return-type "none")
+(define-function clutter_ease_in_func
+  (c-name "clutter_ease_in_func")
+  (return-type "guint32")
   (parameters
-    '("ClutterColor*" "color")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
-(define-method set_color
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_set_color")
-  (return-type "none")
+(define-function clutter_ease_out_func
+  (c-name "clutter_ease_out_func")
+  (return-type "guint32")
   (parameters
-    '("const-ClutterColor*" "color")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
-(define-method get_border_width
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_get_border_width")
-  (return-type "guint")
+(define-function clutter_ease_in_out_func
+  (c-name "clutter_ease_in_out_func")
+  (return-type "guint32")
+  (parameters
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
+  )
 )
 
-(define-method set_border_width
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_set_border_width")
-  (return-type "none")
+(define-function clutter_exp_in_func
+  (c-name "clutter_exp_in_func")
+  (return-type "guint32")
   (parameters
-    '("guint" "width")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
-(define-method get_border_color
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_get_border_color")
-  (return-type "none")
+(define-function clutter_exp_out_func
+  (c-name "clutter_exp_out_func")
+  (return-type "guint32")
   (parameters
-    '("ClutterColor*" "color")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
-(define-method set_border_color
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_set_border_color")
-  (return-type "none")
+(define-function clutter_exp_in_out_func
+  (c-name "clutter_exp_in_out_func")
+  (return-type "guint32")
   (parameters
-    '("const-ClutterColor*" "color")
+    '("ClutterAlpha*" "alpha")
+    '("gpointer" "dummy")
   )
 )
 
 
 
-;; From clutter-behaviour-scale.h
+;; From clutter-deprecated.h
 
-(define-function clutter_behaviour_scale_get_type
-  (c-name "clutter_behaviour_scale_get_type")
+
+
+;; From clutter-actor.h
+
+(define-function clutter_actor_box_get_type
+  (c-name "clutter_actor_box_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_behaviour_scale_new
-  (c-name "clutter_behaviour_scale_new")
-  (is-constructor-of "ClutterBehaviourScale")
-  (return-type "ClutterBehaviour*")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gdouble" "x_scale_start")
-    '("gdouble" "y_scale_start")
-    '("gdouble" "x_scale_end")
-    '("gdouble" "y_scale_end")
-  )
+(define-function clutter_actor_get_type
+  (c-name "clutter_actor_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_behaviour_scale_newx
-  (c-name "clutter_behaviour_scale_newx")
-  (return-type "ClutterBehaviour*")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("ClutterFixed" "x_scale_start")
-    '("ClutterFixed" "y_scale_start")
-    '("ClutterFixed" "x_scale_end")
-    '("ClutterFixed" "y_scale_end")
-  )
+(define-method show
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_show")
+  (return-type "none")
 )
 
-(define-method set_bounds
-  (of-object "ClutterBehaviourScale")
-  (c-name "clutter_behaviour_scale_set_bounds")
+(define-method show_all
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_show_all")
   (return-type "none")
-  (parameters
-    '("gdouble" "x_scale_start")
-    '("gdouble" "y_scale_start")
-    '("gdouble" "x_scale_end")
-    '("gdouble" "y_scale_end")
-  )
 )
 
-(define-method set_boundsx
-  (of-object "ClutterBehaviourScale")
-  (c-name "clutter_behaviour_scale_set_boundsx")
+(define-method hide
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_hide")
   (return-type "none")
-  (parameters
-    '("ClutterFixed" "x_scale_start")
-    '("ClutterFixed" "y_scale_start")
-    '("ClutterFixed" "x_scale_end")
-    '("ClutterFixed" "y_scale_end")
-  )
 )
 
-(define-method get_bounds
-  (of-object "ClutterBehaviourScale")
-  (c-name "clutter_behaviour_scale_get_bounds")
+(define-method hide_all
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_hide_all")
   (return-type "none")
-  (parameters
-    '("gdouble*" "x_scale_start")
-    '("gdouble*" "y_scale_start")
-    '("gdouble*" "x_scale_end")
-    '("gdouble*" "y_scale_end")
-  )
 )
 
-(define-method get_boundsx
-  (of-object "ClutterBehaviourScale")
-  (c-name "clutter_behaviour_scale_get_boundsx")
+(define-method realize
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_realize")
+  (return-type "none")
+)
+
+(define-method unrealize
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_unrealize")
+  (return-type "none")
+)
+
+(define-method paint
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_paint")
+  (return-type "none")
+)
+
+(define-method pick
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_pick")
   (return-type "none")
   (parameters
-    '("ClutterFixed*" "x_scale_start")
-    '("ClutterFixed*" "y_scale_start")
-    '("ClutterFixed*" "x_scale_end")
-    '("ClutterFixed*" "y_scale_end")
+    '("const-ClutterColor*" "color")
   )
 )
 
+(define-method queue_redraw
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_queue_redraw")
+  (return-type "none")
+)
 
+(define-method queue_relayout
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_queue_relayout")
+  (return-type "none")
+)
 
-;; From clutter-timeline.h
-
-(define-function clutter_timeline_get_type
-  (c-name "clutter_timeline_get_type")
-  (return-type "GType")
+(define-method destroy
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_destroy")
+  (return-type "none")
 )
 
-(define-function clutter_timeline_new
-  (c-name "clutter_timeline_new")
-  (is-constructor-of "ClutterTimeline")
-  (return-type "ClutterTimeline*")
+(define-method get_preferred_width
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_preferred_width")
+  (return-type "none")
   (parameters
-    '("guint" "n_frames")
-    '("guint" "fps")
+    '("ClutterUnit" "for_height")
+    '("ClutterUnit*" "min_width_p")
+    '("ClutterUnit*" "natural_width_p")
   )
 )
 
-(define-function clutter_timeline_new_for_duration
-  (c-name "clutter_timeline_new_for_duration")
-  (return-type "ClutterTimeline*")
+(define-method get_preferred_height
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_preferred_height")
+  (return-type "none")
   (parameters
-    '("guint" "msecs")
+    '("ClutterUnit" "for_width")
+    '("ClutterUnit*" "min_height_p")
+    '("ClutterUnit*" "natural_height_p")
   )
 )
 
-(define-method clone
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_clone")
-  (return-type "ClutterTimeline*")
-)
-
-(define-method get_duration
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_duration")
-  (return-type "guint")
-)
-
-(define-method set_duration
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_set_duration")
+(define-method get_preferred_size
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_preferred_size")
   (return-type "none")
   (parameters
-    '("guint" "msecs")
+    '("ClutterUnit*" "min_width_p")
+    '("ClutterUnit*" "min_height_p")
+    '("ClutterUnit*" "natural_width_p")
+    '("ClutterUnit*" "natural_height_p")
   )
 )
 
-(define-method get_speed
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_speed")
-  (return-type "guint")
+(define-method allocate
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_allocate")
+  (return-type "none")
+  (parameters
+    '("const-ClutterActorBox*" "box")
+    '("gboolean" "absolute_origin_changed")
+  )
 )
 
-(define-method set_speed
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_set_speed")
+(define-method allocate_preferred_size
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_allocate_preferred_size")
   (return-type "none")
   (parameters
-    '("guint" "fps")
+    '("gboolean" "absolute_origin_changed")
   )
 )
 
-(define-method get_direction
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_direction")
-  (return-type "ClutterTimelineDirection")
-)
-
-(define-method set_direction
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_set_direction")
+(define-method get_allocation_coords
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_allocation_coords")
   (return-type "none")
   (parameters
-    '("ClutterTimelineDirection" "direction")
+    '("gint*" "x_1")
+    '("gint*" "y_1")
+    '("gint*" "x_2")
+    '("gint*" "y_2")
   )
 )
 
-(define-method start
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_start")
+(define-method get_allocation_box
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_allocation_box")
   (return-type "none")
+  (parameters
+    '("ClutterActorBox*" "box")
+  )
 )
 
-(define-method pause
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_pause")
+(define-method get_allocation_geometry
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_allocation_geometry")
   (return-type "none")
+  (parameters
+    '("ClutterGeometry*" "geom")
+  )
 )
 
-(define-method stop
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_stop")
+(define-method get_allocation_vertices
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_allocation_vertices")
   (return-type "none")
+  (parameters
+    '("ClutterActor*" "ancestor")
+    '("ClutterVertex" "verts[4]")
+  )
 )
 
-(define-method set_loop
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_set_loop")
+(define-method set_geometry
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_geometry")
   (return-type "none")
   (parameters
-    '("gboolean" "loop")
+    '("const-ClutterGeometry*" "geometry")
   )
 )
 
-(define-method get_loop
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_loop")
-  (return-type "gboolean")
-)
-
-(define-method rewind
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_rewind")
+(define-method get_geometry
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_geometry")
   (return-type "none")
+  (parameters
+    '("ClutterGeometry*" "geometry")
+  )
 )
 
-(define-method skip
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_skip")
+(define-method set_size
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_size")
   (return-type "none")
   (parameters
-    '("guint" "n_frames")
+    '("gint" "width")
+    '("gint" "height")
   )
 )
 
-(define-method advance
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_advance")
+(define-method set_sizeu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_sizeu")
   (return-type "none")
   (parameters
-    '("guint" "frame_num")
+    '("ClutterUnit" "width")
+    '("ClutterUnit" "height")
   )
 )
 
-(define-method get_current_frame
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_current_frame")
-  (return-type "gint")
-)
-
-(define-method get_progress
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_progress")
-  (return-type "gdouble")
-)
-
-(define-method get_progressx
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_progressx")
-  (return-type "ClutterFixed")
-)
-
-(define-method set_n_frames
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_set_n_frames")
+(define-method get_size
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_size")
   (return-type "none")
   (parameters
-    '("guint" "n_frames")
+    '("guint*" "width")
+    '("guint*" "height")
   )
 )
 
-(define-method get_n_frames
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_n_frames")
-  (return-type "guint")
-)
-
-(define-method is_playing
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_is_playing")
-  (return-type "gboolean")
-)
-
-(define-method set_delay
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_set_delay")
+(define-method get_sizeu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_sizeu")
   (return-type "none")
   (parameters
-    '("guint" "msecs")
+    '("ClutterUnit*" "width")
+    '("ClutterUnit*" "height")
   )
 )
 
-(define-method get_delay
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_delay")
-  (return-type "guint")
-)
-
-(define-method get_delta
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_delta")
-  (return-type "guint")
+(define-method get_transformed_size
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_transformed_size")
+  (return-type "none")
   (parameters
-    '("guint*" "msecs")
+    '("guint*" "width")
+    '("guint*" "height")
   )
 )
 
-(define-method add_marker_at_frame
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_add_marker_at_frame")
+(define-method get_transformed_sizeu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_transformed_sizeu")
   (return-type "none")
   (parameters
-    '("const-gchar*" "marker_name")
-    '("guint" "frame_num")
+    '("ClutterUnit*" "width")
+    '("ClutterUnit*" "height")
   )
 )
 
-(define-method add_marker_at_time
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_add_marker_at_time")
+(define-method set_position
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_position")
   (return-type "none")
   (parameters
-    '("const-gchar*" "marker_name")
-    '("guint" "msecs")
+    '("gint" "x")
+    '("gint" "y")
   )
 )
 
-(define-method remove_marker
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_remove_marker")
+(define-method set_positionu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_positionu")
   (return-type "none")
   (parameters
-    '("const-gchar*" "marker_name")
+    '("ClutterUnit" "x")
+    '("ClutterUnit" "y")
   )
 )
 
-(define-method list_markers
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_list_markers")
-  (return-type "gchar**")
+(define-method get_position
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_position")
+  (return-type "none")
   (parameters
-    '("gint" "frame_num")
-    '("gsize*" "n_markers")
+    '("gint*" "x")
+    '("gint*" "y")
   )
 )
 
-(define-method has_marker
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_has_marker")
-  (return-type "gboolean")
+(define-method get_positionu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_positionu")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "marker_name")
+    '("ClutterUnit*" "x")
+    '("ClutterUnit*" "y")
   )
 )
 
-(define-method advance_to_marker
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_advance_to_marker")
+(define-method get_transformed_position
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_transformed_position")
   (return-type "none")
   (parameters
-    '("const-gchar*" "marker_name")
+    '("gint*" "x")
+    '("gint*" "y")
   )
 )
 
-
-
-;; From clutter-types.h
-
-(define-function clutter_geometry_get_type
-  (c-name "clutter_geometry_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_vertex_get_type
-  (c-name "clutter_vertex_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_knot_get_type
-  (c-name "clutter_knot_get_type")
-  (return-type "GType")
-)
-
-(define-method copy
-  (of-object "ClutterKnot")
-  (c-name "clutter_knot_copy")
-  (return-type "ClutterKnot*")
-)
-
-(define-method free
-  (of-object "ClutterKnot")
-  (c-name "clutter_knot_free")
+(define-method get_transformed_positionu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_transformed_positionu")
   (return-type "none")
+  (parameters
+    '("ClutterUnit*" "x")
+    '("ClutterUnit*" "y")
+  )
 )
 
-(define-method equal
-  (of-object "ClutterKnot")
-  (c-name "clutter_knot_equal")
+(define-method get_fixed_position_set
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_fixed_position_set")
   (return-type "gboolean")
+)
+
+(define-method set_fixed_position_set
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_fixed_position_set")
+  (return-type "none")
   (parameters
-    '("const-ClutterKnot*" "knot_b")
+    '("gboolean" "is_set")
   )
 )
 
+(define-method get_width
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_width")
+  (return-type "guint")
+)
 
+(define-method get_widthu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_widthu")
+  (return-type "ClutterUnit")
+)
 
-;; From clutter-list-model.h
+(define-method get_height
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_height")
+  (return-type "guint")
+)
 
-(define-function clutter_list_model_get_type
-  (c-name "clutter_list_model_get_type")
-  (return-type "GType")
+(define-method get_heightu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_heightu")
+  (return-type "ClutterUnit")
 )
 
-(define-function clutter_list_model_new
-  (c-name "clutter_list_model_new")
-  (is-constructor-of "ClutterListModel")
-  (return-type "ClutterModel*")
+(define-method set_width
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_width")
+  (return-type "none")
   (parameters
-    '("guint" "n_columns")
+    '("guint" "width")
   )
-  (varargs #t)
 )
 
-(define-function clutter_list_model_newv
-  (c-name "clutter_list_model_newv")
-  (return-type "ClutterModel*")
+(define-method set_widthu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_widthu")
+  (return-type "none")
   (parameters
-    '("guint" "n_columns")
-    '("GType*" "types")
-    '("const-gchar*-const[]" "names")
+    '("ClutterUnit" "width")
   )
 )
 
-
-
-;; From clutter-binding-pool.h
-
-(define-function clutter_binding_pool_new
-  (c-name "clutter_binding_pool_new")
-  (is-constructor-of "ClutterBindingPool")
-  (return-type "ClutterBindingPool*")
+(define-method set_height
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_height")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("guint" "height")
   )
 )
 
-(define-function clutter_binding_pool_get_for_class
-  (c-name "clutter_binding_pool_get_for_class")
-  (return-type "ClutterBindingPool*")
+(define-method set_heightu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_heightu")
+  (return-type "none")
   (parameters
-    '("gpointer" "klass")
+    '("ClutterUnit" "height")
   )
 )
 
-(define-function clutter_binding_pool_find
-  (c-name "clutter_binding_pool_find")
-  (return-type "ClutterBindingPool*")
-  (parameters
-    '("const-gchar*" "name")
-  )
+(define-method get_x
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_x")
+  (return-type "gint")
 )
 
-(define-method install_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_install_action")
+(define-method get_xu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_xu")
+  (return-type "ClutterUnit")
+)
+
+(define-method get_y
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_y")
+  (return-type "gint")
+)
+
+(define-method get_yu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_yu")
+  (return-type "ClutterUnit")
+)
+
+(define-method set_x
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_x")
   (return-type "none")
   (parameters
-    '("const-gchar*" "action_name")
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
-    '("GCallback" "callback")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
+    '("gint" "x")
   )
 )
 
-(define-method install_closure
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_install_closure")
+(define-method set_xu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_xu")
   (return-type "none")
   (parameters
-    '("const-gchar*" "action_name")
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
-    '("GClosure*" "closure")
+    '("ClutterUnit" "x")
   )
 )
 
-(define-method list_actions
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_list_actions")
-  (return-type "gchar**")
-)
-
-(define-method find_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_find_action")
-  (return-type "const-gchar*")
+(define-method set_y
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_y")
+  (return-type "none")
   (parameters
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
+    '("gint" "y")
   )
 )
 
-(define-method remove_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_remove_action")
+(define-method set_yu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_yu")
   (return-type "none")
   (parameters
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
+    '("ClutterUnit" "y")
   )
 )
 
-(define-method activate
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_activate")
-  (return-type "gboolean")
+(define-method set_rotation
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_rotation")
+  (return-type "none")
   (parameters
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
-    '("GObject*" "gobject")
+    '("ClutterRotateAxis" "axis")
+    '("gdouble" "angle")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "z")
   )
 )
 
-(define-method block_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_block_action")
+(define-method set_rotationx
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_rotationx")
   (return-type "none")
   (parameters
-    '("const-gchar*" "action_name")
+    '("ClutterRotateAxis" "axis")
+    '("ClutterFixed" "angle")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "z")
   )
 )
 
-(define-method unblock_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_unblock_action")
+(define-method set_rotationu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_rotationu")
   (return-type "none")
   (parameters
-    '("const-gchar*" "action_name")
+    '("ClutterRotateAxis" "axis")
+    '("gdouble" "angle")
+    '("ClutterUnit" "x")
+    '("ClutterUnit" "y")
+    '("ClutterUnit" "z")
   )
 )
 
-
-
-;; From clutter-entry.h
-
-(define-function clutter_entry_get_type
-  (c-name "clutter_entry_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_entry_new
-  (c-name "clutter_entry_new")
-  (is-constructor-of "ClutterEntry")
-  (return-type "ClutterActor*")
+(define-method get_rotation
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_rotation")
+  (return-type "gdouble")
+  (parameters
+    '("ClutterRotateAxis" "axis")
+    '("gint*" "x")
+    '("gint*" "y")
+    '("gint*" "z")
+  )
 )
 
-(define-function clutter_entry_new_full
-  (c-name "clutter_entry_new_full")
-  (return-type "ClutterActor*")
+(define-method get_rotationx
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_rotationx")
+  (return-type "ClutterFixed")
   (parameters
-    '("const-gchar*" "font_name")
-    '("const-gchar*" "text")
-    '("const-ClutterColor*" "color")
+    '("ClutterRotateAxis" "axis")
+    '("gint*" "x")
+    '("gint*" "y")
+    '("gint*" "z")
   )
 )
 
-(define-function clutter_entry_new_with_text
-  (c-name "clutter_entry_new_with_text")
-  (return-type "ClutterActor*")
+(define-method get_rotationu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_rotationu")
+  (return-type "gdouble")
   (parameters
-    '("const-gchar*" "font_name")
-    '("const-gchar*" "text")
+    '("ClutterRotateAxis" "axis")
+    '("ClutterUnit*" "x")
+    '("ClutterUnit*" "y")
+    '("ClutterUnit*" "z")
   )
 )
 
-(define-method set_text
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_set_text")
+(define-method set_opacity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_opacity")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
+    '("guint8" "opacity")
   )
 )
 
-(define-method get_text
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_get_text")
-  (return-type "const-gchar*")
+(define-method get_opacity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_opacity")
+  (return-type "guint8")
+)
+
+(define-method get_paint_opacity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_paint_opacity")
+  (return-type "guint8")
+)
+
+(define-method get_paint_visibility
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_paint_visibility")
+  (return-type "gboolean")
 )
 
-(define-method set_font_name
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_set_font_name")
+(define-method set_name
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "font_name")
+    '("const-gchar*" "name")
   )
 )
 
-(define-method get_font_name
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_get_font_name")
+(define-method get_name
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_name")
   (return-type "const-gchar*")
 )
 
-(define-method set_color
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_set_color")
+(define-method get_gid
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_gid")
+  (return-type "guint32")
+)
+
+(define-method set_clip
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_clip")
   (return-type "none")
   (parameters
-    '("const-ClutterColor*" "color")
+    '("gint" "xoff")
+    '("gint" "yoff")
+    '("gint" "width")
+    '("gint" "height")
   )
 )
 
-(define-method get_color
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_get_color")
+(define-method set_clipu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_clipu")
   (return-type "none")
   (parameters
-    '("ClutterColor*" "color")
+    '("ClutterUnit" "xoff")
+    '("ClutterUnit" "yoff")
+    '("ClutterUnit" "width")
+    '("ClutterUnit" "height")
   )
 )
 
-(define-method get_layout
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_get_layout")
-  (return-type "PangoLayout*")
+(define-method remove_clip
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_remove_clip")
+  (return-type "none")
 )
 
-(define-method set_alignment
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_set_alignment")
+(define-method has_clip
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_has_clip")
+  (return-type "gboolean")
+)
+
+(define-method get_clip
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_clip")
   (return-type "none")
   (parameters
-    '("PangoAlignment" "alignment")
+    '("gint*" "xoff")
+    '("gint*" "yoff")
+    '("gint*" "width")
+    '("gint*" "height")
   )
 )
 
-(define-method get_alignment
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_get_alignment")
-  (return-type "PangoAlignment")
+(define-method get_clipu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_clipu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit*" "xoff")
+    '("ClutterUnit*" "yoff")
+    '("ClutterUnit*" "width")
+    '("ClutterUnit*" "height")
+  )
 )
 
-(define-method set_cursor_position
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_set_cursor_position")
+(define-method set_parent
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_parent")
   (return-type "none")
   (parameters
-    '("gint" "position")
+    '("ClutterActor*" "parent")
   )
 )
 
-(define-method get_cursor_position
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_get_cursor_position")
-  (return-type "gint")
+(define-method get_parent
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_parent")
+  (return-type "ClutterActor*")
 )
 
-(define-method insert_unichar
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_insert_unichar")
+(define-method reparent
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_reparent")
   (return-type "none")
   (parameters
-    '("gunichar" "wc")
+    '("ClutterActor*" "new_parent")
   )
 )
 
-(define-method delete_chars
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_delete_chars")
+(define-method unparent
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_unparent")
   (return-type "none")
-  (parameters
-    '("guint" "len")
-  )
 )
 
-(define-method insert_text
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_insert_text")
+(define-method get_stage
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_stage")
+  (return-type "ClutterActor*")
+)
+
+(define-method raise
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_raise")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
-    '("gssize" "position")
+    '("ClutterActor*" "below")
   )
 )
 
-(define-method delete_text
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_delete_text")
+(define-method lower
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_lower")
   (return-type "none")
   (parameters
-    '("gssize" "start_pos")
-    '("gssize" "end_pos")
+    '("ClutterActor*" "above")
   )
 )
 
-(define-method set_visible_cursor
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_set_visible_cursor")
+(define-method raise_top
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_raise_top")
   (return-type "none")
-  (parameters
-    '("gboolean" "visible")
-  )
 )
 
-(define-method get_visible_cursor
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_get_visible_cursor")
-  (return-type "gboolean")
+(define-method lower_bottom
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_lower_bottom")
+  (return-type "none")
 )
 
-(define-method set_visibility
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_set_visibility")
+(define-method set_depth
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_depth")
   (return-type "none")
   (parameters
-    '("gboolean" "visible")
+    '("gint" "depth")
   )
 )
 
-(define-method get_visibility
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_get_visibility")
-  (return-type "gboolean")
+(define-method get_depth
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_depth")
+  (return-type "gint")
 )
 
-(define-method set_invisible_char
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_set_invisible_char")
+(define-method set_depthu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_depthu")
   (return-type "none")
   (parameters
-    '("gunichar" "wc")
+    '("ClutterUnit" "depth")
   )
 )
 
-(define-method get_invisible_char
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_get_invisible_char")
-  (return-type "gunichar")
+(define-method get_depthu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_depthu")
+  (return-type "ClutterUnit")
 )
 
-(define-method set_max_length
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_set_max_length")
+(define-method set_scalex
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_scalex")
   (return-type "none")
   (parameters
-    '("gint" "max")
+    '("ClutterFixed" "scale_x")
+    '("ClutterFixed" "scale_y")
   )
 )
 
-(define-method get_max_length
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_get_max_length")
-  (return-type "gint")
+(define-method set_scale
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_scale")
+  (return-type "none")
+  (parameters
+    '("gdouble" "scale_x")
+    '("gdouble" "scale_y")
+  )
 )
 
-(define-method handle_key_event
-  (of-object "ClutterEntry")
-  (c-name "clutter_entry_handle_key_event")
+(define-method get_scalex
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_scalex")
   (return-type "none")
   (parameters
-    '("ClutterKeyEvent*" "kev")
+    '("ClutterFixed*" "scale_x")
+    '("ClutterFixed*" "scale_y")
   )
 )
 
-
-
-;; From clutter-timeout-pool.h
-
-(define-function clutter_timeout_pool_new
-  (c-name "clutter_timeout_pool_new")
-  (is-constructor-of "ClutterTimeoutPool")
-  (return-type "ClutterTimeoutPool*")
+(define-method get_scale
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_scale")
+  (return-type "none")
   (parameters
-    '("gint" "priority")
+    '("gdouble*" "scale_x")
+    '("gdouble*" "scale_y")
   )
 )
 
-(define-method add
-  (of-object "ClutterTimeoutPool")
-  (c-name "clutter_timeout_pool_add")
-  (return-type "guint")
+(define-method move_by
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_move_by")
+  (return-type "none")
   (parameters
-    '("guint" "interval")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
+    '("gint" "dx")
+    '("gint" "dy")
   )
 )
 
-(define-method remove
-  (of-object "ClutterTimeoutPool")
-  (c-name "clutter_timeout_pool_remove")
+(define-method move_byu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_move_byu")
   (return-type "none")
   (parameters
-    '("guint" "id")
+    '("ClutterUnit" "dx")
+    '("ClutterUnit" "dy")
   )
 )
 
-
-
-;; From clutter-feature.h
-
-(define-function clutter_feature_available
-  (c-name "clutter_feature_available")
-  (return-type "gboolean")
+(define-method set_reactive
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_reactive")
+  (return-type "none")
   (parameters
-    '("ClutterFeatureFlags" "feature")
+    '("gboolean" "reactive")
   )
 )
 
-(define-function clutter_feature_get_all
-  (c-name "clutter_feature_get_all")
-  (return-type "ClutterFeatureFlags")
+(define-method get_reactive
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_reactive")
+  (return-type "gboolean")
 )
 
-
-
-;; From clutter-label.h
-
-(define-function clutter_label_get_type
-  (c-name "clutter_label_get_type")
-  (return-type "GType")
+(define-method event
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_event")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterEvent*" "event")
+    '("gboolean" "capture")
+  )
 )
 
-(define-function clutter_label_new
-  (c-name "clutter_label_new")
-  (is-constructor-of "ClutterLabel")
+(define-function clutter_get_actor_by_gid
+  (c-name "clutter_get_actor_by_gid")
   (return-type "ClutterActor*")
+  (parameters
+    '("guint32" "id")
+  )
 )
 
-(define-function clutter_label_new_full
-  (c-name "clutter_label_new_full")
-  (return-type "ClutterActor*")
+(define-method set_shader
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_shader")
+  (return-type "gboolean")
   (parameters
-    '("const-gchar*" "font_name")
-    '("const-gchar*" "text")
-    '("const-ClutterColor*" "color")
+    '("ClutterShader*" "shader")
   )
 )
 
-(define-function clutter_label_new_with_text
-  (c-name "clutter_label_new_with_text")
-  (return-type "ClutterActor*")
+(define-method get_shader
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_shader")
+  (return-type "ClutterShader*")
+)
+
+(define-method set_shader_param
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_shader_param")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "font_name")
-    '("const-gchar*" "text")
+    '("const-gchar*" "param")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method set_text
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_set_text")
+(define-method set_shader_param_int
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_shader_param_int")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
+    '("const-gchar*" "param")
+    '("gint" "value")
   )
 )
 
-(define-method get_text
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_get_text")
-  (return-type "const-gchar*")
-)
-
-(define-method set_font_name
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_set_font_name")
+(define-method set_shader_param_float
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_shader_param_float")
   (return-type "none")
   (parameters
-    '("const-gchar*" "font_name")
+    '("const-gchar*" "param")
+    '("gfloat" "value")
   )
 )
 
-(define-method get_font_name
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_get_font_name")
-  (return-type "const-gchar*")
-)
-
-(define-method set_color
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_set_color")
+(define-method set_anchor_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_anchor_point")
   (return-type "none")
   (parameters
-    '("const-ClutterColor*" "color")
+    '("gint" "anchor_x")
+    '("gint" "anchor_y")
   )
 )
 
-(define-method get_color
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_get_color")
+(define-method move_anchor_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_move_anchor_point")
   (return-type "none")
   (parameters
-    '("ClutterColor*" "color")
+    '("gint" "anchor_x")
+    '("gint" "anchor_y")
   )
 )
 
-(define-method set_ellipsize
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_set_ellipsize")
+(define-method get_anchor_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_anchor_point")
   (return-type "none")
   (parameters
-    '("PangoEllipsizeMode" "mode")
+    '("gint*" "anchor_x")
+    '("gint*" "anchor_y")
   )
 )
 
-(define-method get_ellipsize
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_get_ellipsize")
-  (return-type "PangoEllipsizeMode")
-)
-
-(define-method set_line_wrap
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_set_line_wrap")
+(define-method set_anchor_pointu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_anchor_pointu")
   (return-type "none")
   (parameters
-    '("gboolean" "wrap")
+    '("ClutterUnit" "anchor_x")
+    '("ClutterUnit" "anchor_y")
   )
 )
 
-(define-method get_line_wrap
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_get_line_wrap")
-  (return-type "gboolean")
-)
-
-(define-method set_line_wrap_mode
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_set_line_wrap_mode")
+(define-method move_anchor_pointu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_move_anchor_pointu")
   (return-type "none")
   (parameters
-    '("PangoWrapMode" "wrap_mode")
+    '("ClutterUnit" "anchor_x")
+    '("ClutterUnit" "anchor_y")
   )
 )
 
-(define-method get_line_wrap_mode
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_get_line_wrap_mode")
-  (return-type "PangoWrapMode")
-)
-
-(define-method get_layout
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_get_layout")
-  (return-type "PangoLayout*")
-)
-
-(define-method set_attributes
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_set_attributes")
+(define-method get_anchor_pointu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_anchor_pointu")
   (return-type "none")
   (parameters
-    '("PangoAttrList*" "attrs")
+    '("ClutterUnit*" "anchor_x")
+    '("ClutterUnit*" "anchor_y")
   )
 )
 
-(define-method get_attributes
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_get_attributes")
-  (return-type "PangoAttrList*")
-)
-
-(define-method set_use_markup
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_set_use_markup")
+(define-method set_anchor_point_from_gravity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_anchor_point_from_gravity")
   (return-type "none")
   (parameters
-    '("gboolean" "setting")
+    '("ClutterGravity" "gravity")
   )
 )
 
-(define-method get_use_markup
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_get_use_markup")
-  (return-type "gboolean")
-)
-
-(define-method set_alignment
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_set_alignment")
+(define-method move_anchor_point_from_gravity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_move_anchor_point_from_gravity")
   (return-type "none")
   (parameters
-    '("PangoAlignment" "alignment")
+    '("ClutterGravity" "gravity")
   )
 )
 
-(define-method get_alignment
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_get_alignment")
-  (return-type "PangoAlignment")
-)
-
-(define-method set_justify
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_set_justify")
-  (return-type "none")
+(define-method transform_stage_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_transform_stage_point")
+  (return-type "gboolean")
   (parameters
-    '("gboolean" "justify")
+    '("ClutterUnit" "x")
+    '("ClutterUnit" "y")
+    '("ClutterUnit*" "x_out")
+    '("ClutterUnit*" "y_out")
   )
 )
 
-(define-method get_justify
-  (of-object "ClutterLabel")
-  (c-name "clutter_label_get_justify")
+(define-method is_rotated
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_is_rotated")
   (return-type "gboolean")
 )
 
-
-
-;; From clutter-version.h
-
-
-
-;; From clutter-behaviour-ellipse.h
-
-(define-function clutter_behaviour_ellipse_get_type
-  (c-name "clutter_behaviour_ellipse_get_type")
-  (return-type "GType")
+(define-method is_scaled
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_is_scaled")
+  (return-type "gboolean")
 )
 
-(define-function clutter_behaviour_ellipse_new
-  (c-name "clutter_behaviour_ellipse_new")
-  (is-constructor-of "ClutterBehaviourEllipse")
-  (return-type "ClutterBehaviour*")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-    '("ClutterRotateDirection" "direction")
-    '("gdouble" "start")
-    '("gdouble" "end")
-  )
+(define-method should_pick_paint
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_should_pick_paint")
+  (return-type "gboolean")
 )
 
-(define-function clutter_behaviour_ellipse_newx
-  (c-name "clutter_behaviour_ellipse_newx")
-  (return-type "ClutterBehaviour*")
+(define-function clutter_actor_box_get_from_vertices
+  (c-name "clutter_actor_box_get_from_vertices")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-    '("ClutterRotateDirection" "direction")
-    '("ClutterFixed" "start")
-    '("ClutterFixed" "end")
+    '("ClutterVertex" "vtx[4]")
+    '("ClutterActorBox*" "box")
   )
 )
 
-(define-method set_center
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_center")
+(define-method get_abs_allocation_vertices
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_abs_allocation_vertices")
   (return-type "none")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("ClutterVertex" "verts[4]")
   )
 )
 
-(define-method get_center
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_center")
+(define-method apply_transform_to_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_apply_transform_to_point")
   (return-type "none")
   (parameters
-    '("gint*" "x")
-    '("gint*" "y")
+    '("const-ClutterVertex*" "point")
+    '("ClutterVertex*" "vertex")
   )
 )
 
-(define-method set_width
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_width")
+(define-method apply_relative_transform_to_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_apply_relative_transform_to_point")
   (return-type "none")
   (parameters
-    '("gint" "width")
+    '("ClutterActor*" "ancestor")
+    '("const-ClutterVertex*" "point")
+    '("ClutterVertex*" "vertex")
   )
 )
 
-(define-method get_width
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_width")
-  (return-type "gint")
-)
-
-(define-method set_height
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_height")
+(define-method grab_key_focus
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_grab_key_focus")
   (return-type "none")
-  (parameters
-    '("gint" "height")
-  )
 )
 
-(define-method get_height
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_height")
-  (return-type "gint")
+(define-method get_pango_context
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_pango_context")
+  (return-type "PangoContext*")
 )
 
-(define-method set_angle_start
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_angle_start")
-  (return-type "none")
-  (parameters
-    '("gdouble" "angle_start")
-  )
+(define-method create_pango_context
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_create_pango_context")
+  (return-type "PangoContext*")
 )
 
-(define-method set_angle_startx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_angle_startx")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed" "angle_start")
-  )
-)
 
-(define-method get_angle_startx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_angle_startx")
-  (return-type "ClutterFixed")
+
+;; From clutter-keysyms.h
+
+
+
+;; From clutter-rectangle.h
+
+(define-function clutter_rectangle_get_type
+  (c-name "clutter_rectangle_get_type")
+  (return-type "GType")
 )
 
-(define-method get_angle_start
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_angle_start")
-  (return-type "gdouble")
+(define-function clutter_rectangle_new
+  (c-name "clutter_rectangle_new")
+  (is-constructor-of "ClutterRectangle")
+  (return-type "ClutterActor*")
 )
 
-(define-method set_angle_endx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_angle_endx")
-  (return-type "none")
+(define-function clutter_rectangle_new_with_color
+  (c-name "clutter_rectangle_new_with_color")
+  (return-type "ClutterActor*")
   (parameters
-    '("ClutterFixed" "angle_end")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-method set_angle_end
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_angle_end")
+(define-method get_color
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_get_color")
   (return-type "none")
   (parameters
-    '("gdouble" "angle_end")
+    '("ClutterColor*" "color")
   )
 )
 
-(define-method get_angle_endx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_angle_endx")
-  (return-type "ClutterFixed")
+(define-method set_color
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_set_color")
+  (return-type "none")
+  (parameters
+    '("const-ClutterColor*" "color")
+  )
 )
 
-(define-method get_angle_end
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_angle_end")
-  (return-type "gdouble")
+(define-method get_border_width
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_get_border_width")
+  (return-type "guint")
 )
 
-(define-method set_angle_tiltx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_angle_tiltx")
+(define-method set_border_width
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_set_border_width")
   (return-type "none")
   (parameters
-    '("ClutterRotateAxis" "axis")
-    '("ClutterFixed" "angle_tilt")
+    '("guint" "width")
   )
 )
 
-(define-method set_angle_tilt
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_angle_tilt")
+(define-method get_border_color
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_get_border_color")
   (return-type "none")
   (parameters
-    '("ClutterRotateAxis" "axis")
-    '("gdouble" "angle_tilt")
+    '("ClutterColor*" "color")
   )
 )
 
-(define-method get_angle_tiltx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_angle_tiltx")
-  (return-type "ClutterFixed")
+(define-method set_border_color
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_set_border_color")
+  (return-type "none")
   (parameters
-    '("ClutterRotateAxis" "axis")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-method get_angle_tilt
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_angle_tilt")
-  (return-type "gdouble")
+
+
+;; From clutter-behaviour-scale.h
+
+(define-function clutter_behaviour_scale_get_type
+  (c-name "clutter_behaviour_scale_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_behaviour_scale_new
+  (c-name "clutter_behaviour_scale_new")
+  (is-constructor-of "ClutterBehaviourScale")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("ClutterRotateAxis" "axis")
+    '("ClutterAlpha*" "alpha")
+    '("gdouble" "x_scale_start")
+    '("gdouble" "y_scale_start")
+    '("gdouble" "x_scale_end")
+    '("gdouble" "y_scale_end")
   )
 )
 
-(define-method set_tilt
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_tilt")
-  (return-type "none")
+(define-function clutter_behaviour_scale_newx
+  (c-name "clutter_behaviour_scale_newx")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("gdouble" "angle_tilt_x")
-    '("gdouble" "angle_tilt_y")
-    '("gdouble" "angle_tilt_z")
+    '("ClutterAlpha*" "alpha")
+    '("ClutterFixed" "x_scale_start")
+    '("ClutterFixed" "y_scale_start")
+    '("ClutterFixed" "x_scale_end")
+    '("ClutterFixed" "y_scale_end")
   )
 )
 
-(define-method set_tiltx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_tiltx")
+(define-method set_bounds
+  (of-object "ClutterBehaviourScale")
+  (c-name "clutter_behaviour_scale_set_bounds")
   (return-type "none")
   (parameters
-    '("ClutterFixed" "angle_tilt_x")
-    '("ClutterFixed" "angle_tilt_y")
-    '("ClutterFixed" "angle_tilt_z")
+    '("gdouble" "x_scale_start")
+    '("gdouble" "y_scale_start")
+    '("gdouble" "x_scale_end")
+    '("gdouble" "y_scale_end")
   )
 )
 
-(define-method get_tilt
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_tilt")
+(define-method set_boundsx
+  (of-object "ClutterBehaviourScale")
+  (c-name "clutter_behaviour_scale_set_boundsx")
   (return-type "none")
   (parameters
-    '("gdouble*" "angle_tilt_x")
-    '("gdouble*" "angle_tilt_y")
-    '("gdouble*" "angle_tilt_z")
+    '("ClutterFixed" "x_scale_start")
+    '("ClutterFixed" "y_scale_start")
+    '("ClutterFixed" "x_scale_end")
+    '("ClutterFixed" "y_scale_end")
   )
 )
 
-(define-method get_tiltx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_tiltx")
+(define-method get_bounds
+  (of-object "ClutterBehaviourScale")
+  (c-name "clutter_behaviour_scale_get_bounds")
   (return-type "none")
   (parameters
-    '("ClutterFixed*" "angle_tilt_x")
-    '("ClutterFixed*" "angle_tilt_y")
-    '("ClutterFixed*" "angle_tilt_z")
+    '("gdouble*" "x_scale_start")
+    '("gdouble*" "y_scale_start")
+    '("gdouble*" "x_scale_end")
+    '("gdouble*" "y_scale_end")
   )
 )
 
-(define-method get_direction
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_direction")
-  (return-type "ClutterRotateDirection")
-)
-
-(define-method set_direction
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_direction")
+(define-method get_boundsx
+  (of-object "ClutterBehaviourScale")
+  (c-name "clutter_behaviour_scale_get_boundsx")
   (return-type "none")
   (parameters
-    '("ClutterRotateDirection" "direction")
+    '("ClutterFixed*" "x_scale_start")
+    '("ClutterFixed*" "y_scale_start")
+    '("ClutterFixed*" "x_scale_end")
+    '("ClutterFixed*" "y_scale_end")
   )
 )
 
 
 
-;; From clutter-glx.h
+;; From clutter-timeline.h
 
+(define-function clutter_timeline_get_type
+  (c-name "clutter_timeline_get_type")
+  (return-type "GType")
+)
 
+(define-function clutter_timeline_new
+  (c-name "clutter_timeline_new")
+  (is-constructor-of "ClutterTimeline")
+  (return-type "ClutterTimeline*")
+  (parameters
+    '("guint" "n_frames")
+    '("guint" "fps")
+  )
+)
 
-;; From clutter-glx-texture-pixmap.h
+(define-function clutter_timeline_new_for_duration
+  (c-name "clutter_timeline_new_for_duration")
+  (return-type "ClutterTimeline*")
+  (parameters
+    '("guint" "msecs")
+  )
+)
 
-(define-function clutter_glx_texture_pixmap_get_type
-  (c-name "clutter_glx_texture_pixmap_get_type")
-  (return-type "GType")
+(define-method clone
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_clone")
+  (return-type "ClutterTimeline*")
 )
 
-(define-function clutter_glx_texture_pixmap_new
-  (c-name "clutter_glx_texture_pixmap_new")
-  (is-constructor-of "ClutterGlxTexturePixmap")
-  (return-type "ClutterActor*")
+(define-method get_duration
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_duration")
+  (return-type "guint")
 )
 
-(define-function clutter_glx_texture_pixmap_new_with_pixmap
-  (c-name "clutter_glx_texture_pixmap_new_with_pixmap")
-  (return-type "ClutterActor*")
+(define-method set_duration
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_set_duration")
+  (return-type "none")
   (parameters
-    '("Pixmap" "pixmap")
+    '("guint" "msecs")
   )
 )
 
-(define-function clutter_glx_texture_pixmap_new_with_window
-  (c-name "clutter_glx_texture_pixmap_new_with_window")
-  (return-type "ClutterActor*")
+(define-method get_speed
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_speed")
+  (return-type "guint")
+)
+
+(define-method set_speed
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_set_speed")
+  (return-type "none")
   (parameters
-    '("Window" "window")
+    '("guint" "fps")
   )
 )
 
-(define-method using_extension
-  (of-object "ClutterGLXTexturePixmap")
-  (c-name "clutter_glx_texture_pixmap_using_extension")
-  (return-type "gboolean")
+(define-method get_direction
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_direction")
+  (return-type "ClutterTimelineDirection")
+)
+
+(define-method set_direction
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_set_direction")
+  (return-type "none")
+  (parameters
+    '("ClutterTimelineDirection" "direction")
+  )
 )
 
+(define-method start
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_start")
+  (return-type "none")
+)
 
+(define-method pause
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_pause")
+  (return-type "none")
+)
 
-;; From json-types.h
+(define-method stop
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_stop")
+  (return-type "none")
+)
 
-(define-function json_node_new
-  (c-name "json_node_new")
-  (is-constructor-of "JsonNode")
-  (return-type "JsonNode*")
+(define-method set_loop
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_set_loop")
+  (return-type "none")
   (parameters
-    '("JsonNodeType" "type")
+    '("gboolean" "loop")
   )
 )
 
-(define-method copy
-  (of-object "JsonNode")
-  (c-name "json_node_copy")
-  (return-type "JsonNode*")
+(define-method get_loop
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_loop")
+  (return-type "gboolean")
 )
 
-(define-method free
-  (of-object "JsonNode")
-  (c-name "json_node_free")
+(define-method rewind
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_rewind")
   (return-type "none")
 )
 
-(define-method set_object
-  (of-object "JsonNode")
-  (c-name "json_node_set_object")
+(define-method skip
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_skip")
   (return-type "none")
   (parameters
-    '("JsonObject*" "object")
+    '("guint" "n_frames")
   )
 )
 
-(define-method take_object
-  (of-object "JsonNode")
-  (c-name "json_node_take_object")
+(define-method advance
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_advance")
   (return-type "none")
   (parameters
-    '("JsonObject*" "object")
+    '("guint" "frame_num")
   )
 )
 
-(define-method get_object
-  (of-object "JsonNode")
-  (c-name "json_node_get_object")
-  (return-type "JsonObject*")
+(define-method get_current_frame
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_current_frame")
+  (return-type "gint")
 )
 
-(define-method dup_object
-  (of-object "JsonNode")
-  (c-name "json_node_dup_object")
-  (return-type "JsonObject*")
+(define-method get_progress
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_progress")
+  (return-type "gdouble")
 )
 
-(define-method set_array
-  (of-object "JsonNode")
-  (c-name "json_node_set_array")
-  (return-type "none")
-  (parameters
-    '("JsonArray*" "array")
-  )
+(define-method get_progressx
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_progressx")
+  (return-type "ClutterFixed")
 )
 
-(define-method take_array
-  (of-object "JsonNode")
-  (c-name "json_node_take_array")
+(define-method set_n_frames
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_set_n_frames")
   (return-type "none")
   (parameters
-    '("JsonArray*" "array")
+    '("guint" "n_frames")
   )
 )
 
-(define-method get_array
-  (of-object "JsonNode")
-  (c-name "json_node_get_array")
-  (return-type "JsonArray*")
+(define-method get_n_frames
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_n_frames")
+  (return-type "guint")
 )
 
-(define-method dup_array
-  (of-object "JsonNode")
-  (c-name "json_node_dup_array")
-  (return-type "JsonArray*")
+(define-method is_playing
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_is_playing")
+  (return-type "gboolean")
 )
 
-(define-method set_value
-  (of-object "JsonNode")
-  (c-name "json_node_set_value")
+(define-method set_delay
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_set_delay")
   (return-type "none")
   (parameters
-    '("const-GValue*" "value")
+    '("guint" "msecs")
   )
 )
 
-(define-method get_value
-  (of-object "JsonNode")
-  (c-name "json_node_get_value")
-  (return-type "none")
+(define-method get_delay
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_delay")
+  (return-type "guint")
+)
+
+(define-method get_delta
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_delta")
+  (return-type "guint")
   (parameters
-    '("GValue*" "value")
+    '("guint*" "msecs")
   )
 )
 
-(define-method set_string
-  (of-object "JsonNode")
-  (c-name "json_node_set_string")
+(define-method add_marker_at_frame
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_add_marker_at_frame")
   (return-type "none")
   (parameters
-    '("const-gchar*" "value")
+    '("const-gchar*" "marker_name")
+    '("guint" "frame_num")
   )
 )
 
-(define-method get_string
-  (of-object "JsonNode")
-  (c-name "json_node_get_string")
-  (return-type "const-gchar*")
-)
-
-(define-method dup_string
-  (of-object "JsonNode")
-  (c-name "json_node_dup_string")
-  (return-type "gchar*")
-)
-
-(define-method set_int
-  (of-object "JsonNode")
-  (c-name "json_node_set_int")
+(define-method add_marker_at_time
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_add_marker_at_time")
   (return-type "none")
   (parameters
-    '("gint" "value")
+    '("const-gchar*" "marker_name")
+    '("guint" "msecs")
   )
 )
 
-(define-method get_int
-  (of-object "JsonNode")
-  (c-name "json_node_get_int")
-  (return-type "gint")
+(define-method remove_marker
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_remove_marker")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "marker_name")
+  )
 )
 
-(define-method set_double
-  (of-object "JsonNode")
-  (c-name "json_node_set_double")
-  (return-type "none")
+(define-method list_markers
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_list_markers")
+  (return-type "gchar**")
   (parameters
-    '("gdouble" "value")
+    '("gint" "frame_num")
+    '("gsize*" "n_markers")
   )
 )
 
-(define-method get_double
-  (of-object "JsonNode")
-  (c-name "json_node_get_double")
-  (return-type "gdouble")
+(define-method has_marker
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_has_marker")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "marker_name")
+  )
 )
 
-(define-method set_boolean
-  (of-object "JsonNode")
-  (c-name "json_node_set_boolean")
+(define-method advance_to_marker
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_advance_to_marker")
   (return-type "none")
   (parameters
-    '("gboolean" "value")
+    '("const-gchar*" "marker_name")
   )
 )
 
-(define-method get_boolean
-  (of-object "JsonNode")
-  (c-name "json_node_get_boolean")
-  (return-type "gboolean")
-)
 
-(define-method get_parent
-  (of-object "JsonNode")
-  (c-name "json_node_get_parent")
-  (return-type "JsonNode*")
-)
 
-(define-method type_name
-  (of-object "JsonNode")
-  (c-name "json_node_type_name")
-  (return-type "const-gchar*")
+;; From clutter-types.h
+
+(define-function clutter_geometry_get_type
+  (c-name "clutter_geometry_get_type")
+  (return-type "GType")
 )
 
-(define-function json_object_get_type
-  (c-name "json_object_get_type")
+(define-function clutter_vertex_get_type
+  (c-name "clutter_vertex_get_type")
   (return-type "GType")
 )
 
-(define-function json_object_new
-  (c-name "json_object_new")
-  (is-constructor-of "JsonObject")
-  (return-type "JsonObject*")
+(define-function clutter_knot_get_type
+  (c-name "clutter_knot_get_type")
+  (return-type "GType")
 )
 
-(define-method ref
-  (of-object "JsonObject")
-  (c-name "json_object_ref")
-  (return-type "JsonObject*")
+(define-method copy
+  (of-object "ClutterKnot")
+  (c-name "clutter_knot_copy")
+  (return-type "ClutterKnot*")
 )
 
-(define-method unref
-  (of-object "JsonObject")
-  (c-name "json_object_unref")
+(define-method free
+  (of-object "ClutterKnot")
+  (c-name "clutter_knot_free")
   (return-type "none")
 )
 
-(define-method add_member
-  (of-object "JsonObject")
-  (c-name "json_object_add_member")
-  (return-type "none")
+(define-method equal
+  (of-object "ClutterKnot")
+  (c-name "clutter_knot_equal")
+  (return-type "gboolean")
   (parameters
-    '("const-gchar*" "member_name")
-    '("JsonNode*" "node")
+    '("const-ClutterKnot*" "knot_b")
   )
 )
 
-(define-method get_members
-  (of-object "JsonObject")
-  (c-name "json_object_get_members")
-  (return-type "GList*")
+
+
+;; From clutter-list-model.h
+
+(define-function clutter_list_model_get_type
+  (c-name "clutter_list_model_get_type")
+  (return-type "GType")
 )
 
-(define-method get_member
-  (of-object "JsonObject")
-  (c-name "json_object_get_member")
-  (return-type "JsonNode*")
+(define-function clutter_list_model_new
+  (c-name "clutter_list_model_new")
+  (is-constructor-of "ClutterListModel")
+  (return-type "ClutterModel*")
   (parameters
-    '("const-gchar*" "member_name")
+    '("guint" "n_columns")
   )
+  (varargs #t)
 )
 
-(define-method has_member
-  (of-object "JsonObject")
-  (c-name "json_object_has_member")
-  (return-type "gboolean")
+(define-function clutter_list_model_newv
+  (c-name "clutter_list_model_newv")
+  (return-type "ClutterModel*")
   (parameters
-    '("const-gchar*" "member_name")
+    '("guint" "n_columns")
+    '("GType*" "types")
+    '("const-gchar*-const[]" "names")
   )
 )
 
-(define-method remove_member
-  (of-object "JsonObject")
-  (c-name "json_object_remove_member")
-  (return-type "none")
+
+
+;; From clutter-binding-pool.h
+
+(define-function clutter_binding_pool_new
+  (c-name "clutter_binding_pool_new")
+  (is-constructor-of "ClutterBindingPool")
+  (return-type "ClutterBindingPool*")
   (parameters
-    '("const-gchar*" "member_name")
+    '("const-gchar*" "name")
   )
 )
 
-(define-method get_size
-  (of-object "JsonObject")
-  (c-name "json_object_get_size")
-  (return-type "guint")
+(define-function clutter_binding_pool_get_for_class
+  (c-name "clutter_binding_pool_get_for_class")
+  (return-type "ClutterBindingPool*")
+  (parameters
+    '("gpointer" "klass")
+  )
 )
 
-(define-function json_array_get_type
-  (c-name "json_array_get_type")
-  (return-type "GType")
+(define-function clutter_binding_pool_find
+  (c-name "clutter_binding_pool_find")
+  (return-type "ClutterBindingPool*")
+  (parameters
+    '("const-gchar*" "name")
+  )
 )
 
-(define-function json_array_new
-  (c-name "json_array_new")
-  (is-constructor-of "JsonArray")
-  (return-type "JsonArray*")
+(define-method install_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_install_action")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "action_name")
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+    '("GCallback" "callback")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
+  )
 )
 
-(define-function json_array_sized_new
-  (c-name "json_array_sized_new")
-  (is-constructor-of "JsonArraySized")
-  (return-type "JsonArray*")
+(define-method install_closure
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_install_closure")
+  (return-type "none")
   (parameters
-    '("guint" "n_elements")
+    '("const-gchar*" "action_name")
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+    '("GClosure*" "closure")
   )
 )
 
-(define-method ref
-  (of-object "JsonArray")
-  (c-name "json_array_ref")
-  (return-type "JsonArray*")
+(define-method override_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_override_action")
+  (return-type "none")
+  (parameters
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+    '("GCallback" "callback")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
+  )
 )
 
-(define-method unref
-  (of-object "JsonArray")
-  (c-name "json_array_unref")
+(define-method override_closure
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_override_closure")
   (return-type "none")
+  (parameters
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+    '("GClosure*" "closure")
+  )
 )
 
-(define-method add_element
-  (of-object "JsonArray")
-  (c-name "json_array_add_element")
-  (return-type "none")
+(define-method find_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_find_action")
+  (return-type "const-gchar*")
   (parameters
-    '("JsonNode*" "node")
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
   )
 )
 
-(define-method get_elements
-  (of-object "JsonArray")
-  (c-name "json_array_get_elements")
-  (return-type "GList*")
+(define-method remove_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_remove_action")
+  (return-type "none")
+  (parameters
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+  )
 )
 
-(define-method get_element
-  (of-object "JsonArray")
-  (c-name "json_array_get_element")
-  (return-type "JsonNode*")
+(define-method activate
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_activate")
+  (return-type "gboolean")
   (parameters
-    '("guint" "index_")
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+    '("GObject*" "gobject")
   )
 )
 
-(define-method remove_element
-  (of-object "JsonArray")
-  (c-name "json_array_remove_element")
+(define-method block_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_block_action")
   (return-type "none")
   (parameters
-    '("guint" "index_")
+    '("const-gchar*" "action_name")
   )
 )
 
-(define-method get_length
-  (of-object "JsonArray")
-  (c-name "json_array_get_length")
-  (return-type "guint")
+(define-method unblock_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_unblock_action")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "action_name")
+  )
 )
 
 
 
-;; From json-generator.h
-
-(define-function json_generator_get_type
-  (c-name "json_generator_get_type")
-  (return-type "GType")
-)
-
-(define-function json_generator_new
-  (c-name "json_generator_new")
-  (is-constructor-of "JsonGenerator")
-  (return-type "JsonGenerator*")
-)
+;; From clutter-timeout-pool.h
 
-(define-method to_data
-  (of-object "JsonGenerator")
-  (c-name "json_generator_to_data")
-  (return-type "gchar*")
+(define-function clutter_timeout_pool_new
+  (c-name "clutter_timeout_pool_new")
+  (is-constructor-of "ClutterTimeoutPool")
+  (return-type "ClutterTimeoutPool*")
   (parameters
-    '("gsize*" "length")
+    '("gint" "priority")
   )
 )
 
-(define-method to_file
-  (of-object "JsonGenerator")
-  (c-name "json_generator_to_file")
-  (return-type "gboolean")
+(define-method add
+  (of-object "ClutterTimeoutPool")
+  (c-name "clutter_timeout_pool_add")
+  (return-type "guint")
   (parameters
-    '("const-gchar*" "filename")
-    '("GError**" "error")
+    '("guint" "interval")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-method set_root
-  (of-object "JsonGenerator")
-  (c-name "json_generator_set_root")
+(define-method remove
+  (of-object "ClutterTimeoutPool")
+  (c-name "clutter_timeout_pool_remove")
   (return-type "none")
   (parameters
-    '("JsonNode*" "node")
+    '("guint" "id")
   )
 )
 
 
 
-;; From json-glib.h
-
-
-
-;; From json-marshal.h
-
-
-
-;; From json-parser.h
-
-(define-function json_parser_error_quark
-  (c-name "json_parser_error_quark")
-  (return-type "GQuark")
-)
-
-(define-function json_parser_get_type
-  (c-name "json_parser_get_type")
-  (return-type "GType")
-)
-
-(define-function json_parser_new
-  (c-name "json_parser_new")
-  (is-constructor-of "JsonParser")
-  (return-type "JsonParser*")
-)
+;; From clutter-feature.h
 
-(define-method load_from_file
-  (of-object "JsonParser")
-  (c-name "json_parser_load_from_file")
+(define-function clutter_feature_available
+  (c-name "clutter_feature_available")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "filename")
-    '("GError**" "error")
+    '("ClutterFeatureFlags" "feature")
   )
 )
 
-(define-method load_from_data
-  (of-object "JsonParser")
-  (c-name "json_parser_load_from_data")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "data")
-    '("gssize" "length")
-    '("GError**" "error")
-  )
+(define-function clutter_feature_get_all
+  (c-name "clutter_feature_get_all")
+  (return-type "ClutterFeatureFlags")
 )
 
-(define-method get_root
-  (of-object "JsonParser")
-  (c-name "json_parser_get_root")
-  (return-type "JsonNode*")
-)
 
-(define-method get_current_line
-  (of-object "JsonParser")
-  (c-name "json_parser_get_current_line")
-  (return-type "guint")
-)
 
-(define-method get_current_pos
-  (of-object "JsonParser")
-  (c-name "json_parser_get_current_pos")
-  (return-type "guint")
-)
+;; From clutter-version.h
 
 
 
-;; From clutter-x11-texture-pixmap.h
+;; From clutter-behaviour-ellipse.h
 
-(define-function clutter_x11_texture_pixmap_get_type
-  (c-name "clutter_x11_texture_pixmap_get_type")
+(define-function clutter_behaviour_ellipse_get_type
+  (c-name "clutter_behaviour_ellipse_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_x11_texture_pixmap_new
-  (c-name "clutter_x11_texture_pixmap_new")
-  (is-constructor-of "ClutterX11TexturePixmap")
-  (return-type "ClutterActor*")
+(define-function clutter_behaviour_ellipse_new
+  (c-name "clutter_behaviour_ellipse_new")
+  (is-constructor-of "ClutterBehaviourEllipse")
+  (return-type "ClutterBehaviour*")
+  (parameters
+    '("ClutterAlpha*" "alpha")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
+    '("ClutterRotateDirection" "direction")
+    '("gdouble" "start")
+    '("gdouble" "end")
+  )
 )
 
-(define-function clutter_x11_texture_pixmap_new_with_pixmap
-  (c-name "clutter_x11_texture_pixmap_new_with_pixmap")
-  (return-type "ClutterActor*")
+(define-function clutter_behaviour_ellipse_newx
+  (c-name "clutter_behaviour_ellipse_newx")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("Pixmap" "pixmap")
+    '("ClutterAlpha*" "alpha")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
+    '("ClutterRotateDirection" "direction")
+    '("ClutterFixed" "start")
+    '("ClutterFixed" "end")
   )
 )
 
-(define-function clutter_x11_texture_pixmap_new_with_window
-  (c-name "clutter_x11_texture_pixmap_new_with_window")
-  (return-type "ClutterActor*")
+(define-method set_center
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_center")
+  (return-type "none")
   (parameters
-    '("Window" "window")
+    '("gint" "x")
+    '("gint" "y")
   )
 )
 
-(define-method set_pixmap
-  (of-object "ClutterX11TexturePixmap")
-  (c-name "clutter_x11_texture_pixmap_set_pixmap")
+(define-method get_center
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_center")
   (return-type "none")
   (parameters
-    '("Pixmap" "pixmap")
+    '("gint*" "x")
+    '("gint*" "y")
   )
 )
 
-(define-method set_window
-  (of-object "ClutterX11TexturePixmap")
-  (c-name "clutter_x11_texture_pixmap_set_window")
+(define-method set_width
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_width")
   (return-type "none")
   (parameters
-    '("Window" "window")
-    '("gboolean" "automatic")
+    '("gint" "width")
   )
 )
 
-(define-method sync_window
-  (of-object "ClutterX11TexturePixmap")
-  (c-name "clutter_x11_texture_pixmap_sync_window")
-  (return-type "none")
+(define-method get_width
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_width")
+  (return-type "gint")
 )
 
-(define-method update_area
-  (of-object "ClutterX11TexturePixmap")
-  (c-name "clutter_x11_texture_pixmap_update_area")
+(define-method set_height
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_height")
   (return-type "none")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
     '("gint" "height")
   )
 )
 
-(define-method set_automatic
-  (of-object "ClutterX11TexturePixmap")
-  (c-name "clutter_x11_texture_pixmap_set_automatic")
+(define-method get_height
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_height")
+  (return-type "gint")
+)
+
+(define-method set_angle_start
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_angle_start")
   (return-type "none")
   (parameters
-    '("gboolean" "setting")
+    '("gdouble" "angle_start")
   )
 )
 
-
-
-;; From clutter-x11.h
-
-(define-function clutter_x11_trap_x_errors
-  (c-name "clutter_x11_trap_x_errors")
+(define-method set_angle_startx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_angle_startx")
   (return-type "none")
+  (parameters
+    '("ClutterFixed" "angle_start")
+  )
 )
 
-(define-function clutter_x11_untrap_x_errors
-  (c-name "clutter_x11_untrap_x_errors")
-  (return-type "gint")
-)
-
-(define-function clutter_x11_get_default_display
-  (c-name "clutter_x11_get_default_display")
-  (return-type "Display*")
-)
-
-(define-function clutter_x11_get_default_screen
-  (c-name "clutter_x11_get_default_screen")
-  (return-type "int")
+(define-method get_angle_startx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_angle_startx")
+  (return-type "ClutterFixed")
 )
 
-(define-function clutter_x11_get_root_window
-  (c-name "clutter_x11_get_root_window")
-  (return-type "Window")
+(define-method get_angle_start
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_angle_start")
+  (return-type "gdouble")
 )
 
-(define-function clutter_x11_set_display
-  (c-name "clutter_x11_set_display")
+(define-method set_angle_endx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_angle_endx")
   (return-type "none")
   (parameters
-    '("Display*" "xdpy")
+    '("ClutterFixed" "angle_end")
   )
 )
 
-(define-function clutter_x11_get_stage_window
-  (c-name "clutter_x11_get_stage_window")
-  (return-type "Window")
+(define-method set_angle_end
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_angle_end")
+  (return-type "none")
   (parameters
-    '("ClutterStage*" "stage")
+    '("gdouble" "angle_end")
   )
 )
 
-(define-function clutter_x11_get_stage_visual
-  (c-name "clutter_x11_get_stage_visual")
-  (return-type "XVisualInfo*")
-  (parameters
-    '("ClutterStage*" "stage")
-  )
+(define-method get_angle_endx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_angle_endx")
+  (return-type "ClutterFixed")
 )
 
-(define-function clutter_x11_set_stage_foreign
-  (c-name "clutter_x11_set_stage_foreign")
-  (return-type "gboolean")
-  (parameters
-    '("ClutterStage*" "stage")
-    '("Window" "xwindow")
-  )
+(define-method get_angle_end
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_angle_end")
+  (return-type "gdouble")
 )
 
-(define-function clutter_x11_add_filter
-  (c-name "clutter_x11_add_filter")
+(define-method set_angle_tiltx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_angle_tiltx")
   (return-type "none")
   (parameters
-    '("ClutterX11FilterFunc" "func")
-    '("gpointer" "data")
+    '("ClutterRotateAxis" "axis")
+    '("ClutterFixed" "angle_tilt")
   )
 )
 
-(define-function clutter_x11_remove_filter
-  (c-name "clutter_x11_remove_filter")
+(define-method set_angle_tilt
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_angle_tilt")
   (return-type "none")
   (parameters
-    '("ClutterX11FilterFunc" "func")
-    '("gpointer" "data")
+    '("ClutterRotateAxis" "axis")
+    '("gdouble" "angle_tilt")
   )
 )
 
-(define-function clutter_x11_handle_event
-  (c-name "clutter_x11_handle_event")
-  (return-type "ClutterX11FilterReturn")
+(define-method get_angle_tiltx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_angle_tiltx")
+  (return-type "ClutterFixed")
   (parameters
-    '("XEvent*" "xevent")
+    '("ClutterRotateAxis" "axis")
   )
 )
 
-(define-function clutter_x11_set_display
-  (c-name "clutter_x11_set_display")
-  (return-type "none")
+(define-method get_angle_tilt
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_angle_tilt")
+  (return-type "gdouble")
   (parameters
-    '("Display*" "xdpy")
+    '("ClutterRotateAxis" "axis")
   )
 )
 
-(define-function clutter_x11_disable_event_retrieval
-  (c-name "clutter_x11_disable_event_retrieval")
+(define-method set_tilt
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_tilt")
   (return-type "none")
-)
-
-(define-function clutter_x11_has_event_retrieval
-  (c-name "clutter_x11_has_event_retrieval")
-  (return-type "gboolean")
-)
-
-(define-function clutter_x11_get_stage_from_window
-  (c-name "clutter_x11_get_stage_from_window")
-  (return-type "ClutterStage*")
   (parameters
-    '("Window" "win")
+    '("gdouble" "angle_tilt_x")
+    '("gdouble" "angle_tilt_y")
+    '("gdouble" "angle_tilt_z")
   )
 )
 
-(define-function clutter_x11_get_input_devices
-  (c-name "clutter_x11_get_input_devices")
-  (return-type "GSList*")
-)
-
-(define-function clutter_x11_get_input_device_type
-  (c-name "clutter_x11_get_input_device_type")
-  (return-type "ClutterX11InputDeviceType")
+(define-method set_tiltx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_tiltx")
+  (return-type "none")
   (parameters
-    '("ClutterX11XInputDevice*" "device")
+    '("ClutterFixed" "angle_tilt_x")
+    '("ClutterFixed" "angle_tilt_y")
+    '("ClutterFixed" "angle_tilt_z")
   )
 )
 
-(define-function clutter_x11_enable_xinput
-  (c-name "clutter_x11_enable_xinput")
+(define-method get_tilt
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_tilt")
   (return-type "none")
+  (parameters
+    '("gdouble*" "angle_tilt_x")
+    '("gdouble*" "angle_tilt_y")
+    '("gdouble*" "angle_tilt_z")
+  )
 )
 
-(define-function clutter_x11_has_xinput
-  (c-name "clutter_x11_has_xinput")
-  (return-type "gboolean")
-)
-
-(define-function clutter_x11_has_composite_extension
-  (c-name "clutter_x11_has_composite_extension")
-  (return-type "gboolean")
-)
-
-
-
-;; From clutter-x11-enum-types.h
-
-(define-function clutter_x11_filter_return_get_type
-  (c-name "clutter_x11_filter_return_get_type")
-  (return-type "GType")
+(define-method get_tiltx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_tiltx")
+  (return-type "none")
+  (parameters
+    '("ClutterFixed*" "angle_tilt_x")
+    '("ClutterFixed*" "angle_tilt_y")
+    '("ClutterFixed*" "angle_tilt_z")
+  )
 )
 
-(define-function clutter_x11_xinput_event_types_get_type
-  (c-name "clutter_x11_xinput_event_types_get_type")
-  (return-type "GType")
+(define-method get_direction
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_direction")
+  (return-type "ClutterRotateDirection")
 )
 
-(define-function clutter_x11_input_device_type_get_type
-  (c-name "clutter_x11_input_device_type_get_type")
-  (return-type "GType")
+(define-method set_direction
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_direction")
+  (return-type "none")
+  (parameters
+    '("ClutterRotateDirection" "direction")
+  )
 )
 
 

Modified: cluttermm/trunk/clutter/src/clutter_signals.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_signals.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_signals.defs	Fri Jan  9 17:38:28 2009
@@ -36,6 +36,7 @@
   )
 )
 
+; Hand-edited to use more specific event type
 (define-signal button-press-event
   (of-object "ClutterActor")
   (return-type "gboolean")
@@ -45,6 +46,7 @@
   )
 )
 
+; Hand-edited to use more specific event type
 (define-signal button-release-event
   (of-object "ClutterActor")
   (return-type "gboolean")
@@ -54,6 +56,7 @@
   )
 )
 
+; Hand-edited to use more specific event type
 (define-signal scroll-event
   (of-object "ClutterActor")
   (return-type "gboolean")
@@ -63,6 +66,7 @@
   )
 )
 
+; Hand-edited to use more specific event type
 (define-signal key-press-event
   (of-object "ClutterActor")
   (return-type "gboolean")
@@ -72,6 +76,7 @@
   )
 )
 
+; Hand-edited to use more specific event type
 (define-signal key-release-event
   (of-object "ClutterActor")
   (return-type "gboolean")
@@ -81,6 +86,7 @@
   )
 )
 
+; Hand-edited to use more specific event type
 (define-signal motion-event
   (of-object "ClutterActor")
   (return-type "gboolean")
@@ -102,6 +108,7 @@
   (when "last")
 )
 
+; Hand-edited to use more specific event type
 (define-signal enter-event
   (of-object "ClutterActor")
   (return-type "gboolean")
@@ -111,6 +118,7 @@
   )
 )
 
+; Hand-edited to use more specific event type
 (define-signal leave-event
   (of-object "ClutterActor")
   (return-type "gboolean")
@@ -493,6 +501,18 @@
 
 ;; From ClutterBackend
 
+(define-signal resolution-changed
+  (of-object "ClutterBackend")
+  (return-type "void")
+  (when "last")
+)
+
+(define-signal font-changed
+  (of-object "ClutterBackend")
+  (return-type "void")
+  (when "last")
+)
+
 ;; From ClutterBehaviourDepth
 
 (define-property alpha
@@ -1188,31 +1208,30 @@
   (construct-only #f)
 )
 
-;; From ClutterEntry
+;; From ClutterEvent
 
-(define-signal activate
-  (of-object "ClutterEntry")
-  (return-type "void")
-  (when "last")
-)
+;; From ClutterGroup
 
-(define-signal text-changed
-  (of-object "ClutterEntry")
+(define-signal add
+  (of-object "ClutterGroup")
   (return-type "void")
-  (when "last")
+  (when "first")
+  (parameters
+    '("ClutterActor*" "p0")
+  )
 )
 
-(define-signal cursor-event
-  (of-object "ClutterEntry")
+(define-signal remove
+  (of-object "ClutterGroup")
   (return-type "void")
-  (when "last")
+  (when "first")
   (parameters
-    '("ClutterGeometry*" "p0")
+    '("ClutterActor*" "p0")
   )
 )
 
 (define-property name
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamString")
   (docs "Name of the actor")
   (readable #t)
@@ -1221,7 +1240,7 @@
 )
 
 (define-property x
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamInt")
   (docs "X coordinate of the actor")
   (readable #t)
@@ -1230,7 +1249,7 @@
 )
 
 (define-property y
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamInt")
   (docs "Y coordinate of the actor")
   (readable #t)
@@ -1239,7 +1258,7 @@
 )
 
 (define-property width
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamInt")
   (docs "Width of the actor")
   (readable #t)
@@ -1248,7 +1267,7 @@
 )
 
 (define-property height
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamInt")
   (docs "Height of the actor")
   (readable #t)
@@ -1257,7 +1276,7 @@
 )
 
 (define-property fixed-x
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced X position of the actor")
   (readable #t)
@@ -1266,7 +1285,7 @@
 )
 
 (define-property fixed-y
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced Y position of the actor")
   (readable #t)
@@ -1275,7 +1294,7 @@
 )
 
 (define-property fixed-position-set
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamBoolean")
   (docs "Whether to use fixed positioning for the actor")
   (readable #t)
@@ -1284,7 +1303,7 @@
 )
 
 (define-property min-width
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced minimum width request for the actor")
   (readable #t)
@@ -1293,7 +1312,7 @@
 )
 
 (define-property min-width-set
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamBoolean")
   (docs "Whether to use the min-width property")
   (readable #t)
@@ -1302,7 +1321,7 @@
 )
 
 (define-property min-height
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced minimum height request for the actor")
   (readable #t)
@@ -1311,7 +1330,7 @@
 )
 
 (define-property min-height-set
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamBoolean")
   (docs "Whether to use the min-height property")
   (readable #t)
@@ -1320,7 +1339,7 @@
 )
 
 (define-property natural-width
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced natural width request for the actor")
   (readable #t)
@@ -1329,7 +1348,7 @@
 )
 
 (define-property natural-width-set
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamBoolean")
   (docs "Whether to use the natural-width property")
   (readable #t)
@@ -1338,7 +1357,7 @@
 )
 
 (define-property natural-height
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced natural height request for the actor")
   (readable #t)
@@ -1347,7 +1366,7 @@
 )
 
 (define-property natural-height-set
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamBoolean")
   (docs "Whether to use the natural-height property")
   (readable #t)
@@ -1356,7 +1375,7 @@
 )
 
 (define-property request-mode
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamEnum")
   (docs "The actor's request mode")
   (readable #t)
@@ -1365,7 +1384,7 @@
 )
 
 (define-property allocation
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamBoxed")
   (docs "The actor's allocation")
   (readable #t)
@@ -1374,7 +1393,7 @@
 )
 
 (define-property depth
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamInt")
   (docs "Depth of actor")
   (readable #t)
@@ -1383,7 +1402,7 @@
 )
 
 (define-property clip
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamBoxed")
   (docs "The clip region for the actor")
   (readable #t)
@@ -1392,7 +1411,7 @@
 )
 
 (define-property has-clip
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamBoolean")
   (docs "Whether the actor has a clip set or not")
   (readable #t)
@@ -1401,7 +1420,7 @@
 )
 
 (define-property opacity
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamUChar")
   (docs "Opacity of actor")
   (readable #t)
@@ -1410,7 +1429,7 @@
 )
 
 (define-property visible
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamBoolean")
   (docs "Whether the actor is visible or not")
   (readable #t)
@@ -1419,7 +1438,7 @@
 )
 
 (define-property reactive
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamBoolean")
   (docs "Whether the actor is reactive to events or not")
   (readable #t)
@@ -1428,7 +1447,7 @@
 )
 
 (define-property scale-x
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamDouble")
   (docs "Scale factor on the X axis")
   (readable #t)
@@ -1437,7 +1456,7 @@
 )
 
 (define-property scale-y
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamDouble")
   (docs "Scale factor on the Y axis")
   (readable #t)
@@ -1446,7 +1465,7 @@
 )
 
 (define-property rotation-angle-x
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamDouble")
   (docs "The rotation angle on the X axis")
   (readable #t)
@@ -1455,7 +1474,7 @@
 )
 
 (define-property rotation-angle-y
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamDouble")
   (docs "The rotation angle on the Y axis")
   (readable #t)
@@ -1464,7 +1483,7 @@
 )
 
 (define-property rotation-angle-z
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamDouble")
   (docs "The rotation angle on the Z axis")
   (readable #t)
@@ -1473,7 +1492,7 @@
 )
 
 (define-property rotation-center-x
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamBoxed")
   (docs "The rotation center on the X axis")
   (readable #t)
@@ -1482,7 +1501,7 @@
 )
 
 (define-property rotation-center-y
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamBoxed")
   (docs "The rotation center on the Y axis")
   (readable #t)
@@ -1491,7 +1510,7 @@
 )
 
 (define-property rotation-center-z
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamBoxed")
   (docs "The rotation center on the Z axis")
   (readable #t)
@@ -1500,7 +1519,7 @@
 )
 
 (define-property anchor-x
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamInt")
   (docs "X coordinate of the anchor point")
   (readable #t)
@@ -1509,7 +1528,7 @@
 )
 
 (define-property anchor-y
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamInt")
   (docs "Y coordinate of the anchor point")
   (readable #t)
@@ -1518,7 +1537,7 @@
 )
 
 (define-property show-on-set-parent
-  (of-object "ClutterEntry")
+  (of-object "ClutterGroup")
   (prop-type "GParamBoolean")
   (docs "Whether the actor is shown when parented")
   (readable #t)
@@ -1526,120 +1545,90 @@
   (construct-only #f)
 )
 
-(define-property font-name
-  (of-object "ClutterEntry")
-  (prop-type "GParamString")
-  (docs "Pango font description")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
+;; From ClutterMedia
 
-(define-property text
-  (of-object "ClutterEntry")
-  (prop-type "GParamString")
-  (docs "Text to render")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal eos
+  (of-object "ClutterMedia")
+  (return-type "void")
+  (when "last")
 )
 
-(define-property color
-  (of-object "ClutterEntry")
-  (prop-type "ClutterParamSpecColor")
-  (docs "The color of the text")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal error
+  (of-object "ClutterMedia")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("gpointer" "p0")
+  )
 )
 
-(define-property alignment
-  (of-object "ClutterEntry")
-  (prop-type "GParamEnum")
-  (docs "The preferred alignment for the string,")
+(define-property duration
+  (of-object "ClutterMedia")
+  (prop-type "GParamInt")
+  (docs "The duration of the current stream in seconds.")
   (readable #t)
-  (writable #t)
+  (writable #f)
   (construct-only #f)
 )
 
-(define-property position
-  (of-object "ClutterEntry")
-  (prop-type "GParamInt")
-  (docs "The cursor position")
+(define-property volume
+  (of-object "ClutterMedia")
+  (prop-type "GParamDouble")
+  (docs "The audio volume.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property cursor-visible
-  (of-object "ClutterEntry")
+(define-property playing
+  (of-object "ClutterMedia")
   (prop-type "GParamBoolean")
-  (docs "Whether the input cursor is visible")
+  (docs "TRUE if playing.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property text-visible
-  (of-object "ClutterEntry")
-  (prop-type "GParamBoolean")
-  (docs "Whether the text is visible in plain form")
+(define-property uri
+  (of-object "ClutterMedia")
+  (prop-type "GParamString")
+  (docs "The loaded URI.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property max-length
-  (of-object "ClutterEntry")
-  (prop-type "GParamInt")
-  (docs "The maximum length of the entry text")
+(define-property can-seek
+  (of-object "ClutterMedia")
+  (prop-type "GParamBoolean")
+  (docs "TRUE if the current stream is seekable.")
   (readable #t)
-  (writable #t)
+  (writable #f)
   (construct-only #f)
 )
 
-(define-property entry-padding
-  (of-object "ClutterEntry")
-  (prop-type "GParamUInt")
-  (docs "The padding space between the text and the left and right borders")
+(define-property buffer-percent
+  (of-object "ClutterMedia")
+  (prop-type "GParamInt")
+  (docs "The percentage the current stream buffer is filled.")
   (readable #t)
-  (writable #t)
+  (writable #f)
   (construct-only #f)
 )
 
-(define-property x-align
-  (of-object "ClutterEntry")
-  (prop-type "GParamDouble")
-  (docs "The horizontal alignment to be used for the text")
+(define-property position
+  (of-object "ClutterMedia")
+  (prop-type "GParamInt")
+  (docs "The position in the current stream in seconds.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From ClutterEvent
-
-;; From ClutterGroup
-
-(define-signal add
-  (of-object "ClutterGroup")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("ClutterActor*" "p0")
-  )
-)
-
-(define-signal remove
-  (of-object "ClutterGroup")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("ClutterActor*" "p0")
-  )
-)
+;; From ClutterRectangle
 
 (define-property name
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamString")
   (docs "Name of the actor")
   (readable #t)
@@ -1648,7 +1637,7 @@
 )
 
 (define-property x
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamInt")
   (docs "X coordinate of the actor")
   (readable #t)
@@ -1657,7 +1646,7 @@
 )
 
 (define-property y
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamInt")
   (docs "Y coordinate of the actor")
   (readable #t)
@@ -1666,7 +1655,7 @@
 )
 
 (define-property width
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamInt")
   (docs "Width of the actor")
   (readable #t)
@@ -1675,7 +1664,7 @@
 )
 
 (define-property height
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamInt")
   (docs "Height of the actor")
   (readable #t)
@@ -1684,7 +1673,7 @@
 )
 
 (define-property fixed-x
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced X position of the actor")
   (readable #t)
@@ -1693,7 +1682,7 @@
 )
 
 (define-property fixed-y
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced Y position of the actor")
   (readable #t)
@@ -1702,7 +1691,7 @@
 )
 
 (define-property fixed-position-set
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamBoolean")
   (docs "Whether to use fixed positioning for the actor")
   (readable #t)
@@ -1711,7 +1700,7 @@
 )
 
 (define-property min-width
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced minimum width request for the actor")
   (readable #t)
@@ -1720,7 +1709,7 @@
 )
 
 (define-property min-width-set
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamBoolean")
   (docs "Whether to use the min-width property")
   (readable #t)
@@ -1729,7 +1718,7 @@
 )
 
 (define-property min-height
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced minimum height request for the actor")
   (readable #t)
@@ -1738,7 +1727,7 @@
 )
 
 (define-property min-height-set
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamBoolean")
   (docs "Whether to use the min-height property")
   (readable #t)
@@ -1747,7 +1736,7 @@
 )
 
 (define-property natural-width
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced natural width request for the actor")
   (readable #t)
@@ -1756,7 +1745,7 @@
 )
 
 (define-property natural-width-set
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamBoolean")
   (docs "Whether to use the natural-width property")
   (readable #t)
@@ -1765,7 +1754,7 @@
 )
 
 (define-property natural-height
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced natural height request for the actor")
   (readable #t)
@@ -1774,7 +1763,7 @@
 )
 
 (define-property natural-height-set
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamBoolean")
   (docs "Whether to use the natural-height property")
   (readable #t)
@@ -1783,7 +1772,7 @@
 )
 
 (define-property request-mode
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamEnum")
   (docs "The actor's request mode")
   (readable #t)
@@ -1792,7 +1781,7 @@
 )
 
 (define-property allocation
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamBoxed")
   (docs "The actor's allocation")
   (readable #t)
@@ -1801,7 +1790,7 @@
 )
 
 (define-property depth
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamInt")
   (docs "Depth of actor")
   (readable #t)
@@ -1810,7 +1799,7 @@
 )
 
 (define-property clip
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamBoxed")
   (docs "The clip region for the actor")
   (readable #t)
@@ -1819,7 +1808,7 @@
 )
 
 (define-property has-clip
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamBoolean")
   (docs "Whether the actor has a clip set or not")
   (readable #t)
@@ -1828,7 +1817,7 @@
 )
 
 (define-property opacity
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamUChar")
   (docs "Opacity of actor")
   (readable #t)
@@ -1837,7 +1826,7 @@
 )
 
 (define-property visible
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamBoolean")
   (docs "Whether the actor is visible or not")
   (readable #t)
@@ -1846,7 +1835,7 @@
 )
 
 (define-property reactive
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamBoolean")
   (docs "Whether the actor is reactive to events or not")
   (readable #t)
@@ -1855,7 +1844,7 @@
 )
 
 (define-property scale-x
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamDouble")
   (docs "Scale factor on the X axis")
   (readable #t)
@@ -1864,7 +1853,7 @@
 )
 
 (define-property scale-y
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamDouble")
   (docs "Scale factor on the Y axis")
   (readable #t)
@@ -1873,7 +1862,7 @@
 )
 
 (define-property rotation-angle-x
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamDouble")
   (docs "The rotation angle on the X axis")
   (readable #t)
@@ -1882,7 +1871,7 @@
 )
 
 (define-property rotation-angle-y
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamDouble")
   (docs "The rotation angle on the Y axis")
   (readable #t)
@@ -1891,7 +1880,7 @@
 )
 
 (define-property rotation-angle-z
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamDouble")
   (docs "The rotation angle on the Z axis")
   (readable #t)
@@ -1900,7 +1889,7 @@
 )
 
 (define-property rotation-center-x
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamBoxed")
   (docs "The rotation center on the X axis")
   (readable #t)
@@ -1909,7 +1898,7 @@
 )
 
 (define-property rotation-center-y
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamBoxed")
   (docs "The rotation center on the Y axis")
   (readable #t)
@@ -1918,7 +1907,7 @@
 )
 
 (define-property rotation-center-z
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamBoxed")
   (docs "The rotation center on the Z axis")
   (readable #t)
@@ -1927,7 +1916,7 @@
 )
 
 (define-property anchor-x
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamInt")
   (docs "X coordinate of the anchor point")
   (readable #t)
@@ -1936,7 +1925,7 @@
 )
 
 (define-property anchor-y
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamInt")
   (docs "Y coordinate of the anchor point")
   (readable #t)
@@ -1945,7 +1934,7 @@
 )
 
 (define-property show-on-set-parent
-  (of-object "ClutterGroup")
+  (of-object "ClutterRectangle")
   (prop-type "GParamBoolean")
   (docs "Whether the actor is shown when parented")
   (readable #t)
@@ -1953,497 +1942,137 @@
   (construct-only #f)
 )
 
-;; From ClutterLabel
-
-(define-property name
-  (of-object "ClutterLabel")
-  (prop-type "GParamString")
-  (docs "Name of the actor")
+(define-property color
+  (of-object "ClutterRectangle")
+  (prop-type "ClutterParamSpecColor")
+  (docs "The color of the rectangle")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property x
-  (of-object "ClutterLabel")
-  (prop-type "GParamInt")
-  (docs "X coordinate of the actor")
+(define-property border-color
+  (of-object "ClutterRectangle")
+  (prop-type "ClutterParamSpecColor")
+  (docs "The color of the border of the rectangle")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property y
-  (of-object "ClutterLabel")
-  (prop-type "GParamInt")
-  (docs "Y coordinate of the actor")
+(define-property border-width
+  (of-object "ClutterRectangle")
+  (prop-type "GParamUInt")
+  (docs "The width of the border of the rectangle")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property width
-  (of-object "ClutterLabel")
-  (prop-type "GParamInt")
-  (docs "Width of the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property height
-  (of-object "ClutterLabel")
-  (prop-type "GParamInt")
-  (docs "Height of the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property fixed-x
-  (of-object "ClutterLabel")
-  (prop-type "ClutterParamSpecUnit")
-  (docs "Forced X position of the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property fixed-y
-  (of-object "ClutterLabel")
-  (prop-type "ClutterParamSpecUnit")
-  (docs "Forced Y position of the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property fixed-position-set
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use fixed positioning for the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property min-width
-  (of-object "ClutterLabel")
-  (prop-type "ClutterParamSpecUnit")
-  (docs "Forced minimum width request for the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property min-width-set
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the min-width property")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property min-height
-  (of-object "ClutterLabel")
-  (prop-type "ClutterParamSpecUnit")
-  (docs "Forced minimum height request for the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property min-height-set
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the min-height property")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property natural-width
-  (of-object "ClutterLabel")
-  (prop-type "ClutterParamSpecUnit")
-  (docs "Forced natural width request for the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property natural-width-set
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the natural-width property")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property natural-height
-  (of-object "ClutterLabel")
-  (prop-type "ClutterParamSpecUnit")
-  (docs "Forced natural height request for the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property natural-height-set
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the natural-height property")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property request-mode
-  (of-object "ClutterLabel")
-  (prop-type "GParamEnum")
-  (docs "The actor's request mode")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property allocation
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoxed")
-  (docs "The actor's allocation")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property depth
-  (of-object "ClutterLabel")
-  (prop-type "GParamInt")
-  (docs "Depth of actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property clip
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoxed")
-  (docs "The clip region for the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property has-clip
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor has a clip set or not")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property opacity
-  (of-object "ClutterLabel")
-  (prop-type "GParamUChar")
-  (docs "Opacity of actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property visible
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is visible or not")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property reactive
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is reactive to events or not")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property scale-x
-  (of-object "ClutterLabel")
-  (prop-type "GParamDouble")
-  (docs "Scale factor on the X axis")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property scale-y
-  (of-object "ClutterLabel")
-  (prop-type "GParamDouble")
-  (docs "Scale factor on the Y axis")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property rotation-angle-x
-  (of-object "ClutterLabel")
-  (prop-type "GParamDouble")
-  (docs "The rotation angle on the X axis")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property rotation-angle-y
-  (of-object "ClutterLabel")
-  (prop-type "GParamDouble")
-  (docs "The rotation angle on the Y axis")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property rotation-angle-z
-  (of-object "ClutterLabel")
-  (prop-type "GParamDouble")
-  (docs "The rotation angle on the Z axis")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property rotation-center-x
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoxed")
-  (docs "The rotation center on the X axis")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property rotation-center-y
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoxed")
-  (docs "The rotation center on the Y axis")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property rotation-center-z
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoxed")
-  (docs "The rotation center on the Z axis")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property anchor-x
-  (of-object "ClutterLabel")
-  (prop-type "GParamInt")
-  (docs "X coordinate of the anchor point")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property anchor-y
-  (of-object "ClutterLabel")
-  (prop-type "GParamInt")
-  (docs "Y coordinate of the anchor point")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property show-on-set-parent
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is shown when parented")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property font-name
-  (of-object "ClutterLabel")
-  (prop-type "GParamString")
-  (docs "The font to be used by the label")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property text
-  (of-object "ClutterLabel")
-  (prop-type "GParamString")
-  (docs "The text to render")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property color
-  (of-object "ClutterLabel")
-  (prop-type "ClutterParamSpecColor")
-  (docs "Color of the font used by the label")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property attributes
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoxed")
-  (docs "A list of style attributes to apply to the text of the label")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property use-markup
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the text of the label includes Pango markup")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property alignment
-  (of-object "ClutterLabel")
-  (prop-type "GParamEnum")
-  (docs "The preferred alignment for the string, for multi-line text")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property wrap
-  (of-object "ClutterLabel")
+(define-property has-border
+  (of-object "ClutterRectangle")
   (prop-type "GParamBoolean")
-  (docs "If set, wrap the lines if the text becomes too wide")
+  (docs "Whether the rectangle should have a border")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property wrap-mode
-  (of-object "ClutterLabel")
-  (prop-type "GParamEnum")
-  (docs "Control how line-wrapping is done")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
+;; From ClutterScore
 
-(define-property justify
-  (of-object "ClutterLabel")
-  (prop-type "GParamBoolean")
-  (docs "Whether the contents of the label should be justified")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal timeline-started
+  (of-object "ClutterScore")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("ClutterTimeline*" "p0")
+  )
 )
 
-(define-property ellipsize
-  (of-object "ClutterLabel")
-  (prop-type "GParamEnum")
-  (docs "The preferred place to ellipsize the string, if the label does not have enough room to display the entire string")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal timeline-completed
+  (of-object "ClutterScore")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("ClutterTimeline*" "p0")
+  )
 )
 
-;; From ClutterMedia
+(define-signal completed
+  (of-object "ClutterScore")
+  (return-type "void")
+  (when "last")
+)
 
-(define-signal eos
-  (of-object "ClutterMedia")
+(define-signal started
+  (of-object "ClutterScore")
   (return-type "void")
   (when "last")
 )
 
-(define-signal error
-  (of-object "ClutterMedia")
+(define-signal paused
+  (of-object "ClutterScore")
   (return-type "void")
   (when "last")
-  (parameters
-    '("gpointer" "p0")
-  )
 )
 
-(define-property playing
-  (of-object "ClutterMedia")
+(define-property loop
+  (of-object "ClutterScore")
   (prop-type "GParamBoolean")
-  (docs "TRUE if playing.")
+  (docs "Whether the score should restart once finished")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property buffer-percent
-  (of-object "ClutterMedia")
-  (prop-type "GParamInt")
-  (docs "The percentage the current stream buffer is filled.")
+;; From ClutterScript
+
+(define-property filename-set
+  (of-object "ClutterScript")
+  (prop-type "GParamBoolean")
+  (docs "Whether the :filename property is set")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property uri
-  (of-object "ClutterMedia")
+(define-property filename
+  (of-object "ClutterScript")
   (prop-type "GParamString")
-  (docs "The loaded URI.")
+  (docs "The path of the currently parsed file")
   (readable #t)
-  (writable #t)
+  (writable #f)
   (construct-only #f)
 )
 
-(define-property volume
-  (of-object "ClutterMedia")
-  (prop-type "GParamDouble")
-  (docs "The audio volume.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
+;; From ClutterStage
 
-(define-property position
-  (of-object "ClutterMedia")
-  (prop-type "GParamInt")
-  (docs "The position in the current stream in seconds.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal fullscreen
+  (of-object "ClutterStage")
+  (return-type "void")
+  (when "first")
 )
 
-(define-property can-seek
-  (of-object "ClutterMedia")
-  (prop-type "GParamBoolean")
-  (docs "TRUE if the current stream is seekable.")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
+(define-signal unfullscreen
+  (of-object "ClutterStage")
+  (return-type "void")
+  (when "last")
 )
 
-(define-property duration
-  (of-object "ClutterMedia")
-  (prop-type "GParamInt")
-  (docs "The duration of the current stream in seconds.")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
+(define-signal activate
+  (of-object "ClutterStage")
+  (return-type "void")
+  (when "last")
 )
 
-;; From ClutterRectangle
+(define-signal deactivate
+  (of-object "ClutterStage")
+  (return-type "void")
+  (when "last")
+)
 
 (define-property name
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamString")
   (docs "Name of the actor")
   (readable #t)
@@ -2452,7 +2081,7 @@
 )
 
 (define-property x
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamInt")
   (docs "X coordinate of the actor")
   (readable #t)
@@ -2461,7 +2090,7 @@
 )
 
 (define-property y
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamInt")
   (docs "Y coordinate of the actor")
   (readable #t)
@@ -2470,7 +2099,7 @@
 )
 
 (define-property width
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamInt")
   (docs "Width of the actor")
   (readable #t)
@@ -2479,7 +2108,7 @@
 )
 
 (define-property height
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamInt")
   (docs "Height of the actor")
   (readable #t)
@@ -2488,7 +2117,7 @@
 )
 
 (define-property fixed-x
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced X position of the actor")
   (readable #t)
@@ -2497,7 +2126,7 @@
 )
 
 (define-property fixed-y
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced Y position of the actor")
   (readable #t)
@@ -2506,7 +2135,7 @@
 )
 
 (define-property fixed-position-set
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamBoolean")
   (docs "Whether to use fixed positioning for the actor")
   (readable #t)
@@ -2515,7 +2144,7 @@
 )
 
 (define-property min-width
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced minimum width request for the actor")
   (readable #t)
@@ -2524,7 +2153,7 @@
 )
 
 (define-property min-width-set
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamBoolean")
   (docs "Whether to use the min-width property")
   (readable #t)
@@ -2533,7 +2162,7 @@
 )
 
 (define-property min-height
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced minimum height request for the actor")
   (readable #t)
@@ -2542,7 +2171,7 @@
 )
 
 (define-property min-height-set
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamBoolean")
   (docs "Whether to use the min-height property")
   (readable #t)
@@ -2551,7 +2180,7 @@
 )
 
 (define-property natural-width
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced natural width request for the actor")
   (readable #t)
@@ -2560,7 +2189,7 @@
 )
 
 (define-property natural-width-set
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamBoolean")
   (docs "Whether to use the natural-width property")
   (readable #t)
@@ -2569,7 +2198,7 @@
 )
 
 (define-property natural-height
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced natural height request for the actor")
   (readable #t)
@@ -2578,7 +2207,7 @@
 )
 
 (define-property natural-height-set
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamBoolean")
   (docs "Whether to use the natural-height property")
   (readable #t)
@@ -2587,7 +2216,7 @@
 )
 
 (define-property request-mode
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamEnum")
   (docs "The actor's request mode")
   (readable #t)
@@ -2596,7 +2225,7 @@
 )
 
 (define-property allocation
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamBoxed")
   (docs "The actor's allocation")
   (readable #t)
@@ -2605,7 +2234,7 @@
 )
 
 (define-property depth
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamInt")
   (docs "Depth of actor")
   (readable #t)
@@ -2614,7 +2243,7 @@
 )
 
 (define-property clip
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamBoxed")
   (docs "The clip region for the actor")
   (readable #t)
@@ -2623,7 +2252,7 @@
 )
 
 (define-property has-clip
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamBoolean")
   (docs "Whether the actor has a clip set or not")
   (readable #t)
@@ -2632,7 +2261,7 @@
 )
 
 (define-property opacity
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamUChar")
   (docs "Opacity of actor")
   (readable #t)
@@ -2641,7 +2270,7 @@
 )
 
 (define-property visible
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamBoolean")
   (docs "Whether the actor is visible or not")
   (readable #t)
@@ -2650,7 +2279,7 @@
 )
 
 (define-property reactive
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamBoolean")
   (docs "Whether the actor is reactive to events or not")
   (readable #t)
@@ -2659,7 +2288,7 @@
 )
 
 (define-property scale-x
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamDouble")
   (docs "Scale factor on the X axis")
   (readable #t)
@@ -2668,7 +2297,7 @@
 )
 
 (define-property scale-y
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamDouble")
   (docs "Scale factor on the Y axis")
   (readable #t)
@@ -2677,7 +2306,7 @@
 )
 
 (define-property rotation-angle-x
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamDouble")
   (docs "The rotation angle on the X axis")
   (readable #t)
@@ -2686,7 +2315,7 @@
 )
 
 (define-property rotation-angle-y
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamDouble")
   (docs "The rotation angle on the Y axis")
   (readable #t)
@@ -2695,7 +2324,7 @@
 )
 
 (define-property rotation-angle-z
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamDouble")
   (docs "The rotation angle on the Z axis")
   (readable #t)
@@ -2704,7 +2333,7 @@
 )
 
 (define-property rotation-center-x
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamBoxed")
   (docs "The rotation center on the X axis")
   (readable #t)
@@ -2713,7 +2342,7 @@
 )
 
 (define-property rotation-center-y
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamBoxed")
   (docs "The rotation center on the Y axis")
   (readable #t)
@@ -2722,7 +2351,7 @@
 )
 
 (define-property rotation-center-z
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamBoxed")
   (docs "The rotation center on the Z axis")
   (readable #t)
@@ -2731,7 +2360,7 @@
 )
 
 (define-property anchor-x
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamInt")
   (docs "X coordinate of the anchor point")
   (readable #t)
@@ -2740,154 +2369,121 @@
 )
 
 (define-property anchor-y
-  (of-object "ClutterRectangle")
+  (of-object "ClutterStage")
   (prop-type "GParamInt")
   (docs "Y coordinate of the anchor point")
   (readable #t)
   (writable #t)
-  (construct-only #f)
-)
-
-(define-property show-on-set-parent
-  (of-object "ClutterRectangle")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is shown when parented")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property color
-  (of-object "ClutterRectangle")
-  (prop-type "ClutterParamSpecColor")
-  (docs "The color of the rectangle")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property border-color
-  (of-object "ClutterRectangle")
-  (prop-type "ClutterParamSpecColor")
-  (docs "The color of the border of the rectangle")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property border-width
-  (of-object "ClutterRectangle")
-  (prop-type "GParamUInt")
-  (docs "The width of the border of the rectangle")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property has-border
-  (of-object "ClutterRectangle")
-  (prop-type "GParamBoolean")
-  (docs "Whether the rectangle should have a border")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From ClutterScore
-
-(define-signal timeline-started
-  (of-object "ClutterScore")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("ClutterTimeline*" "p0")
-  )
-)
-
-(define-signal timeline-completed
-  (of-object "ClutterScore")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("ClutterTimeline*" "p0")
-  )
+  (construct-only #f)
 )
 
-(define-signal completed
-  (of-object "ClutterScore")
-  (return-type "void")
-  (when "last")
+(define-property show-on-set-parent
+  (of-object "ClutterStage")
+  (prop-type "GParamBoolean")
+  (docs "Whether the actor is shown when parented")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-(define-signal started
-  (of-object "ClutterScore")
-  (return-type "void")
-  (when "last")
+(define-property color
+  (of-object "ClutterStage")
+  (prop-type "ClutterParamSpecColor")
+  (docs "The color of the stage")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-(define-signal paused
-  (of-object "ClutterScore")
-  (return-type "void")
-  (when "last")
+(define-property fullscreen
+  (of-object "ClutterStage")
+  (prop-type "GParamBoolean")
+  (docs "Whether the main stage is fullscreen")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-(define-property loop
-  (of-object "ClutterScore")
+(define-property offscreen
+  (of-object "ClutterStage")
   (prop-type "GParamBoolean")
-  (docs "Whether the score should restart once finished")
+  (docs "Whether the main stage is renderer offscreen")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From ClutterScript
-
-(define-property filename-set
-  (of-object "ClutterScript")
+(define-property cursor-visible
+  (of-object "ClutterStage")
   (prop-type "GParamBoolean")
-  (docs "Whether the :filename property is set")
+  (docs "Whether the mouse pointer is visible on the main stage ")
   (readable #t)
-  (writable #f)
+  (writable #t)
   (construct-only #f)
 )
 
-(define-property filename
-  (of-object "ClutterScript")
-  (prop-type "GParamString")
-  (docs "The path of the currently parsed file")
+(define-property perspective
+  (of-object "ClutterStage")
+  (prop-type "GParamBoxed")
+  (docs "Perspective projection parameters")
   (readable #t)
-  (writable #f)
+  (writable #t)
   (construct-only #f)
 )
 
-;; From ClutterStage
+(define-property title
+  (of-object "ClutterStage")
+  (prop-type "GParamString")
+  (docs "Stage Title")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
 
-(define-signal fullscreen
+(define-property user-resizable
   (of-object "ClutterStage")
-  (return-type "void")
-  (when "first")
+  (prop-type "GParamBoolean")
+  (docs "Whether the stage is able to be resized via user interaction")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-(define-signal unfullscreen
+(define-property use-fog
   (of-object "ClutterStage")
+  (prop-type "GParamBoolean")
+  (docs "Whether to enable depth cueing")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From ClutterText
+
+(define-signal activate
+  (of-object "ClutterText")
   (return-type "void")
   (when "last")
 )
 
-(define-signal activate
-  (of-object "ClutterStage")
+(define-signal text-changed
+  (of-object "ClutterText")
   (return-type "void")
   (when "last")
 )
 
-(define-signal deactivate
-  (of-object "ClutterStage")
+; Hand-edited to add constness
+(define-signal cursor-event
+  (of-object "ClutterText")
   (return-type "void")
   (when "last")
+  (parameters
+    '("const-ClutterGeometry*" "p0")
+  )
 )
 
 (define-property name
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamString")
   (docs "Name of the actor")
   (readable #t)
@@ -2896,7 +2492,7 @@
 )
 
 (define-property x
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamInt")
   (docs "X coordinate of the actor")
   (readable #t)
@@ -2905,7 +2501,7 @@
 )
 
 (define-property y
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamInt")
   (docs "Y coordinate of the actor")
   (readable #t)
@@ -2914,7 +2510,7 @@
 )
 
 (define-property width
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamInt")
   (docs "Width of the actor")
   (readable #t)
@@ -2923,7 +2519,7 @@
 )
 
 (define-property height
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamInt")
   (docs "Height of the actor")
   (readable #t)
@@ -2932,7 +2528,7 @@
 )
 
 (define-property fixed-x
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced X position of the actor")
   (readable #t)
@@ -2941,7 +2537,7 @@
 )
 
 (define-property fixed-y
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced Y position of the actor")
   (readable #t)
@@ -2950,7 +2546,7 @@
 )
 
 (define-property fixed-position-set
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamBoolean")
   (docs "Whether to use fixed positioning for the actor")
   (readable #t)
@@ -2959,7 +2555,7 @@
 )
 
 (define-property min-width
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced minimum width request for the actor")
   (readable #t)
@@ -2968,7 +2564,7 @@
 )
 
 (define-property min-width-set
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamBoolean")
   (docs "Whether to use the min-width property")
   (readable #t)
@@ -2977,7 +2573,7 @@
 )
 
 (define-property min-height
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced minimum height request for the actor")
   (readable #t)
@@ -2986,7 +2582,7 @@
 )
 
 (define-property min-height-set
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamBoolean")
   (docs "Whether to use the min-height property")
   (readable #t)
@@ -2995,7 +2591,7 @@
 )
 
 (define-property natural-width
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced natural width request for the actor")
   (readable #t)
@@ -3004,7 +2600,7 @@
 )
 
 (define-property natural-width-set
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamBoolean")
   (docs "Whether to use the natural-width property")
   (readable #t)
@@ -3013,7 +2609,7 @@
 )
 
 (define-property natural-height
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "ClutterParamSpecUnit")
   (docs "Forced natural height request for the actor")
   (readable #t)
@@ -3022,7 +2618,7 @@
 )
 
 (define-property natural-height-set
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamBoolean")
   (docs "Whether to use the natural-height property")
   (readable #t)
@@ -3031,7 +2627,7 @@
 )
 
 (define-property request-mode
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamEnum")
   (docs "The actor's request mode")
   (readable #t)
@@ -3040,7 +2636,7 @@
 )
 
 (define-property allocation
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamBoxed")
   (docs "The actor's allocation")
   (readable #t)
@@ -3049,7 +2645,7 @@
 )
 
 (define-property depth
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamInt")
   (docs "Depth of actor")
   (readable #t)
@@ -3058,7 +2654,7 @@
 )
 
 (define-property clip
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamBoxed")
   (docs "The clip region for the actor")
   (readable #t)
@@ -3067,7 +2663,7 @@
 )
 
 (define-property has-clip
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamBoolean")
   (docs "Whether the actor has a clip set or not")
   (readable #t)
@@ -3076,7 +2672,7 @@
 )
 
 (define-property opacity
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamUChar")
   (docs "Opacity of actor")
   (readable #t)
@@ -3085,7 +2681,7 @@
 )
 
 (define-property visible
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamBoolean")
   (docs "Whether the actor is visible or not")
   (readable #t)
@@ -3094,7 +2690,7 @@
 )
 
 (define-property reactive
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamBoolean")
   (docs "Whether the actor is reactive to events or not")
   (readable #t)
@@ -3103,7 +2699,7 @@
 )
 
 (define-property scale-x
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamDouble")
   (docs "Scale factor on the X axis")
   (readable #t)
@@ -3112,7 +2708,7 @@
 )
 
 (define-property scale-y
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamDouble")
   (docs "Scale factor on the Y axis")
   (readable #t)
@@ -3121,7 +2717,7 @@
 )
 
 (define-property rotation-angle-x
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamDouble")
   (docs "The rotation angle on the X axis")
   (readable #t)
@@ -3130,7 +2726,7 @@
 )
 
 (define-property rotation-angle-y
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamDouble")
   (docs "The rotation angle on the Y axis")
   (readable #t)
@@ -3139,7 +2735,7 @@
 )
 
 (define-property rotation-angle-z
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamDouble")
   (docs "The rotation angle on the Z axis")
   (readable #t)
@@ -3148,7 +2744,7 @@
 )
 
 (define-property rotation-center-x
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamBoxed")
   (docs "The rotation center on the X axis")
   (readable #t)
@@ -3157,7 +2753,7 @@
 )
 
 (define-property rotation-center-y
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamBoxed")
   (docs "The rotation center on the Y axis")
   (readable #t)
@@ -3166,7 +2762,7 @@
 )
 
 (define-property rotation-center-z
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamBoxed")
   (docs "The rotation center on the Z axis")
   (readable #t)
@@ -3175,7 +2771,7 @@
 )
 
 (define-property anchor-x
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamInt")
   (docs "X coordinate of the anchor point")
   (readable #t)
@@ -3184,7 +2780,7 @@
 )
 
 (define-property anchor-y
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamInt")
   (docs "Y coordinate of the anchor point")
   (readable #t)
@@ -3193,7 +2789,7 @@
 )
 
 (define-property show-on-set-parent
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamBoolean")
   (docs "Whether the actor is shown when parented")
   (readable #t)
@@ -3201,73 +2797,199 @@
   (construct-only #f)
 )
 
+(define-property font-name
+  (of-object "ClutterText")
+  (prop-type "GParamString")
+  (docs "The font to be used by the text")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property text
+  (of-object "ClutterText")
+  (prop-type "GParamString")
+  (docs "The text to render")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property color
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "ClutterParamSpecColor")
-  (docs "The color of the stage")
+  (docs "Color of the font used by the text")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property fullscreen
-  (of-object "ClutterStage")
+(define-property use-markup
+  (of-object "ClutterText")
   (prop-type "GParamBoolean")
-  (docs "Whether the main stage is fullscreen")
+  (docs "Whether or not the text includes Pango markup")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property offscreen
-  (of-object "ClutterStage")
+(define-property attributes
+  (of-object "ClutterText")
+  (prop-type "GParamBoxed")
+  (docs "A list of style attributes to apply to the contents of the actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property alignment
+  (of-object "ClutterText")
+  (prop-type "GParamEnum")
+  (docs "The preferred alignment for the string, for multi-line text")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property line-wrap
+  (of-object "ClutterText")
   (prop-type "GParamBoolean")
-  (docs "Whether the main stage is renderer offscreen")
+  (docs "If set, wrap the lines if the text becomes too wide")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property line-wrap-mode
+  (of-object "ClutterText")
+  (prop-type "GParamEnum")
+  (docs "Control how line-wrapping is done")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property justify
+  (of-object "ClutterText")
+  (prop-type "GParamBoolean")
+  (docs "Whether the text should be justified")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property ellipsize
+  (of-object "ClutterText")
+  (prop-type "GParamEnum")
+  (docs "The preferred place to ellipsize the string")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property position
+  (of-object "ClutterText")
+  (prop-type "GParamInt")
+  (docs "The cursor position")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property selection-bound
+  (of-object "ClutterText")
+  (prop-type "GParamInt")
+  (docs "The cursor position of the other end of the selection")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
 (define-property cursor-visible
-  (of-object "ClutterStage")
+  (of-object "ClutterText")
   (prop-type "GParamBoolean")
-  (docs "Whether the mouse pointer is visible on the main stage ")
+  (docs "Whether the input cursor is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property perspective
-  (of-object "ClutterStage")
-  (prop-type "GParamBoxed")
-  (docs "Perspective projection parameters")
+(define-property cursor-color
+  (of-object "ClutterText")
+  (prop-type "ClutterParamSpecColor")
+  (docs "Cursor Color")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property title
-  (of-object "ClutterStage")
-  (prop-type "GParamString")
-  (docs "Stage Title")
+(define-property cursor-color-set
+  (of-object "ClutterText")
+  (prop-type "GParamBoolean")
+  (docs "Whether the cursor color has been set")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property cursor-size
+  (of-object "ClutterText")
+  (prop-type "GParamInt")
+  (docs "The width of the cursor, in pixels")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property user-resizable
-  (of-object "ClutterStage")
+(define-property editable
+  (of-object "ClutterText")
   (prop-type "GParamBoolean")
-  (docs "Whether the stage is able to be resized via user interaction")
+  (docs "Whether the text is editable")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-fog
-  (of-object "ClutterStage")
+(define-property selectable
+  (of-object "ClutterText")
   (prop-type "GParamBoolean")
-  (docs "Whether to enable depth cueing")
+  (docs "Whether the text is selectable")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property activatable
+  (of-object "ClutterText")
+  (prop-type "GParamBoolean")
+  (docs "Whether pressing return causes the activate signal to be emitted")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property password-char
+  (of-object "ClutterText")
+  (prop-type "GParamUnichar")
+  (docs "If non-zero, use this character to display the actor's contents")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property max-length
+  (of-object "ClutterText")
+  (prop-type "GParamInt")
+  (docs "Maximum length of the text inside the actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property single-line-mode
+  (of-object "ClutterText")
+  (prop-type "GParamBoolean")
+  (docs "Whether the text should be a single line")
   (readable #t)
   (writable #t)
   (construct-only #f)

Modified: cluttermm/trunk/clutter/src/clutter_vfuncs.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_vfuncs.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_vfuncs.defs	Fri Jan  9 17:38:28 2009
@@ -130,14 +130,6 @@
   (return-type "int")
 )
 
-; ClutterEntry
-
-(define-vfunc paint_cursor
-  (of-object "ClutterEntry")
-  (return-type "void")
-)
-
-
 ; ClutterBehaviour
 
 (define-vfunc alpha_notify
@@ -306,6 +298,7 @@
     '("ClutterActor*" "actor")
   )
 )
+
 (define-vfunc get_child_meta
   (of-object "ClutterContainer")
   (return-type "ClutterChildMeta*")

Added: cluttermm/trunk/clutter/src/text.ccg
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter/src/text.ccg	Fri Jan  9 17:38:28 2009
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2009  The cluttermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <clutter/clutter.h>
+
+namespace Clutter
+{
+
+Color Text::get_color() const
+{
+  Color color;
+  clutter_text_get_color(const_cast<ClutterText*>(gobj()), color.gobj());
+  return color;
+}
+
+} // namespace Clutter

Added: cluttermm/trunk/clutter/src/text.hg
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter/src/text.hg	Fri Jan  9 17:38:28 2009
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2009  The cluttermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <cluttermm/actor.h>
+#include <cluttermm/color.h>
+#include <pangomm.h>
+ 
+_DEFS(cluttermm,clutter)
+_PINCLUDE(cluttermm/private/actor_p.h)
+
+namespace Clutter
+{
+
+class Text : public Actor
+{
+  _CLASS_GOBJECT(Text, ClutterText, CLUTTER_TEXT, Actor, ClutterActor)
+
+protected:
+  _CTOR_DEFAULT()
+  _WRAP_CTOR(Text(const Glib::ustring& font_name, const Glib::ustring& text), clutter_text_new_with_text)
+  _WRAP_CTOR(Text(const Glib::ustring& font_name, const Glib::ustring& text, const Color& color), clutter_text_new_full)
+
+public:
+  _WRAP_CREATE()
+  _WRAP_CREATE(const Glib::ustring& font_name, const Glib::ustring& text)
+  _WRAP_CREATE(const Glib::ustring& font_name, const Glib::ustring& text, const Color& color)
+
+#m4 dnl _CONVERSION(`ClutterActor*',`Glib::RefPtr<Text>',`Glib::wrap((ClutterText*)$3)')
+
+  _WRAP_METHOD(void set_text(const Glib::ustring& text), clutter_text_set_text)
+  _WRAP_METHOD(Glib::ustring get_text() const, clutter_text_get_text)
+  _WRAP_METHOD(void set_font_name(const Glib::ustring& font_name), clutter_text_set_font_name)
+  _WRAP_METHOD(Glib::ustring get_font_name() const, clutter_text_get_font_name)
+
+  _WRAP_METHOD(void set_color(const Color& color), clutter_text_set_color)
+  _WRAP_METHOD_DOCS_ONLY(clutter_text_get_color)
+  Color get_color() const;
+  _IGNORE(clutter_text_get_color)
+
+  _WRAP_METHOD(Glib::RefPtr<Pango::Layout> get_layout(), clutter_text_get_layout)
+  _WRAP_METHOD(Glib::RefPtr<const Pango::Layout> get_layout() const, clutter_text_get_layout, constversion)
+
+  _WRAP_METHOD(Pango::Alignment get_alignment() const, clutter_text_get_alignment)
+  _WRAP_METHOD(void set_alignment(Pango::Alignment wrap_mode), clutter_text_set_alignment)
+
+  _WRAP_METHOD(int get_cursor_position() const, clutter_text_get_cursor_position)
+  _WRAP_METHOD(void set_cursor_position(int position), clutter_text_set_cursor_position)
+
+  _WRAP_METHOD(void insert(gunichar wc), clutter_text_insert_unichar)
+  _WRAP_METHOD(void insert(const Glib::ustring& text, gssize position), clutter_text_insert_text)
+
+  _WRAP_METHOD(void delete_chars(guint len), clutter_text_delete_chars)
+  _WRAP_METHOD(void delete_text(gssize start_pos, gssize end_pos), clutter_text_delete_text)
+
+  _WRAP_METHOD(void set_cursor_visible(bool visible), clutter_text_set_cursor_visible)
+  _WRAP_METHOD(bool get_cursor_visible() const, clutter_text_get_cursor_visible)
+
+  _WRAP_METHOD(void set_password_char(gunichar wc), clutter_text_set_password_char)
+  _WRAP_METHOD(gunichar get_password_char() const, clutter_text_get_password_char)
+
+  _WRAP_METHOD(int get_max_length() const, clutter_text_get_max_length)
+  _WRAP_METHOD(void set_max_length(int max_length), clutter_text_set_max_length)
+
+  _WRAP_SIGNAL(void activate(), "activate")
+  _WRAP_SIGNAL(void text_changed(), "text_changed")
+  _WRAP_SIGNAL(void cursor_event(const Geometry& geometry), "cursor_event")
+
+  _WRAP_PROPERTY("font-name", Glib::ustring)
+  _WRAP_PROPERTY("text", Glib::ustring)
+  _WRAP_PROPERTY("color", Color)
+  _WRAP_PROPERTY("editable", bool)
+  _WRAP_PROPERTY("selectable", bool)
+  _WRAP_PROPERTY("activatable", bool)
+  _WRAP_PROPERTY("cursor-visible", bool)
+  _WRAP_PROPERTY("cursor-color", Color)
+  _WRAP_PROPERTY("cursor-color-set", bool)
+  _WRAP_PROPERTY("cursor-size", int)
+  _WRAP_PROPERTY("position", int)
+  _WRAP_PROPERTY("selection-bound", int)
+  _WRAP_PROPERTY("attributes", Pango::AttrList)
+  _WRAP_PROPERTY("use-markup", bool)
+  _WRAP_PROPERTY("line-wrap", bool)
+  _WRAP_PROPERTY("line-wrap-mode", Pango::WrapMode)
+  _WRAP_PROPERTY("ellipsize", Pango::EllipsizeMode)
+  _WRAP_PROPERTY("alignment", Pango::Alignment)
+  _WRAP_PROPERTY("justify", bool)
+  _WRAP_PROPERTY("password-char", gunichar)
+  _WRAP_PROPERTY("max-length", int)
+  _WRAP_PROPERTY("single-line-mode", bool)
+};
+
+} // namespace Clutter

Modified: cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc
==============================================================================
--- cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc	(original)
+++ cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc	Fri Jan  9 17:38:28 2009
@@ -19,12 +19,11 @@
 #include <clutter/clutter.h>
 #include <iostream>
 
-
-int main (int argc, char *argv[])
+int main(int argc, char** argv)
 {
-  clutter_init(&argc, &argv) ;
+  clutter_init(&argc, &argv);
 
-  std::cout 
+  std::cout
     << get_defs(CLUTTER_TYPE_ACTOR)
     << get_defs(CLUTTER_TYPE_ALPHA)
     << get_defs(CLUTTER_TYPE_BACKEND)
@@ -40,17 +39,16 @@
     << get_defs(CLUTTER_TYPE_COLOR)
 //    << get_defs(CLUTTER_TYPE_CONTAINER)
     << get_defs(CLUTTER_TYPE_EFFECT_TEMPLATE)
-    << get_defs(CLUTTER_TYPE_ENTRY)
     << get_defs(CLUTTER_TYPE_EVENT)
     << get_defs(CLUTTER_TYPE_GROUP)
 //    << get_defs(CLUTTER_TYPE_HBOX)
-    << get_defs(CLUTTER_TYPE_LABEL)
 //    << get_defs(CLUTTER_TYPE_LAYOUT)
     << get_defs(CLUTTER_TYPE_MEDIA)
     << get_defs(CLUTTER_TYPE_RECTANGLE)
     << get_defs(CLUTTER_TYPE_SCORE)
     << get_defs(CLUTTER_TYPE_SCRIPT)
     << get_defs(CLUTTER_TYPE_STAGE)
+    << get_defs(CLUTTER_TYPE_TEXT)
     << get_defs(CLUTTER_TYPE_TEXTURE)
     << get_defs(CLUTTER_TYPE_TIMELINE)
     << get_defs(CLUTTER_TYPE_SCORE)

Modified: cluttermm/trunk/tools/m4/convert_cluttermm.m4
==============================================================================
--- cluttermm/trunk/tools/m4/convert_cluttermm.m4	(original)
+++ cluttermm/trunk/tools/m4/convert_cluttermm.m4	Fri Jan  9 17:38:28 2009
@@ -42,6 +42,12 @@
 _CONVERSION(`const Padding&',`const ClutterPadding*',`&($3)')
 _CONVERSION(`ClutterPadding*',`Padding&',`*($3)')
 
+_CONVERSION(`Geometry&',`Clutter::Geometry*',`($3).gobj()')
+_CONVERSION(`const Geometry&',`ClutterGeometry*',`const_cast<ClutterGeometry*>(($3).gobj())')
+_CONVERSION(`const Geometry&',`const ClutterGeometry*',`($3).gobj()')
+_CONVERSION(`ClutterGeometry*',`const Geometry&',`Geometry($3)')
+_CONVERSION(`const ClutterGeometry*',`const Geometry&',`Geometry($3)')
+
 _EQUAL(`guint8',`guchar')
 _EQUAL(`guint8*',`guchar*')
 _EQUAL(`const guint8*',`const guchar*')