From 170b79ef0a81d7f2aee219cec55b19c7f598bc91 Mon Sep 17 00:00:00 2001
From: John Connors <johnc@yagc.ndo.co.uk>
Date: Tue, 24 Jun 2008 00:05:45 +0100
Subject: [PATCH] Changed so that unknown type defaults to pointer.

---
 gir-loader.lisp                    |    11 +-
 gir-repository/gir/cairo.gir       |   497 +-
 gir-repository/gir/gdk-x11-2.0.gir |  4542 +--
 gir-repository/gir/gtk-x11-2.0.gir | 75770 ++++++++++++++++++-----------------
 gir-repository/gir/pango-1.0.gir   |  2230 +-
 5 files changed, 41906 insertions(+), 41144 deletions(-)

diff --git a/gir-loader.lisp b/gir-loader.lisp
index a5da887..082c256 100644
--- a/gir-loader.lisp
+++ b/gir-loader.lisp
@@ -65,10 +65,15 @@
              (let ((typestring (string (intern type))))
                (unless (eql result :struct)
 				   (pushnew typestring *unknown-types*  :test 'equal)
+                   (format nil ":pointer")
                    ;; (format t ";; ~S possibly unknown~%"  typestring)
-				   )														 
-               (format nil "~A"
-                       typestring)))
+				   )					
+               (if (eql result :struct)
+                   ;; if the type is a structure type, its probably composed into an object, return it
+                   (format nil "~A"
+                           typestring)
+                   ;; otherwise just default to a pointer
+                   (format nil ":pointer"))))
             (resolve-type result))))))
   
 ;; instead of this, why not use defctype?
diff --git a/gir-repository/gir/cairo.gir b/gir-repository/gir/cairo.gir
index af0e400..550731b 100644
--- a/gir-repository/gir/cairo.gir
+++ b/gir-repository/gir/cairo.gir
@@ -5,12 +5,12 @@
   <namespace name="Cairo">
     <function name="version" c:identifier="cairo_version">
       <return-value>
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </return-value>
     </function>
     <function name="version_string" c:identifier="cairo_version_string">
       <return-value>
-        <type name="char*" c:type="char*"/>
+        <type name="string" c:type="char*"/>
       </return-value>
     </function>
     <record name="cairo_t" c:type="cairo_t"/>
@@ -39,17 +39,17 @@
     <record name="cairo_pattern_t" c:type="cairo_pattern_t"/>
     <callback name="cairo_destroy_func_t">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="data">
-          <type name="void*" c:type="void*"/>
+          <type name="any" c:type="void*"/>
         </parameter>
       </parameters>
     </callback>
     <record name="cairo_user_data_key" c:type="_cairo_user_data_key">
       <field name="unused">
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </field>
     </record>
     <record name="cairo_user_data_key_t" c:type="cairo_user_data_key_t"/>
@@ -59,7 +59,7 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="void*" c:type="void*"/>
+          <type name="any" c:type="void*"/>
         </parameter>
         <parameter name="data">
           <type name="unsigned*" c:type="unsigned*"/>
@@ -75,7 +75,7 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="void*" c:type="void*"/>
+          <type name="any" c:type="void*"/>
         </parameter>
         <parameter name="data">
           <type name="unsigned*" c:type="unsigned*"/>
@@ -107,7 +107,7 @@
     </function>
     <function name="destroy" c:identifier="cairo_destroy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -128,7 +128,7 @@
     </function>
     <function name="get_user_data" c:identifier="cairo_get_user_data">
       <return-value>
-        <type name="void*" c:type="void*"/>
+        <type name="any" c:type="void*"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -151,7 +151,7 @@
           <type name="cairo_user_data_key_t" c:type="cairo_user_data_key_t*"/>
         </parameter>
         <parameter name="user_data">
-          <type name="void" c:type="void*"/>
+          <type name="any" c:type="void*"/>
         </parameter>
         <parameter name="destroy">
           <type name="cairo_destroy_func_t" c:type="cairo_destroy_func_t"/>
@@ -160,7 +160,7 @@
     </function>
     <function name="save" c:identifier="cairo_save">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -170,7 +170,7 @@
     </function>
     <function name="restore" c:identifier="cairo_restore">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -180,7 +180,7 @@
     </function>
     <function name="push_group" c:identifier="cairo_push_group">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -191,7 +191,7 @@
     <function name="push_group_with_content"
               c:identifier="cairo_push_group_with_content">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -215,7 +215,7 @@
     <function name="pop_group_to_source"
               c:identifier="cairo_pop_group_to_source">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -225,7 +225,7 @@
     </function>
     <function name="set_operator" c:identifier="cairo_set_operator">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -238,7 +238,7 @@
     </function>
     <function name="set_source" c:identifier="cairo_set_source">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -251,7 +251,7 @@
     </function>
     <function name="set_source_rgb" c:identifier="cairo_set_source_rgb">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -270,7 +270,7 @@
     </function>
     <function name="set_source_rgba" c:identifier="cairo_set_source_rgba">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -290,9 +290,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="set_source_surface" c:identifier="cairo_set_source_surface">
+    <function name="set_source_surface"
+              c:identifier="cairo_set_source_surface">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -311,7 +312,7 @@
     </function>
     <function name="set_tolerance" c:identifier="cairo_set_tolerance">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -324,7 +325,7 @@
     </function>
     <function name="set_antialias" c:identifier="cairo_set_antialias">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -337,7 +338,7 @@
     </function>
     <function name="set_fill_rule" c:identifier="cairo_set_fill_rule">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -350,7 +351,7 @@
     </function>
     <function name="set_line_width" c:identifier="cairo_set_line_width">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -363,7 +364,7 @@
     </function>
     <function name="set_line_cap" c:identifier="cairo_set_line_cap">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -376,7 +377,7 @@
     </function>
     <function name="set_line_join" c:identifier="cairo_set_line_join">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -389,7 +390,7 @@
     </function>
     <function name="set_dash" c:identifier="cairo_set_dash">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -399,7 +400,7 @@
           <type name="double" c:type="double*"/>
         </parameter>
         <parameter name="num_dashes">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="offset">
           <type name="double" c:type="double"/>
@@ -408,7 +409,7 @@
     </function>
     <function name="set_miter_limit" c:identifier="cairo_set_miter_limit">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -421,7 +422,7 @@
     </function>
     <function name="translate" c:identifier="cairo_translate">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -437,7 +438,7 @@
     </function>
     <function name="scale" c:identifier="cairo_scale">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -453,7 +454,7 @@
     </function>
     <function name="rotate" c:identifier="cairo_rotate">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -466,7 +467,7 @@
     </function>
     <function name="transform" c:identifier="cairo_transform">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -479,7 +480,7 @@
     </function>
     <function name="set_matrix" c:identifier="cairo_set_matrix">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -492,7 +493,7 @@
     </function>
     <function name="identity_matrix" c:identifier="cairo_identity_matrix">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -502,7 +503,7 @@
     </function>
     <function name="user_to_device" c:identifier="cairo_user_to_device">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -519,7 +520,7 @@
     <function name="user_to_device_distance"
               c:identifier="cairo_user_to_device_distance">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -535,7 +536,7 @@
     </function>
     <function name="device_to_user" c:identifier="cairo_device_to_user">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -552,7 +553,7 @@
     <function name="device_to_user_distance"
               c:identifier="cairo_device_to_user_distance">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -568,7 +569,7 @@
     </function>
     <function name="new_path" c:identifier="cairo_new_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -578,7 +579,7 @@
     </function>
     <function name="move_to" c:identifier="cairo_move_to">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -594,7 +595,7 @@
     </function>
     <function name="new_sub_path" c:identifier="cairo_new_sub_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -604,7 +605,7 @@
     </function>
     <function name="line_to" c:identifier="cairo_line_to">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -620,7 +621,7 @@
     </function>
     <function name="curve_to" c:identifier="cairo_curve_to">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -648,7 +649,7 @@
     </function>
     <function name="arc" c:identifier="cairo_arc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -673,7 +674,7 @@
     </function>
     <function name="arc_negative" c:identifier="cairo_arc_negative">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -698,7 +699,7 @@
     </function>
     <function name="rel_move_to" c:identifier="cairo_rel_move_to">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -714,7 +715,7 @@
     </function>
     <function name="rel_line_to" c:identifier="cairo_rel_line_to">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -730,7 +731,7 @@
     </function>
     <function name="rel_curve_to" c:identifier="cairo_rel_curve_to">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -758,7 +759,7 @@
     </function>
     <function name="rectangle" c:identifier="cairo_rectangle">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -780,7 +781,7 @@
     </function>
     <function name="close_path" c:identifier="cairo_close_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -790,7 +791,7 @@
     </function>
     <function name="path_extents" c:identifier="cairo_path_extents">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -812,7 +813,7 @@
     </function>
     <function name="paint" c:identifier="cairo_paint">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -822,7 +823,7 @@
     </function>
     <function name="paint_with_alpha" c:identifier="cairo_paint_with_alpha">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -835,7 +836,7 @@
     </function>
     <function name="mask" c:identifier="cairo_mask">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -848,7 +849,7 @@
     </function>
     <function name="mask_surface" c:identifier="cairo_mask_surface">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -867,7 +868,7 @@
     </function>
     <function name="stroke" c:identifier="cairo_stroke">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -877,7 +878,7 @@
     </function>
     <function name="stroke_preserve" c:identifier="cairo_stroke_preserve">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -887,7 +888,7 @@
     </function>
     <function name="fill" c:identifier="cairo_fill">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -897,7 +898,7 @@
     </function>
     <function name="fill_preserve" c:identifier="cairo_fill_preserve">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -907,7 +908,7 @@
     </function>
     <function name="copy_page" c:identifier="cairo_copy_page">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -917,7 +918,7 @@
     </function>
     <function name="show_page" c:identifier="cairo_show_page">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -959,7 +960,7 @@
     </function>
     <function name="stroke_extents" c:identifier="cairo_stroke_extents">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -981,7 +982,7 @@
     </function>
     <function name="fill_extents" c:identifier="cairo_fill_extents">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1003,7 +1004,7 @@
     </function>
     <function name="reset_clip" c:identifier="cairo_reset_clip">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1013,7 +1014,7 @@
     </function>
     <function name="clip" c:identifier="cairo_clip">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1023,7 +1024,7 @@
     </function>
     <function name="clip_preserve" c:identifier="cairo_clip_preserve">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1033,7 +1034,7 @@
     </function>
     <function name="clip_extents" c:identifier="cairo_clip_extents">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1076,7 +1077,7 @@
         <type name="cairo_rectangle_t*" c:type="cairo_rectangle_t*"/>
       </field>
       <field name="num_rectangles">
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </field>
     </record>
     <record name="cairo_rectangle_list_t" c:type="cairo_rectangle_list_t"/>
@@ -1094,12 +1095,12 @@
     <function name="rectangle_list_destroy"
               c:identifier="cairo_rectangle_list_destroy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="rectangle_list">
           <type name="cairo_rectangle_list_t"
-                  c:type="cairo_rectangle_list_t*"/>
+                c:type="cairo_rectangle_list_t*"/>
         </parameter>
       </parameters>
     </function>
@@ -1128,7 +1129,7 @@
     <function name="font_options_destroy"
               c:identifier="cairo_font_options_destroy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="options">
@@ -1147,9 +1148,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="font_options_merge" c:identifier="cairo_font_options_merge">
+    <function name="font_options_merge"
+              c:identifier="cairo_font_options_merge">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="options">
@@ -1160,7 +1162,8 @@
         </parameter>
       </parameters>
     </function>
-    <function name="font_options_equal" c:identifier="cairo_font_options_equal">
+    <function name="font_options_equal"
+              c:identifier="cairo_font_options_equal">
       <return-value>
         <type name="cairo_bool_t" c:type="cairo_bool_t"/>
       </return-value>
@@ -1186,7 +1189,7 @@
     <function name="font_options_set_antialias"
               c:identifier="cairo_font_options_set_antialias">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="options">
@@ -1211,7 +1214,7 @@
     <function name="font_options_set_subpixel_order"
               c:identifier="cairo_font_options_set_subpixel_order">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="options">
@@ -1236,7 +1239,7 @@
     <function name="font_options_set_hint_style"
               c:identifier="cairo_font_options_set_hint_style">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="options">
@@ -1261,7 +1264,7 @@
     <function name="font_options_set_hint_metrics"
               c:identifier="cairo_font_options_set_hint_metrics">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="options">
@@ -1285,14 +1288,14 @@
     </function>
     <function name="select_font_face" c:identifier="cairo_select_font_face">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
           <type name="cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="family">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="slant">
           <type name="cairo_font_slant_t" c:type="cairo_font_slant_t"/>
@@ -1304,7 +1307,7 @@
     </function>
     <function name="set_font_size" c:identifier="cairo_set_font_size">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1317,7 +1320,7 @@
     </function>
     <function name="set_font_matrix" c:identifier="cairo_set_font_matrix">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1330,7 +1333,7 @@
     </function>
     <function name="get_font_matrix" c:identifier="cairo_get_font_matrix">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1343,7 +1346,7 @@
     </function>
     <function name="set_font_options" c:identifier="cairo_set_font_options">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1356,7 +1359,7 @@
     </function>
     <function name="get_font_options" c:identifier="cairo_get_font_options">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1369,7 +1372,7 @@
     </function>
     <function name="set_font_face" c:identifier="cairo_set_font_face">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1392,7 +1395,7 @@
     </function>
     <function name="set_scaled_font" c:identifier="cairo_set_scaled_font">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1415,20 +1418,20 @@
     </function>
     <function name="show_text" c:identifier="cairo_show_text">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
           <type name="cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="utf8">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
     <function name="show_glyphs" c:identifier="cairo_show_glyphs">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1438,26 +1441,26 @@
           <type name="cairo_glyph_t" c:type="cairo_glyph_t*"/>
         </parameter>
         <parameter name="num_glyphs">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="text_path" c:identifier="cairo_text_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
           <type name="cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="utf8">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
     <function name="glyph_path" c:identifier="cairo_glyph_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1467,20 +1470,20 @@
           <type name="cairo_glyph_t" c:type="cairo_glyph_t*"/>
         </parameter>
         <parameter name="num_glyphs">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="text_extents" c:identifier="cairo_text_extents">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
           <type name="cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="utf8">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="extents">
           <type name="cairo_text_extents_t" c:type="cairo_text_extents_t*"/>
@@ -1489,7 +1492,7 @@
     </function>
     <function name="glyph_extents" c:identifier="cairo_glyph_extents">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1499,7 +1502,7 @@
           <type name="cairo_glyph_t" c:type="cairo_glyph_t*"/>
         </parameter>
         <parameter name="num_glyphs">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="extents">
           <type name="cairo_text_extents_t" c:type="cairo_text_extents_t*"/>
@@ -1508,7 +1511,7 @@
     </function>
     <function name="font_extents" c:identifier="cairo_font_extents">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1532,7 +1535,7 @@
     </function>
     <function name="font_face_destroy" c:identifier="cairo_font_face_destroy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="font_face">
@@ -1561,7 +1564,8 @@
         </parameter>
       </parameters>
     </function>
-    <function name="font_face_get_type" c:identifier="cairo_font_face_get_type">
+    <function name="font_face_get_type"
+              c:identifier="cairo_font_face_get_type">
       <return-value>
         <type name="cairo_font_type_t" c:type="cairo_font_type_t"/>
       </return-value>
@@ -1574,7 +1578,7 @@
     <function name="font_face_get_user_data"
               c:identifier="cairo_font_face_get_user_data">
       <return-value>
-        <type name="void*" c:type="void*"/>
+        <type name="any" c:type="void*"/>
       </return-value>
       <parameters>
         <parameter name="font_face">
@@ -1598,14 +1602,15 @@
           <type name="cairo_user_data_key_t" c:type="cairo_user_data_key_t*"/>
         </parameter>
         <parameter name="user_data">
-          <type name="void" c:type="void*"/>
+          <type name="any" c:type="void*"/>
         </parameter>
         <parameter name="destroy">
           <type name="cairo_destroy_func_t" c:type="cairo_destroy_func_t"/>
         </parameter>
       </parameters>
     </function>
-    <function name="scaled_font_create" c:identifier="cairo_scaled_font_create">
+    <function name="scaled_font_create"
+              c:identifier="cairo_scaled_font_create">
       <return-value>
         <type name="cairo_scaled_font_t*" c:type="cairo_scaled_font_t*"/>
       </return-value>
@@ -1638,7 +1643,7 @@
     <function name="scaled_font_destroy"
               c:identifier="cairo_scaled_font_destroy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="scaled_font">
@@ -1657,7 +1662,8 @@
         </parameter>
       </parameters>
     </function>
-    <function name="scaled_font_status" c:identifier="cairo_scaled_font_status">
+    <function name="scaled_font_status"
+              c:identifier="cairo_scaled_font_status">
       <return-value>
         <type name="cairo_status_t" c:type="cairo_status_t"/>
       </return-value>
@@ -1681,7 +1687,7 @@
     <function name="scaled_font_get_user_data"
               c:identifier="cairo_scaled_font_get_user_data">
       <return-value>
-        <type name="void*" c:type="void*"/>
+        <type name="any" c:type="void*"/>
       </return-value>
       <parameters>
         <parameter name="scaled_font">
@@ -1705,7 +1711,7 @@
           <type name="cairo_user_data_key_t" c:type="cairo_user_data_key_t*"/>
         </parameter>
         <parameter name="user_data">
-          <type name="void" c:type="void*"/>
+          <type name="any" c:type="void*"/>
         </parameter>
         <parameter name="destroy">
           <type name="cairo_destroy_func_t" c:type="cairo_destroy_func_t"/>
@@ -1715,7 +1721,7 @@
     <function name="scaled_font_extents"
               c:identifier="cairo_scaled_font_extents">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="scaled_font">
@@ -1729,14 +1735,14 @@
     <function name="scaled_font_text_extents"
               c:identifier="cairo_scaled_font_text_extents">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="scaled_font">
           <type name="cairo_scaled_font_t" c:type="cairo_scaled_font_t*"/>
         </parameter>
         <parameter name="utf8">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="extents">
           <type name="cairo_text_extents_t" c:type="cairo_text_extents_t*"/>
@@ -1746,7 +1752,7 @@
     <function name="scaled_font_glyph_extents"
               c:identifier="cairo_scaled_font_glyph_extents">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="scaled_font">
@@ -1756,7 +1762,7 @@
           <type name="cairo_glyph_t" c:type="cairo_glyph_t*"/>
         </parameter>
         <parameter name="num_glyphs">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="extents">
           <type name="cairo_text_extents_t" c:type="cairo_text_extents_t*"/>
@@ -1777,7 +1783,7 @@
     <function name="scaled_font_get_font_matrix"
               c:identifier="cairo_scaled_font_get_font_matrix">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="scaled_font">
@@ -1791,7 +1797,7 @@
     <function name="scaled_font_get_ctm"
               c:identifier="cairo_scaled_font_get_ctm">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="scaled_font">
@@ -1805,7 +1811,7 @@
     <function name="scaled_font_get_font_options"
               c:identifier="cairo_scaled_font_get_font_options">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="scaled_font">
@@ -1868,7 +1874,7 @@
     </function>
     <function name="get_current_point" c:identifier="cairo_get_current_point">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1934,7 +1940,7 @@
     </function>
     <function name="get_dash_count" c:identifier="cairo_get_dash_count">
       <return-value>
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1944,7 +1950,7 @@
     </function>
     <function name="get_dash" c:identifier="cairo_get_dash">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1960,7 +1966,7 @@
     </function>
     <function name="get_matrix" c:identifier="cairo_get_matrix">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -1999,7 +2005,7 @@
         <type name="cairo_path_data_t*" c:type="cairo_path_data_t*"/>
       </field>
       <field name="num_data">
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </field>
     </record>
     <record name="cairo_path_t" c:type="cairo_path_t"/>
@@ -2025,7 +2031,7 @@
     </function>
     <function name="append_path" c:identifier="cairo_append_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -2038,7 +2044,7 @@
     </function>
     <function name="path_destroy" c:identifier="cairo_path_destroy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="path">
@@ -2058,7 +2064,7 @@
     </function>
     <function name="status_to_string" c:identifier="cairo_status_to_string">
       <return-value>
-        <type name="char*" c:type="char*"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
         <parameter name="status">
@@ -2079,10 +2085,10 @@
           <type name="cairo_content_t" c:type="cairo_content_t"/>
         </parameter>
         <parameter name="width">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -2098,7 +2104,7 @@
     </function>
     <function name="surface_finish" c:identifier="cairo_surface_finish">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -2108,7 +2114,7 @@
     </function>
     <function name="surface_destroy" c:identifier="cairo_surface_destroy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -2168,7 +2174,7 @@
           <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
         </parameter>
         <parameter name="filename">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
@@ -2185,14 +2191,14 @@
           <type name="cairo_write_func_t" c:type="cairo_write_func_t"/>
         </parameter>
         <parameter name="closure">
-          <type name="void" c:type="void*"/>
+          <type name="any" c:type="void*"/>
         </parameter>
       </parameters>
     </function>
     <function name="surface_get_user_data"
               c:identifier="cairo_surface_get_user_data">
       <return-value>
-        <type name="void*" c:type="void*"/>
+        <type name="any" c:type="void*"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -2216,7 +2222,7 @@
           <type name="cairo_user_data_key_t" c:type="cairo_user_data_key_t*"/>
         </parameter>
         <parameter name="user_data">
-          <type name="void" c:type="void*"/>
+          <type name="any" c:type="void*"/>
         </parameter>
         <parameter name="destroy">
           <type name="cairo_destroy_func_t" c:type="cairo_destroy_func_t"/>
@@ -2226,7 +2232,7 @@
     <function name="surface_get_font_options"
               c:identifier="cairo_surface_get_font_options">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -2239,7 +2245,7 @@
     </function>
     <function name="surface_flush" c:identifier="cairo_surface_flush">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -2247,9 +2253,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="surface_mark_dirty" c:identifier="cairo_surface_mark_dirty">
+    <function name="surface_mark_dirty"
+              c:identifier="cairo_surface_mark_dirty">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -2260,30 +2267,30 @@
     <function name="surface_mark_dirty_rectangle"
               c:identifier="cairo_surface_mark_dirty_rectangle">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
           <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
         </parameter>
         <parameter name="x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="width">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="surface_set_device_offset"
               c:identifier="cairo_surface_set_device_offset">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -2300,7 +2307,7 @@
     <function name="surface_get_device_offset"
               c:identifier="cairo_surface_get_device_offset">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -2317,7 +2324,7 @@
     <function name="surface_set_fallback_resolution"
               c:identifier="cairo_surface_set_fallback_resolution">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -2333,7 +2340,7 @@
     </function>
     <function name="surface_copy_page" c:identifier="cairo_surface_copy_page">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -2343,7 +2350,7 @@
     </function>
     <function name="surface_show_page" c:identifier="cairo_surface_show_page">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -2361,24 +2368,24 @@
           <type name="cairo_format_t" c:type="cairo_format_t"/>
         </parameter>
         <parameter name="width">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="format_stride_for_width"
               c:identifier="cairo_format_stride_for_width">
       <return-value>
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="format">
           <type name="cairo_format_t" c:type="cairo_format_t"/>
         </parameter>
         <parameter name="width">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -2395,13 +2402,13 @@
           <type name="cairo_format_t" c:type="cairo_format_t"/>
         </parameter>
         <parameter name="width">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="stride">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -2430,7 +2437,7 @@
     <function name="image_surface_get_width"
               c:identifier="cairo_image_surface_get_width">
       <return-value>
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -2441,7 +2448,7 @@
     <function name="image_surface_get_height"
               c:identifier="cairo_image_surface_get_height">
       <return-value>
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -2452,7 +2459,7 @@
     <function name="image_surface_get_stride"
               c:identifier="cairo_image_surface_get_stride">
       <return-value>
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -2467,7 +2474,7 @@
       </return-value>
       <parameters>
         <parameter name="filename">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
@@ -2481,11 +2488,12 @@
           <type name="cairo_read_func_t" c:type="cairo_read_func_t"/>
         </parameter>
         <parameter name="closure">
-          <type name="void" c:type="void*"/>
+          <type name="any" c:type="void*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="pattern_create_rgb" c:identifier="cairo_pattern_create_rgb">
+    <function name="pattern_create_rgb"
+              c:identifier="cairo_pattern_create_rgb">
       <return-value>
         <type name="cairo_pattern_t*" c:type="cairo_pattern_t*"/>
       </return-value>
@@ -2590,7 +2598,7 @@
     </function>
     <function name="pattern_destroy" c:identifier="cairo_pattern_destroy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
@@ -2622,7 +2630,7 @@
     <function name="pattern_get_user_data"
               c:identifier="cairo_pattern_get_user_data">
       <return-value>
-        <type name="void*" c:type="void*"/>
+        <type name="any" c:type="void*"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
@@ -2646,7 +2654,7 @@
           <type name="cairo_user_data_key_t" c:type="cairo_user_data_key_t*"/>
         </parameter>
         <parameter name="user_data">
-          <type name="void" c:type="void*"/>
+          <type name="any" c:type="void*"/>
         </parameter>
         <parameter name="destroy">
           <type name="cairo_destroy_func_t" c:type="cairo_destroy_func_t"/>
@@ -2666,7 +2674,7 @@
     <function name="pattern_add_color_stop_rgb"
               c:identifier="cairo_pattern_add_color_stop_rgb">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
@@ -2689,7 +2697,7 @@
     <function name="pattern_add_color_stop_rgba"
               c:identifier="cairo_pattern_add_color_stop_rgba">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
@@ -2712,9 +2720,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="pattern_set_matrix" c:identifier="cairo_pattern_set_matrix">
+    <function name="pattern_set_matrix"
+              c:identifier="cairo_pattern_set_matrix">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
@@ -2725,9 +2734,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="pattern_get_matrix" c:identifier="cairo_pattern_get_matrix">
+    <function name="pattern_get_matrix"
+              c:identifier="cairo_pattern_get_matrix">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
@@ -2738,9 +2748,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="pattern_set_extend" c:identifier="cairo_pattern_set_extend">
+    <function name="pattern_set_extend"
+              c:identifier="cairo_pattern_set_extend">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
@@ -2751,7 +2762,8 @@
         </parameter>
       </parameters>
     </function>
-    <function name="pattern_get_extend" c:identifier="cairo_pattern_get_extend">
+    <function name="pattern_get_extend"
+              c:identifier="cairo_pattern_get_extend">
       <return-value>
         <type name="cairo_extend_t" c:type="cairo_extend_t"/>
       </return-value>
@@ -2761,9 +2773,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="pattern_set_filter" c:identifier="cairo_pattern_set_filter">
+    <function name="pattern_set_filter"
+              c:identifier="cairo_pattern_set_filter">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
@@ -2774,7 +2787,8 @@
         </parameter>
       </parameters>
     </function>
-    <function name="pattern_get_filter" c:identifier="cairo_pattern_get_filter">
+    <function name="pattern_get_filter"
+              c:identifier="cairo_pattern_get_filter">
       <return-value>
         <type name="cairo_filter_t" c:type="cairo_filter_t"/>
       </return-value>
@@ -2830,7 +2844,7 @@
           <type name="cairo_pattern_t" c:type="cairo_pattern_t*"/>
         </parameter>
         <parameter name="index">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="offset">
           <type name="double" c:type="double*"/>
@@ -2917,7 +2931,7 @@
     </function>
     <function name="matrix_init" c:identifier="cairo_matrix_init">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="matrix">
@@ -2946,7 +2960,7 @@
     <function name="matrix_init_identity"
               c:identifier="cairo_matrix_init_identity">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="matrix">
@@ -2957,7 +2971,7 @@
     <function name="matrix_init_translate"
               c:identifier="cairo_matrix_init_translate">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="matrix">
@@ -2973,7 +2987,7 @@
     </function>
     <function name="matrix_init_scale" c:identifier="cairo_matrix_init_scale">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="matrix">
@@ -2987,9 +3001,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="matrix_init_rotate" c:identifier="cairo_matrix_init_rotate">
+    <function name="matrix_init_rotate"
+              c:identifier="cairo_matrix_init_rotate">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="matrix">
@@ -3002,7 +3017,7 @@
     </function>
     <function name="matrix_translate" c:identifier="cairo_matrix_translate">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="matrix">
@@ -3018,7 +3033,7 @@
     </function>
     <function name="matrix_scale" c:identifier="cairo_matrix_scale">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="matrix">
@@ -3034,7 +3049,7 @@
     </function>
     <function name="matrix_rotate" c:identifier="cairo_matrix_rotate">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="matrix">
@@ -3057,7 +3072,7 @@
     </function>
     <function name="matrix_multiply" c:identifier="cairo_matrix_multiply">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="result">
@@ -3074,7 +3089,7 @@
     <function name="matrix_transform_distance"
               c:identifier="cairo_matrix_transform_distance">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="matrix">
@@ -3091,7 +3106,7 @@
     <function name="matrix_transform_point"
               c:identifier="cairo_matrix_transform_point">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="matrix">
@@ -3108,7 +3123,7 @@
     <function name="debug_reset_static_data"
               c:identifier="cairo_debug_reset_static_data">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="ft_font_face_create_for_pattern"
@@ -3125,7 +3140,7 @@
     <function name="ft_font_options_substitute"
               c:identifier="cairo_ft_font_options_substitute">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="options">
@@ -3146,7 +3161,7 @@
           <type name="FT_Face" c:type="FT_Face"/>
         </parameter>
         <parameter name="load_flags">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -3164,7 +3179,7 @@
     <function name="ft_scaled_font_unlock_face"
               c:identifier="cairo_ft_scaled_font_unlock_face">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="scaled_font">
@@ -3172,24 +3187,14 @@
         </parameter>
       </parameters>
     </function>
-    <function name="glitz_surface_create"
-              c:identifier="cairo_glitz_surface_create">
-      <return-value>
-        <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
-      </return-value>
-      <parameters>
-        <parameter name="surface">
-          <type name="glitz_surface_t" c:type="glitz_surface_t*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="pdf_surface_create" c:identifier="cairo_pdf_surface_create">
+    <function name="pdf_surface_create"
+              c:identifier="cairo_pdf_surface_create">
       <return-value>
         <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
       </return-value>
       <parameters>
         <parameter name="filename">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="width_in_points">
           <type name="double" c:type="double"/>
@@ -3209,7 +3214,7 @@
           <type name="cairo_write_func_t" c:type="cairo_write_func_t"/>
         </parameter>
         <parameter name="closure">
-          <type name="void" c:type="void*"/>
+          <type name="any" c:type="void*"/>
         </parameter>
         <parameter name="width_in_points">
           <type name="double" c:type="double"/>
@@ -3222,7 +3227,7 @@
     <function name="pdf_surface_set_size"
               c:identifier="cairo_pdf_surface_set_size">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -3242,7 +3247,7 @@
       </return-value>
       <parameters>
         <parameter name="filename">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="width_in_points">
           <type name="double" c:type="double"/>
@@ -3262,7 +3267,7 @@
           <type name="cairo_write_func_t" c:type="cairo_write_func_t"/>
         </parameter>
         <parameter name="closure">
-          <type name="void" c:type="void*"/>
+          <type name="any" c:type="void*"/>
         </parameter>
         <parameter name="width_in_points">
           <type name="double" c:type="double"/>
@@ -3275,7 +3280,7 @@
     <function name="ps_surface_restrict_to_level"
               c:identifier="cairo_ps_surface_restrict_to_level">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -3288,7 +3293,7 @@
     </function>
     <function name="ps_get_levels" c:identifier="cairo_ps_get_levels">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="levels">
@@ -3299,9 +3304,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="ps_level_to_string" c:identifier="cairo_ps_level_to_string">
+    <function name="ps_level_to_string"
+              c:identifier="cairo_ps_level_to_string">
       <return-value>
-        <type name="char*" c:type="char*"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
         <parameter name="level">
@@ -3309,9 +3315,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="ps_surface_set_eps" c:identifier="cairo_ps_surface_set_eps">
+    <function name="ps_surface_set_eps"
+              c:identifier="cairo_ps_surface_set_eps">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -3322,7 +3329,8 @@
         </parameter>
       </parameters>
     </function>
-    <function name="ps_surface_get_eps" c:identifier="cairo_ps_surface_get_eps">
+    <function name="ps_surface_get_eps"
+              c:identifier="cairo_ps_surface_get_eps">
       <return-value>
         <type name="cairo_bool_t" c:type="cairo_bool_t"/>
       </return-value>
@@ -3335,7 +3343,7 @@
     <function name="ps_surface_set_size"
               c:identifier="cairo_ps_surface_set_size">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -3352,21 +3360,21 @@
     <function name="ps_surface_dsc_comment"
               c:identifier="cairo_ps_surface_dsc_comment">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
           <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
         </parameter>
         <parameter name="comment">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
     <function name="ps_surface_dsc_begin_setup"
               c:identifier="cairo_ps_surface_dsc_begin_setup">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -3377,7 +3385,7 @@
     <function name="ps_surface_dsc_begin_page_setup"
               c:identifier="cairo_ps_surface_dsc_begin_page_setup">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -3385,13 +3393,14 @@
         </parameter>
       </parameters>
     </function>
-    <function name="svg_surface_create" c:identifier="cairo_svg_surface_create">
+    <function name="svg_surface_create"
+              c:identifier="cairo_svg_surface_create">
       <return-value>
         <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
       </return-value>
       <parameters>
         <parameter name="filename">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="width_in_points">
           <type name="double" c:type="double"/>
@@ -3411,7 +3420,7 @@
           <type name="cairo_write_func_t" c:type="cairo_write_func_t"/>
         </parameter>
         <parameter name="closure">
-          <type name="void" c:type="void*"/>
+          <type name="any" c:type="void*"/>
         </parameter>
         <parameter name="width_in_points">
           <type name="double" c:type="double"/>
@@ -3424,7 +3433,7 @@
     <function name="svg_surface_restrict_to_version"
               c:identifier="cairo_svg_surface_restrict_to_version">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -3437,7 +3446,7 @@
     </function>
     <function name="svg_get_versions" c:identifier="cairo_svg_get_versions">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="versions">
@@ -3451,7 +3460,7 @@
     <function name="svg_version_to_string"
               c:identifier="cairo_svg_version_to_string">
       <return-value>
-        <type name="char*" c:type="char*"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
         <parameter name="version">
@@ -3475,10 +3484,10 @@
           <type name="Visual" c:type="Visual*"/>
         </parameter>
         <parameter name="width">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -3498,34 +3507,34 @@
           <type name="Screen" c:type="Screen*"/>
         </parameter>
         <parameter name="width">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="xlib_surface_set_size"
               c:identifier="cairo_xlib_surface_set_size">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
           <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
         </parameter>
         <parameter name="width">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="xlib_surface_set_drawable"
               c:identifier="cairo_xlib_surface_set_drawable">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -3535,10 +3544,10 @@
           <type name="Drawable" c:type="Drawable"/>
         </parameter>
         <parameter name="width">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -3589,7 +3598,7 @@
     <function name="xlib_surface_get_depth"
               c:identifier="cairo_xlib_surface_get_depth">
       <return-value>
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -3600,7 +3609,7 @@
     <function name="xlib_surface_get_width"
               c:identifier="cairo_xlib_surface_get_width">
       <return-value>
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -3611,7 +3620,7 @@
     <function name="xlib_surface_get_height"
               c:identifier="cairo_xlib_surface_get_height">
       <return-value>
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="surface">
@@ -3638,10 +3647,10 @@
           <type name="XRenderPictFormat" c:type="XRenderPictFormat*"/>
         </parameter>
         <parameter name="width">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
diff --git a/gir-repository/gir/gdk-x11-2.0.gir b/gir-repository/gir/gdk-x11-2.0.gir
index 4da0077..43e2a7b 100644
--- a/gir-repository/gir/gdk-x11-2.0.gir
+++ b/gir-repository/gir/gdk-x11-2.0.gir
@@ -5,35 +5,35 @@
   <namespace name="Gdk">
     <record name="GdkPoint" c:type="GdkPoint">
       <field name="x">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="y">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
     </record>
     <record name="GdkSegment" c:type="GdkSegment">
       <field name="x1">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="y1">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="x2">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="y2">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
     </record>
     <record name="GdkSpan" c:type="GdkSpan">
       <field name="x">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="y">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="width">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
     </record>
     <record name="GdkRegion" c:type="GdkRegion"/>
@@ -43,107 +43,107 @@
                  glib:type-name="GdkByteOrder"
                  glib:get-type="gdk_byte_order_get_type">
       <member name="lsb-first"
-                value="0"
-                c:identifier="GDK_LSB_FIRST"
-                glib:nick="lsb-first"/>
+              value="0"
+              c:identifier="GDK_LSB_FIRST"
+              glib:nick="lsb-first"/>
       <member name="msb-first"
-                value="1"
-                c:identifier="GDK_MSB_FIRST"
-                glib:nick="msb-first"/>
+              value="1"
+              c:identifier="GDK_MSB_FIRST"
+              glib:nick="msb-first"/>
     </enumeration>
     <bitfield name="ModifierType"
               c:type="GdkModifierType"
               glib:type-name="GdkModifierType"
               glib:get-type="gdk_modifier_type_get_type">
       <member name="shift-mask"
-                value="1"
-                c:identifier="GDK_SHIFT_MASK"
-                glib:nick="shift-mask"/>
+              value="1"
+              c:identifier="GDK_SHIFT_MASK"
+              glib:nick="shift-mask"/>
       <member name="lock-mask"
-                value="2"
-                c:identifier="GDK_LOCK_MASK"
-                glib:nick="lock-mask"/>
+              value="2"
+              c:identifier="GDK_LOCK_MASK"
+              glib:nick="lock-mask"/>
       <member name="control-mask"
-                value="4"
-                c:identifier="GDK_CONTROL_MASK"
-                glib:nick="control-mask"/>
+              value="4"
+              c:identifier="GDK_CONTROL_MASK"
+              glib:nick="control-mask"/>
       <member name="mod1-mask"
-                value="8"
-                c:identifier="GDK_MOD1_MASK"
-                glib:nick="mod1-mask"/>
+              value="8"
+              c:identifier="GDK_MOD1_MASK"
+              glib:nick="mod1-mask"/>
       <member name="mod2-mask"
-                value="16"
-                c:identifier="GDK_MOD2_MASK"
-                glib:nick="mod2-mask"/>
+              value="16"
+              c:identifier="GDK_MOD2_MASK"
+              glib:nick="mod2-mask"/>
       <member name="mod3-mask"
-                value="32"
-                c:identifier="GDK_MOD3_MASK"
-                glib:nick="mod3-mask"/>
+              value="32"
+              c:identifier="GDK_MOD3_MASK"
+              glib:nick="mod3-mask"/>
       <member name="mod4-mask"
-                value="64"
-                c:identifier="GDK_MOD4_MASK"
-                glib:nick="mod4-mask"/>
+              value="64"
+              c:identifier="GDK_MOD4_MASK"
+              glib:nick="mod4-mask"/>
       <member name="mod5-mask"
-                value="128"
-                c:identifier="GDK_MOD5_MASK"
-                glib:nick="mod5-mask"/>
+              value="128"
+              c:identifier="GDK_MOD5_MASK"
+              glib:nick="mod5-mask"/>
       <member name="button1-mask"
-                value="256"
-                c:identifier="GDK_BUTTON1_MASK"
-                glib:nick="button1-mask"/>
+              value="256"
+              c:identifier="GDK_BUTTON1_MASK"
+              glib:nick="button1-mask"/>
       <member name="button2-mask"
-                value="512"
-                c:identifier="GDK_BUTTON2_MASK"
-                glib:nick="button2-mask"/>
+              value="512"
+              c:identifier="GDK_BUTTON2_MASK"
+              glib:nick="button2-mask"/>
       <member name="button3-mask"
-                value="1024"
-                c:identifier="GDK_BUTTON3_MASK"
-                glib:nick="button3-mask"/>
+              value="1024"
+              c:identifier="GDK_BUTTON3_MASK"
+              glib:nick="button3-mask"/>
       <member name="button4-mask"
-                value="2048"
-                c:identifier="GDK_BUTTON4_MASK"
-                glib:nick="button4-mask"/>
+              value="2048"
+              c:identifier="GDK_BUTTON4_MASK"
+              glib:nick="button4-mask"/>
       <member name="button5-mask"
-                value="4096"
-                c:identifier="GDK_BUTTON5_MASK"
-                glib:nick="button5-mask"/>
+              value="4096"
+              c:identifier="GDK_BUTTON5_MASK"
+              glib:nick="button5-mask"/>
       <member name="super-mask"
-                value="67108864"
-                c:identifier="GDK_SUPER_MASK"
-                glib:nick="super-mask"/>
+              value="67108864"
+              c:identifier="GDK_SUPER_MASK"
+              glib:nick="super-mask"/>
       <member name="hyper-mask"
-                value="134217728"
-                c:identifier="GDK_HYPER_MASK"
-                glib:nick="hyper-mask"/>
+              value="134217728"
+              c:identifier="GDK_HYPER_MASK"
+              glib:nick="hyper-mask"/>
       <member name="meta-mask"
-                value="268435456"
-                c:identifier="GDK_META_MASK"
-                glib:nick="meta-mask"/>
+              value="268435456"
+              c:identifier="GDK_META_MASK"
+              glib:nick="meta-mask"/>
       <member name="release-mask"
-                value="1073741824"
-                c:identifier="GDK_RELEASE_MASK"
-                glib:nick="release-mask"/>
+              value="1073741824"
+              c:identifier="GDK_RELEASE_MASK"
+              glib:nick="release-mask"/>
       <member name="modifier-mask"
-                value="1543512063"
-                c:identifier="GDK_MODIFIER_MASK"
-                glib:nick="modifier-mask"/>
+              value="1543512063"
+              c:identifier="GDK_MODIFIER_MASK"
+              glib:nick="modifier-mask"/>
     </bitfield>
     <bitfield name="InputCondition"
               c:type="GdkInputCondition"
               glib:type-name="GdkInputCondition"
               glib:get-type="gdk_input_condition_get_type">
       <member name="read"
-                value="1"
-                c:identifier="GDK_INPUT_READ"
-                glib:nick="read"/>
+              value="1"
+              c:identifier="GDK_INPUT_READ"
+              glib:nick="read"/>
       <member name="write"
-                value="2"
-                c:identifier="GDK_INPUT_WRITE"
-                glib:nick="write"/>
+              value="2"
+              c:identifier="GDK_INPUT_WRITE"
+              glib:nick="write"/>
       <member name="exception"
-                value="4"
-                c:identifier="GDK_INPUT_EXCEPTION"
-                glib:nick="exception"/>
+              value="4"
+              c:identifier="GDK_INPUT_EXCEPTION"
+              glib:nick="exception"/>
     </bitfield>
     <enumeration name="Status"
                  c:type="GdkStatus"
@@ -151,57 +151,57 @@
                  glib:get-type="gdk_status_get_type">
       <member name="ok" value="0" c:identifier="GDK_OK" glib:nick="ok"/>
       <member name="error"
-                value="-1"
-                c:identifier="GDK_ERROR"
-                glib:nick="error"/>
+              value="-1"
+              c:identifier="GDK_ERROR"
+              glib:nick="error"/>
       <member name="error-param"
-                value="-2"
-                c:identifier="GDK_ERROR_PARAM"
-                glib:nick="error-param"/>
+              value="-2"
+              c:identifier="GDK_ERROR_PARAM"
+              glib:nick="error-param"/>
       <member name="error-file"
-                value="-3"
-                c:identifier="GDK_ERROR_FILE"
-                glib:nick="error-file"/>
+              value="-3"
+              c:identifier="GDK_ERROR_FILE"
+              glib:nick="error-file"/>
       <member name="error-mem"
-                value="-4"
-                c:identifier="GDK_ERROR_MEM"
-                glib:nick="error-mem"/>
+              value="-4"
+              c:identifier="GDK_ERROR_MEM"
+              glib:nick="error-mem"/>
     </enumeration>
     <enumeration name="GrabStatus"
                  c:type="GdkGrabStatus"
                  glib:type-name="GdkGrabStatus"
                  glib:get-type="gdk_grab_status_get_type">
       <member name="success"
-                value="0"
-                c:identifier="GDK_GRAB_SUCCESS"
-                glib:nick="success"/>
+              value="0"
+              c:identifier="GDK_GRAB_SUCCESS"
+              glib:nick="success"/>
       <member name="already-grabbed"
-                value="1"
-                c:identifier="GDK_GRAB_ALREADY_GRABBED"
-                glib:nick="already-grabbed"/>
+              value="1"
+              c:identifier="GDK_GRAB_ALREADY_GRABBED"
+              glib:nick="already-grabbed"/>
       <member name="invalid-time"
-                value="2"
-                c:identifier="GDK_GRAB_INVALID_TIME"
-                glib:nick="invalid-time"/>
+              value="2"
+              c:identifier="GDK_GRAB_INVALID_TIME"
+              glib:nick="invalid-time"/>
       <member name="not-viewable"
-                value="3"
-                c:identifier="GDK_GRAB_NOT_VIEWABLE"
-                glib:nick="not-viewable"/>
+              value="3"
+              c:identifier="GDK_GRAB_NOT_VIEWABLE"
+              glib:nick="not-viewable"/>
       <member name="frozen"
-                value="4"
-                c:identifier="GDK_GRAB_FROZEN"
-                glib:nick="frozen"/>
+              value="4"
+              c:identifier="GDK_GRAB_FROZEN"
+              glib:nick="frozen"/>
     </enumeration>
     <callback name="GdkInputFunction">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="source">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="condition">
           <type name="GdkInputCondition" c:type="GdkInputCondition"/>
@@ -210,11 +210,11 @@
     </callback>
     <callback name="GdkDestroyNotify">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
@@ -232,7 +232,7 @@
             <type name="GdkVisual" c:type="GdkVisual*"/>
           </parameter>
           <parameter name="allocate">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </constructor>
@@ -253,7 +253,7 @@
       </constructor>
       <method name="unref" c:identifier="gdk_colormap_unref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="cmap">
@@ -273,20 +273,20 @@
       </method>
       <method name="change" c:identifier="gdk_colormap_change">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="colormap">
             <type name="Colormap" c:type="GdkColormap*"/>
           </parameter>
           <parameter name="ncolors">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="alloc_colors" c:identifier="gdk_colormap_alloc_colors">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="colormap">
@@ -296,13 +296,13 @@
             <type name="GdkColor" c:type="GdkColor*"/>
           </parameter>
           <parameter name="n_colors">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="writeable">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="best_match">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="success">
             <type name="gboolean" c:type="gboolean*"/>
@@ -311,7 +311,7 @@
       </method>
       <method name="alloc_color" c:identifier="gdk_colormap_alloc_color">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="colormap">
@@ -321,16 +321,16 @@
             <type name="GdkColor" c:type="GdkColor*"/>
           </parameter>
           <parameter name="writeable">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="best_match">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="free_colors" c:identifier="gdk_colormap_free_colors">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="colormap">
@@ -340,20 +340,20 @@
             <type name="GdkColor" c:type="GdkColor*"/>
           </parameter>
           <parameter name="n_colors">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="query_color" c:identifier="gdk_colormap_query_color">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="colormap">
             <type name="Colormap" c:type="GdkColormap*"/>
           </parameter>
           <parameter name="pixel">
-            <type name="gulong" c:type="gulong"/>
+            <type name="ulong" c:type="gulong"/>
           </parameter>
           <parameter name="result">
             <type name="GdkColor" c:type="GdkColor*"/>
@@ -374,7 +374,7 @@
     <function name="colormap_get_system_size"
               c:identifier="gdk_colormap_get_system_size">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
     </function>
     <function name="color_copy" c:identifier="gdk_color_copy">
@@ -389,7 +389,7 @@
     </function>
     <function name="color_free" c:identifier="gdk_color_free">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="color">
@@ -399,11 +399,11 @@
     </function>
     <function name="color_parse" c:identifier="gdk_color_parse">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="spec">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="color">
           <type name="GdkColor" c:type="GdkColor*"/>
@@ -422,7 +422,7 @@
     </function>
     <function name="color_equal" c:identifier="gdk_color_equal">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="colora">
@@ -435,7 +435,7 @@
     </function>
     <function name="color_to_string" c:identifier="gdk_color_to_string">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="color">
@@ -450,7 +450,7 @@
     </glib:boxed>
     <function name="colors_store" c:identifier="gdk_colors_store">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="colormap">
@@ -460,13 +460,13 @@
           <type name="Color" c:type="GdkColor*"/>
         </parameter>
         <parameter name="ncolors">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="color_white" c:identifier="gdk_color_white">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="colormap">
@@ -479,7 +479,7 @@
     </function>
     <function name="color_black" c:identifier="gdk_color_black">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="colormap">
@@ -492,7 +492,7 @@
     </function>
     <function name="color_alloc" c:identifier="gdk_color_alloc">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="colormap">
@@ -505,7 +505,7 @@
     </function>
     <function name="color_change" c:identifier="gdk_color_change">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="colormap">
@@ -518,32 +518,32 @@
     </function>
     <function name="colors_alloc" c:identifier="gdk_colors_alloc">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="colormap">
           <type name="Colormap" c:type="GdkColormap*"/>
         </parameter>
         <parameter name="contiguous">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="planes">
           <type name="gulong" c:type="gulong*"/>
         </parameter>
         <parameter name="nplanes">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="pixels">
           <type name="gulong" c:type="gulong*"/>
         </parameter>
         <parameter name="npixels">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="colors_free" c:identifier="gdk_colors_free">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="colormap">
@@ -553,10 +553,10 @@
           <type name="gulong" c:type="gulong*"/>
         </parameter>
         <parameter name="npixels">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="planes">
-          <type name="gulong" c:type="gulong"/>
+          <type name="ulong" c:type="gulong"/>
         </parameter>
       </parameters>
     </function>
@@ -565,62 +565,62 @@
               glib:type-name="GdkDragAction"
               glib:get-type="gdk_drag_action_get_type">
       <member name="default"
-                value="1"
-                c:identifier="GDK_ACTION_DEFAULT"
-                glib:nick="default"/>
+              value="1"
+              c:identifier="GDK_ACTION_DEFAULT"
+              glib:nick="default"/>
       <member name="copy"
-                value="2"
-                c:identifier="GDK_ACTION_COPY"
-                glib:nick="copy"/>
+              value="2"
+              c:identifier="GDK_ACTION_COPY"
+              glib:nick="copy"/>
       <member name="move"
-                value="4"
-                c:identifier="GDK_ACTION_MOVE"
-                glib:nick="move"/>
+              value="4"
+              c:identifier="GDK_ACTION_MOVE"
+              glib:nick="move"/>
       <member name="link"
-                value="8"
-                c:identifier="GDK_ACTION_LINK"
-                glib:nick="link"/>
+              value="8"
+              c:identifier="GDK_ACTION_LINK"
+              glib:nick="link"/>
       <member name="private"
-                value="16"
-                c:identifier="GDK_ACTION_PRIVATE"
-                glib:nick="private"/>
+              value="16"
+              c:identifier="GDK_ACTION_PRIVATE"
+              glib:nick="private"/>
       <member name="ask"
-                value="32"
-                c:identifier="GDK_ACTION_ASK"
-                glib:nick="ask"/>
+              value="32"
+              c:identifier="GDK_ACTION_ASK"
+              glib:nick="ask"/>
     </bitfield>
     <enumeration name="DragProtocol"
                  c:type="GdkDragProtocol"
                  glib:type-name="GdkDragProtocol"
                  glib:get-type="gdk_drag_protocol_get_type">
       <member name="motif"
-                value="0"
-                c:identifier="GDK_DRAG_PROTO_MOTIF"
-                glib:nick="motif"/>
+              value="0"
+              c:identifier="GDK_DRAG_PROTO_MOTIF"
+              glib:nick="motif"/>
       <member name="xdnd"
-                value="1"
-                c:identifier="GDK_DRAG_PROTO_XDND"
-                glib:nick="xdnd"/>
+              value="1"
+              c:identifier="GDK_DRAG_PROTO_XDND"
+              glib:nick="xdnd"/>
       <member name="rootwin"
-                value="2"
-                c:identifier="GDK_DRAG_PROTO_ROOTWIN"
-                glib:nick="rootwin"/>
+              value="2"
+              c:identifier="GDK_DRAG_PROTO_ROOTWIN"
+              glib:nick="rootwin"/>
       <member name="none"
-                value="3"
-                c:identifier="GDK_DRAG_PROTO_NONE"
-                glib:nick="none"/>
+              value="3"
+              c:identifier="GDK_DRAG_PROTO_NONE"
+              glib:nick="none"/>
       <member name="win32-dropfiles"
-                value="4"
-                c:identifier="GDK_DRAG_PROTO_WIN32_DROPFILES"
-                glib:nick="win32-dropfiles"/>
+              value="4"
+              c:identifier="GDK_DRAG_PROTO_WIN32_DROPFILES"
+              glib:nick="win32-dropfiles"/>
       <member name="ole2"
-                value="5"
-                c:identifier="GDK_DRAG_PROTO_OLE2"
-                glib:nick="ole2"/>
+              value="5"
+              c:identifier="GDK_DRAG_PROTO_OLE2"
+              glib:nick="ole2"/>
       <member name="local"
-                value="6"
-                c:identifier="GDK_DRAG_PROTO_LOCAL"
-                glib:nick="local"/>
+              value="6"
+              c:identifier="GDK_DRAG_PROTO_LOCAL"
+              glib:nick="local"/>
     </enumeration>
     <class name="DragContext"
            c:type="GdkDragContext"
@@ -634,7 +634,7 @@
       </constructor>
       <method name="ref" c:identifier="gdk_drag_context_ref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
@@ -644,7 +644,7 @@
       </method>
       <method name="unref" c:identifier="gdk_drag_context_unref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
@@ -655,7 +655,7 @@
     </class>
     <function name="drag_status" c:identifier="gdk_drag_status">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -665,39 +665,39 @@
           <type name="GdkDragAction" c:type="GdkDragAction"/>
         </parameter>
         <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
     <function name="drop_reply" c:identifier="gdk_drop_reply">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="context">
           <type name="DragContext" c:type="GdkDragContext*"/>
         </parameter>
         <parameter name="ok">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
     <function name="drop_finish" c:identifier="gdk_drop_finish">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="context">
           <type name="DragContext" c:type="GdkDragContext*"/>
         </parameter>
         <parameter name="success">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
@@ -727,14 +727,14 @@
     <function name="drag_get_protocol_for_display"
               c:identifier="gdk_drag_get_protocol_for_display">
       <return-value>
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </return-value>
       <parameters>
         <parameter name="display">
           <type name="GdkDisplay" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="xid">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
         <parameter name="protocol">
           <type name="GdkDragProtocol" c:type="GdkDragProtocol*"/>
@@ -744,7 +744,7 @@
     <function name="drag_find_window_for_screen"
               c:identifier="gdk_drag_find_window_for_screen">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -757,26 +757,26 @@
           <type name="GdkScreen" c:type="GdkScreen*"/>
         </parameter>
         <parameter name="x_root">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y_root">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="dest_window">
+        <parameter name="dest_window" direction="out">
           <type name="GdkWindow" c:type="GdkWindow**"/>
         </parameter>
-        <parameter name="protocol">
+        <parameter name="protocol" direction="out">
           <type name="GdkDragProtocol" c:type="GdkDragProtocol*"/>
         </parameter>
       </parameters>
     </function>
     <function name="drag_get_protocol" c:identifier="gdk_drag_get_protocol">
       <return-value>
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </return-value>
       <parameters>
         <parameter name="xid">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
         <parameter name="protocol">
           <type name="GdkDragProtocol" c:type="GdkDragProtocol*"/>
@@ -785,7 +785,7 @@
     </function>
     <function name="drag_find_window" c:identifier="gdk_drag_find_window">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -795,22 +795,22 @@
           <type name="GdkWindow" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="x_root">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y_root">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="dest_window">
+        <parameter name="dest_window" direction="out">
           <type name="GdkWindow" c:type="GdkWindow**"/>
         </parameter>
-        <parameter name="protocol">
+        <parameter name="protocol" direction="out">
           <type name="GdkDragProtocol" c:type="GdkDragProtocol*"/>
         </parameter>
       </parameters>
     </function>
     <function name="drag_motion" c:identifier="gdk_drag_motion">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -823,10 +823,10 @@
           <type name="GdkDragProtocol" c:type="GdkDragProtocol"/>
         </parameter>
         <parameter name="x_root">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y_root">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="suggested_action">
           <type name="GdkDragAction" c:type="GdkDragAction"/>
@@ -835,39 +835,40 @@
           <type name="GdkDragAction" c:type="GdkDragAction"/>
         </parameter>
         <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
     <function name="drag_drop" c:identifier="gdk_drag_drop">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="context">
           <type name="DragContext" c:type="GdkDragContext*"/>
         </parameter>
         <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
     <function name="drag_abort" c:identifier="gdk_drag_abort">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="context">
           <type name="DragContext" c:type="GdkDragContext*"/>
         </parameter>
         <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_drop_succeeded" c:identifier="gdk_drag_drop_succeeded">
+    <function name="drag_drop_succeeded"
+              c:identifier="gdk_drag_drop_succeeded">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -888,18 +889,18 @@
         <type name="GdkAxisUse" c:type="GdkAxisUse"/>
       </field>
       <field name="min">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="max">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
     </record>
     <record name="GdkTimeCoord" c:type="GdkTimeCoord">
       <field name="time">
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </field>
       <field name="axes">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
     </record>
     <enumeration name="ExtensionMode"
@@ -907,86 +908,86 @@
                  glib:type-name="GdkExtensionMode"
                  glib:get-type="gdk_extension_mode_get_type">
       <member name="none"
-                value="0"
-                c:identifier="GDK_EXTENSION_EVENTS_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="GDK_EXTENSION_EVENTS_NONE"
+              glib:nick="none"/>
       <member name="all"
-                value="1"
-                c:identifier="GDK_EXTENSION_EVENTS_ALL"
-                glib:nick="all"/>
+              value="1"
+              c:identifier="GDK_EXTENSION_EVENTS_ALL"
+              glib:nick="all"/>
       <member name="cursor"
-                value="2"
-                c:identifier="GDK_EXTENSION_EVENTS_CURSOR"
-                glib:nick="cursor"/>
+              value="2"
+              c:identifier="GDK_EXTENSION_EVENTS_CURSOR"
+              glib:nick="cursor"/>
     </enumeration>
     <enumeration name="InputSource"
                  c:type="GdkInputSource"
                  glib:type-name="GdkInputSource"
                  glib:get-type="gdk_input_source_get_type">
       <member name="mouse"
-                value="0"
-                c:identifier="GDK_SOURCE_MOUSE"
-                glib:nick="mouse"/>
+              value="0"
+              c:identifier="GDK_SOURCE_MOUSE"
+              glib:nick="mouse"/>
       <member name="pen"
-                value="1"
-                c:identifier="GDK_SOURCE_PEN"
-                glib:nick="pen"/>
+              value="1"
+              c:identifier="GDK_SOURCE_PEN"
+              glib:nick="pen"/>
       <member name="eraser"
-                value="2"
-                c:identifier="GDK_SOURCE_ERASER"
-                glib:nick="eraser"/>
+              value="2"
+              c:identifier="GDK_SOURCE_ERASER"
+              glib:nick="eraser"/>
       <member name="cursor"
-                value="3"
-                c:identifier="GDK_SOURCE_CURSOR"
-                glib:nick="cursor"/>
+              value="3"
+              c:identifier="GDK_SOURCE_CURSOR"
+              glib:nick="cursor"/>
     </enumeration>
     <enumeration name="InputMode"
                  c:type="GdkInputMode"
                  glib:type-name="GdkInputMode"
                  glib:get-type="gdk_input_mode_get_type">
       <member name="disabled"
-                value="0"
-                c:identifier="GDK_MODE_DISABLED"
-                glib:nick="disabled"/>
+              value="0"
+              c:identifier="GDK_MODE_DISABLED"
+              glib:nick="disabled"/>
       <member name="screen"
-                value="1"
-                c:identifier="GDK_MODE_SCREEN"
-                glib:nick="screen"/>
+              value="1"
+              c:identifier="GDK_MODE_SCREEN"
+              glib:nick="screen"/>
       <member name="window"
-                value="2"
-                c:identifier="GDK_MODE_WINDOW"
-                glib:nick="window"/>
+              value="2"
+              c:identifier="GDK_MODE_WINDOW"
+              glib:nick="window"/>
     </enumeration>
     <enumeration name="AxisUse"
                  c:type="GdkAxisUse"
                  glib:type-name="GdkAxisUse"
                  glib:get-type="gdk_axis_use_get_type">
       <member name="ignore"
-                value="0"
-                c:identifier="GDK_AXIS_IGNORE"
-                glib:nick="ignore"/>
+              value="0"
+              c:identifier="GDK_AXIS_IGNORE"
+              glib:nick="ignore"/>
       <member name="x" value="1" c:identifier="GDK_AXIS_X" glib:nick="x"/>
       <member name="y" value="2" c:identifier="GDK_AXIS_Y" glib:nick="y"/>
       <member name="pressure"
-                value="3"
-                c:identifier="GDK_AXIS_PRESSURE"
-                glib:nick="pressure"/>
+              value="3"
+              c:identifier="GDK_AXIS_PRESSURE"
+              glib:nick="pressure"/>
       <member name="xtilt"
-                value="4"
-                c:identifier="GDK_AXIS_XTILT"
-                glib:nick="xtilt"/>
+              value="4"
+              c:identifier="GDK_AXIS_XTILT"
+              glib:nick="xtilt"/>
       <member name="ytilt"
-                value="5"
-                c:identifier="GDK_AXIS_YTILT"
-                glib:nick="ytilt"/>
+              value="5"
+              c:identifier="GDK_AXIS_YTILT"
+              glib:nick="ytilt"/>
       <member name="wheel"
-                value="6"
-                c:identifier="GDK_AXIS_WHEEL"
-                glib:nick="wheel"/>
+              value="6"
+              c:identifier="GDK_AXIS_WHEEL"
+              glib:nick="wheel"/>
       <member name="last"
-                value="7"
-                c:identifier="GDK_AXIS_LAST"
-                glib:nick="last"/>
+              value="7"
+              c:identifier="GDK_AXIS_LAST"
+              glib:nick="last"/>
     </enumeration>
     <class name="Device"
            c:type="GdkDevice"
@@ -1001,7 +1002,7 @@
       </constructor>
       <method name="set_source" c:identifier="gdk_device_set_source">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="device">
@@ -1014,7 +1015,7 @@
       </method>
       <method name="set_mode" c:identifier="gdk_device_set_mode">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="device">
@@ -1027,7 +1028,7 @@
       </method>
       <method name="set_key" c:identifier="gdk_device_set_key">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="device">
@@ -1046,7 +1047,7 @@
       </method>
       <method name="set_axis_use" c:identifier="gdk_device_set_axis_use">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="device">
@@ -1062,7 +1063,7 @@
       </method>
       <method name="get_state" c:identifier="gdk_device_get_state">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="device">
@@ -1074,14 +1075,14 @@
           <parameter name="axes">
             <type name="gdouble" c:type="gdouble*"/>
           </parameter>
-          <parameter name="mask">
+          <parameter name="mask" direction="out">
             <type name="GdkModifierType" c:type="GdkModifierType*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_history" c:identifier="gdk_device_get_history">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="device">
@@ -1091,22 +1092,22 @@
             <type name="GdkWindow" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="start">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
           <parameter name="stop">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
-          <parameter name="events">
+          <parameter name="events" direction="out">
             <type name="GdkTimeCoord" c:type="GdkTimeCoord***"/>
           </parameter>
-          <parameter name="n_events">
+          <parameter name="n_events" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_axis" c:identifier="gdk_device_get_axis">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="device">
@@ -1129,30 +1130,31 @@
         <type name="GList*" c:type="GList*"/>
       </return-value>
     </function>
-    <function name="device_free_history" c:identifier="gdk_device_free_history">
+    <function name="device_free_history"
+              c:identifier="gdk_device_free_history">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="events">
           <type name="GdkTimeCoord" c:type="GdkTimeCoord**"/>
         </parameter>
         <parameter name="n_events">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="input_set_extension_events"
               c:identifier="gdk_input_set_extension_events">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="window">
           <type name="GdkWindow" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="mask">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="mode">
           <type name="GdkExtensionMode" c:type="GdkExtensionMode"/>
@@ -1167,7 +1169,7 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
     </record>
     <record name="GdkEventExpose" c:type="GdkEventExpose">
@@ -1178,7 +1180,7 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="area">
         <type name="GdkRectangle" c:type="GdkRectangle"/>
@@ -1187,7 +1189,7 @@
         <type name="GdkRegion*" c:type="GdkRegion*"/>
       </field>
       <field name="count">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
     </record>
     <record name="GdkEventNoExpose" c:type="GdkEventNoExpose">
@@ -1198,7 +1200,7 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
     </record>
     <record name="GdkEventVisibility" c:type="GdkEventVisibility">
@@ -1209,7 +1211,7 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="state">
         <type name="GdkVisibilityState" c:type="GdkVisibilityState"/>
@@ -1223,16 +1225,16 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="time">
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </field>
       <field name="x">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="y">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="axes">
         <type name="gdouble*" c:type="gdouble*"/>
@@ -1241,16 +1243,16 @@
         <type name="guint" c:type="guint"/>
       </field>
       <field name="is_hint">
-        <type name="gint16" c:type="gint16"/>
+        <type name="int16" c:type="gint16"/>
       </field>
       <field name="device">
         <type name="GdkDevice*" c:type="GdkDevice*"/>
       </field>
       <field name="x_root">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="y_root">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
     </record>
     <record name="GdkEventButton" c:type="GdkEventButton">
@@ -1261,16 +1263,16 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="time">
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </field>
       <field name="x">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="y">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="axes">
         <type name="gdouble*" c:type="gdouble*"/>
@@ -1285,10 +1287,10 @@
         <type name="GdkDevice*" c:type="GdkDevice*"/>
       </field>
       <field name="x_root">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="y_root">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
     </record>
     <record name="GdkEventScroll" c:type="GdkEventScroll">
@@ -1299,16 +1301,16 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="time">
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </field>
       <field name="x">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="y">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="state">
         <type name="guint" c:type="guint"/>
@@ -1320,10 +1322,10 @@
         <type name="GdkDevice*" c:type="GdkDevice*"/>
       </field>
       <field name="x_root">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="y_root">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
     </record>
     <record name="GdkEventKey" c:type="GdkEventKey">
@@ -1334,10 +1336,10 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="time">
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </field>
       <field name="state">
         <type name="guint" c:type="guint"/>
@@ -1346,16 +1348,16 @@
         <type name="guint" c:type="guint"/>
       </field>
       <field name="length">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="string">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="hardware_keycode">
-        <type name="guint16" c:type="guint16"/>
+        <type name="uint16" c:type="guint16"/>
       </field>
       <field name="group">
-        <type name="guint8" c:type="guint8"/>
+        <type name="uint8" c:type="guint8"/>
       </field>
       <field name="is_modifier">
         <type name="guint" c:type="guint"/>
@@ -1369,10 +1371,10 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="in">
-        <type name="gint16" c:type="gint16"/>
+        <type name="int16" c:type="gint16"/>
       </field>
     </record>
     <record name="GdkEventCrossing" c:type="GdkEventCrossing">
@@ -1383,25 +1385,25 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="subwindow">
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="time">
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </field>
       <field name="x">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="y">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="x_root">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="y_root">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="mode">
         <type name="GdkCrossingMode" c:type="GdkCrossingMode"/>
@@ -1410,7 +1412,7 @@
         <type name="GdkNotifyType" c:type="GdkNotifyType"/>
       </field>
       <field name="focus">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </field>
       <field name="state">
         <type name="guint" c:type="guint"/>
@@ -1424,19 +1426,19 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="x">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="y">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="width">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="height">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
     </record>
     <record name="GdkEventProperty" c:type="GdkEventProperty">
@@ -1447,13 +1449,13 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="atom">
         <type name="GdkAtom" c:type="GdkAtom"/>
       </field>
       <field name="time">
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </field>
       <field name="state">
         <type name="guint" c:type="guint"/>
@@ -1467,7 +1469,7 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="selection">
         <type name="GdkAtom" c:type="GdkAtom"/>
@@ -1479,7 +1481,7 @@
         <type name="GdkAtom" c:type="GdkAtom"/>
       </field>
       <field name="time">
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </field>
       <field name="requestor">
         <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
@@ -1493,7 +1495,7 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="owner">
         <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
@@ -1505,10 +1507,10 @@
         <type name="GdkAtom" c:type="GdkAtom"/>
       </field>
       <field name="time">
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </field>
       <field name="selection_time">
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </field>
     </record>
     <record name="GdkEventProximity" c:type="GdkEventProximity">
@@ -1519,10 +1521,10 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="time">
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </field>
       <field name="device">
         <type name="GdkDevice*" c:type="GdkDevice*"/>
@@ -1536,7 +1538,7 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="message_type">
         <type name="GdkAtom" c:type="GdkAtom"/>
@@ -1556,13 +1558,13 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="context">
         <type name="GdkDragContext*" c:type="GdkDragContext*"/>
       </field>
       <field name="time">
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </field>
       <field name="x_root">
         <type name="gshort" c:type="gshort"/>
@@ -1579,7 +1581,7 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="changed_mask">
         <type name="GdkWindowState" c:type="GdkWindowState"/>
@@ -1596,13 +1598,13 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="action">
         <type name="GdkSettingAction" c:type="GdkSettingAction"/>
       </field>
       <field name="name">
-        <type name="char*" c:type="char*"/>
+        <type name="string" c:type="char*"/>
       </field>
     </record>
     <record name="GdkEventGrabBroken" c:type="GdkEventGrabBroken">
@@ -1613,13 +1615,13 @@
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </field>
       <field name="send_event">
-        <type name="gint8" c:type="gint8"/>
+        <type name="int8" c:type="gint8"/>
       </field>
       <field name="keyboard">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </field>
       <field name="implicit">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </field>
       <field name="grab_window">
         <type name="GdkWindow*" c:type="GdkWindow*"/>
@@ -1627,14 +1629,14 @@
     </record>
     <callback name="GdkEventFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="event">
           <type name="GdkEvent*" c:type="GdkEvent*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
@@ -1643,17 +1645,17 @@
                  glib:type-name="GdkFilterReturn"
                  glib:get-type="gdk_filter_return_get_type">
       <member name="continue"
-                value="0"
-                c:identifier="GDK_FILTER_CONTINUE"
-                glib:nick="continue"/>
+              value="0"
+              c:identifier="GDK_FILTER_CONTINUE"
+              glib:nick="continue"/>
       <member name="translate"
-                value="1"
-                c:identifier="GDK_FILTER_TRANSLATE"
-                glib:nick="translate"/>
+              value="1"
+              c:identifier="GDK_FILTER_TRANSLATE"
+              glib:nick="translate"/>
       <member name="remove"
-                value="2"
-                c:identifier="GDK_FILTER_REMOVE"
-                glib:nick="remove"/>
+              value="2"
+              c:identifier="GDK_FILTER_REMOVE"
+              glib:nick="remove"/>
     </enumeration>
     <callback name="GdkFilterFunc">
       <return-value>
@@ -1667,7 +1669,7 @@
           <type name="GdkEvent*" c:type="GdkEvent*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
@@ -1676,264 +1678,264 @@
                  glib:type-name="GdkEventType"
                  glib:get-type="gdk_event_type_get_type">
       <member name="nothing"
-                value="-1"
-                c:identifier="GDK_NOTHING"
-                glib:nick="nothing"/>
+              value="-1"
+              c:identifier="GDK_NOTHING"
+              glib:nick="nothing"/>
       <member name="delete"
-                value="0"
-                c:identifier="GDK_DELETE"
-                glib:nick="delete"/>
+              value="0"
+              c:identifier="GDK_DELETE"
+              glib:nick="delete"/>
       <member name="destroy"
-                value="1"
-                c:identifier="GDK_DESTROY"
-                glib:nick="destroy"/>
+              value="1"
+              c:identifier="GDK_DESTROY"
+              glib:nick="destroy"/>
       <member name="expose"
-                value="2"
-                c:identifier="GDK_EXPOSE"
-                glib:nick="expose"/>
+              value="2"
+              c:identifier="GDK_EXPOSE"
+              glib:nick="expose"/>
       <member name="motion-notify"
-                value="3"
-                c:identifier="GDK_MOTION_NOTIFY"
-                glib:nick="motion-notify"/>
+              value="3"
+              c:identifier="GDK_MOTION_NOTIFY"
+              glib:nick="motion-notify"/>
       <member name="button-press"
-                value="4"
-                c:identifier="GDK_BUTTON_PRESS"
-                glib:nick="button-press"/>
+              value="4"
+              c:identifier="GDK_BUTTON_PRESS"
+              glib:nick="button-press"/>
       <member name="2button-press"
-                value="5"
-                c:identifier="GDK_2BUTTON_PRESS"
-                glib:nick="2button-press"/>
+              value="5"
+              c:identifier="GDK_2BUTTON_PRESS"
+              glib:nick="2button-press"/>
       <member name="3button-press"
-                value="6"
-                c:identifier="GDK_3BUTTON_PRESS"
-                glib:nick="3button-press"/>
+              value="6"
+              c:identifier="GDK_3BUTTON_PRESS"
+              glib:nick="3button-press"/>
       <member name="button-release"
-                value="7"
-                c:identifier="GDK_BUTTON_RELEASE"
-                glib:nick="button-release"/>
+              value="7"
+              c:identifier="GDK_BUTTON_RELEASE"
+              glib:nick="button-release"/>
       <member name="key-press"
-                value="8"
-                c:identifier="GDK_KEY_PRESS"
-                glib:nick="key-press"/>
+              value="8"
+              c:identifier="GDK_KEY_PRESS"
+              glib:nick="key-press"/>
       <member name="key-release"
-                value="9"
-                c:identifier="GDK_KEY_RELEASE"
-                glib:nick="key-release"/>
+              value="9"
+              c:identifier="GDK_KEY_RELEASE"
+              glib:nick="key-release"/>
       <member name="enter-notify"
-                value="10"
-                c:identifier="GDK_ENTER_NOTIFY"
-                glib:nick="enter-notify"/>
+              value="10"
+              c:identifier="GDK_ENTER_NOTIFY"
+              glib:nick="enter-notify"/>
       <member name="leave-notify"
-                value="11"
-                c:identifier="GDK_LEAVE_NOTIFY"
-                glib:nick="leave-notify"/>
+              value="11"
+              c:identifier="GDK_LEAVE_NOTIFY"
+              glib:nick="leave-notify"/>
       <member name="focus-change"
-                value="12"
-                c:identifier="GDK_FOCUS_CHANGE"
-                glib:nick="focus-change"/>
+              value="12"
+              c:identifier="GDK_FOCUS_CHANGE"
+              glib:nick="focus-change"/>
       <member name="configure"
-                value="13"
-                c:identifier="GDK_CONFIGURE"
-                glib:nick="configure"/>
+              value="13"
+              c:identifier="GDK_CONFIGURE"
+              glib:nick="configure"/>
       <member name="map" value="14" c:identifier="GDK_MAP" glib:nick="map"/>
       <member name="unmap"
-                value="15"
-                c:identifier="GDK_UNMAP"
-                glib:nick="unmap"/>
+              value="15"
+              c:identifier="GDK_UNMAP"
+              glib:nick="unmap"/>
       <member name="property-notify"
-                value="16"
-                c:identifier="GDK_PROPERTY_NOTIFY"
-                glib:nick="property-notify"/>
+              value="16"
+              c:identifier="GDK_PROPERTY_NOTIFY"
+              glib:nick="property-notify"/>
       <member name="selection-clear"
-                value="17"
-                c:identifier="GDK_SELECTION_CLEAR"
-                glib:nick="selection-clear"/>
+              value="17"
+              c:identifier="GDK_SELECTION_CLEAR"
+              glib:nick="selection-clear"/>
       <member name="selection-request"
-                value="18"
-                c:identifier="GDK_SELECTION_REQUEST"
-                glib:nick="selection-request"/>
+              value="18"
+              c:identifier="GDK_SELECTION_REQUEST"
+              glib:nick="selection-request"/>
       <member name="selection-notify"
-                value="19"
-                c:identifier="GDK_SELECTION_NOTIFY"
-                glib:nick="selection-notify"/>
+              value="19"
+              c:identifier="GDK_SELECTION_NOTIFY"
+              glib:nick="selection-notify"/>
       <member name="proximity-in"
-                value="20"
-                c:identifier="GDK_PROXIMITY_IN"
-                glib:nick="proximity-in"/>
+              value="20"
+              c:identifier="GDK_PROXIMITY_IN"
+              glib:nick="proximity-in"/>
       <member name="proximity-out"
-                value="21"
-                c:identifier="GDK_PROXIMITY_OUT"
-                glib:nick="proximity-out"/>
+              value="21"
+              c:identifier="GDK_PROXIMITY_OUT"
+              glib:nick="proximity-out"/>
       <member name="drag-enter"
-                value="22"
-                c:identifier="GDK_DRAG_ENTER"
-                glib:nick="drag-enter"/>
+              value="22"
+              c:identifier="GDK_DRAG_ENTER"
+              glib:nick="drag-enter"/>
       <member name="drag-leave"
-                value="23"
-                c:identifier="GDK_DRAG_LEAVE"
-                glib:nick="drag-leave"/>
+              value="23"
+              c:identifier="GDK_DRAG_LEAVE"
+              glib:nick="drag-leave"/>
       <member name="drag-motion"
-                value="24"
-                c:identifier="GDK_DRAG_MOTION"
-                glib:nick="drag-motion"/>
+              value="24"
+              c:identifier="GDK_DRAG_MOTION"
+              glib:nick="drag-motion"/>
       <member name="drag-status"
-                value="25"
-                c:identifier="GDK_DRAG_STATUS"
-                glib:nick="drag-status"/>
+              value="25"
+              c:identifier="GDK_DRAG_STATUS"
+              glib:nick="drag-status"/>
       <member name="drop-start"
-                value="26"
-                c:identifier="GDK_DROP_START"
-                glib:nick="drop-start"/>
+              value="26"
+              c:identifier="GDK_DROP_START"
+              glib:nick="drop-start"/>
       <member name="drop-finished"
-                value="27"
-                c:identifier="GDK_DROP_FINISHED"
-                glib:nick="drop-finished"/>
+              value="27"
+              c:identifier="GDK_DROP_FINISHED"
+              glib:nick="drop-finished"/>
       <member name="client-event"
-                value="28"
-                c:identifier="GDK_CLIENT_EVENT"
-                glib:nick="client-event"/>
+              value="28"
+              c:identifier="GDK_CLIENT_EVENT"
+              glib:nick="client-event"/>
       <member name="visibility-notify"
-                value="29"
-                c:identifier="GDK_VISIBILITY_NOTIFY"
-                glib:nick="visibility-notify"/>
+              value="29"
+              c:identifier="GDK_VISIBILITY_NOTIFY"
+              glib:nick="visibility-notify"/>
       <member name="no-expose"
-                value="30"
-                c:identifier="GDK_NO_EXPOSE"
-                glib:nick="no-expose"/>
+              value="30"
+              c:identifier="GDK_NO_EXPOSE"
+              glib:nick="no-expose"/>
       <member name="scroll"
-                value="31"
-                c:identifier="GDK_SCROLL"
-                glib:nick="scroll"/>
+              value="31"
+              c:identifier="GDK_SCROLL"
+              glib:nick="scroll"/>
       <member name="window-state"
-                value="32"
-                c:identifier="GDK_WINDOW_STATE"
-                glib:nick="window-state"/>
+              value="32"
+              c:identifier="GDK_WINDOW_STATE"
+              glib:nick="window-state"/>
       <member name="setting"
-                value="33"
-                c:identifier="GDK_SETTING"
-                glib:nick="setting"/>
+              value="33"
+              c:identifier="GDK_SETTING"
+              glib:nick="setting"/>
       <member name="owner-change"
-                value="34"
-                c:identifier="GDK_OWNER_CHANGE"
-                glib:nick="owner-change"/>
+              value="34"
+              c:identifier="GDK_OWNER_CHANGE"
+              glib:nick="owner-change"/>
       <member name="grab-broken"
-                value="35"
-                c:identifier="GDK_GRAB_BROKEN"
-                glib:nick="grab-broken"/>
+              value="35"
+              c:identifier="GDK_GRAB_BROKEN"
+              glib:nick="grab-broken"/>
       <member name="damage"
-                value="36"
-                c:identifier="GDK_DAMAGE"
-                glib:nick="damage"/>
+              value="36"
+              c:identifier="GDK_DAMAGE"
+              glib:nick="damage"/>
     </enumeration>
     <bitfield name="EventMask"
               c:type="GdkEventMask"
               glib:type-name="GdkEventMask"
               glib:get-type="gdk_event_mask_get_type">
       <member name="exposure-mask"
-                value="2"
-                c:identifier="GDK_EXPOSURE_MASK"
-                glib:nick="exposure-mask"/>
+              value="2"
+              c:identifier="GDK_EXPOSURE_MASK"
+              glib:nick="exposure-mask"/>
       <member name="pointer-motion-mask"
-                value="4"
-                c:identifier="GDK_POINTER_MOTION_MASK"
-                glib:nick="pointer-motion-mask"/>
+              value="4"
+              c:identifier="GDK_POINTER_MOTION_MASK"
+              glib:nick="pointer-motion-mask"/>
       <member name="pointer-motion-hint-mask"
-                value="8"
-                c:identifier="GDK_POINTER_MOTION_HINT_MASK"
-                glib:nick="pointer-motion-hint-mask"/>
+              value="8"
+              c:identifier="GDK_POINTER_MOTION_HINT_MASK"
+              glib:nick="pointer-motion-hint-mask"/>
       <member name="button-motion-mask"
-                value="16"
-                c:identifier="GDK_BUTTON_MOTION_MASK"
-                glib:nick="button-motion-mask"/>
+              value="16"
+              c:identifier="GDK_BUTTON_MOTION_MASK"
+              glib:nick="button-motion-mask"/>
       <member name="button1-motion-mask"
-                value="32"
-                c:identifier="GDK_BUTTON1_MOTION_MASK"
-                glib:nick="button1-motion-mask"/>
+              value="32"
+              c:identifier="GDK_BUTTON1_MOTION_MASK"
+              glib:nick="button1-motion-mask"/>
       <member name="button2-motion-mask"
-                value="64"
-                c:identifier="GDK_BUTTON2_MOTION_MASK"
-                glib:nick="button2-motion-mask"/>
+              value="64"
+              c:identifier="GDK_BUTTON2_MOTION_MASK"
+              glib:nick="button2-motion-mask"/>
       <member name="button3-motion-mask"
-                value="128"
-                c:identifier="GDK_BUTTON3_MOTION_MASK"
-                glib:nick="button3-motion-mask"/>
+              value="128"
+              c:identifier="GDK_BUTTON3_MOTION_MASK"
+              glib:nick="button3-motion-mask"/>
       <member name="button-press-mask"
-                value="256"
-                c:identifier="GDK_BUTTON_PRESS_MASK"
-                glib:nick="button-press-mask"/>
+              value="256"
+              c:identifier="GDK_BUTTON_PRESS_MASK"
+              glib:nick="button-press-mask"/>
       <member name="button-release-mask"
-                value="512"
-                c:identifier="GDK_BUTTON_RELEASE_MASK"
-                glib:nick="button-release-mask"/>
+              value="512"
+              c:identifier="GDK_BUTTON_RELEASE_MASK"
+              glib:nick="button-release-mask"/>
       <member name="key-press-mask"
-                value="1024"
-                c:identifier="GDK_KEY_PRESS_MASK"
-                glib:nick="key-press-mask"/>
+              value="1024"
+              c:identifier="GDK_KEY_PRESS_MASK"
+              glib:nick="key-press-mask"/>
       <member name="key-release-mask"
-                value="2048"
-                c:identifier="GDK_KEY_RELEASE_MASK"
-                glib:nick="key-release-mask"/>
+              value="2048"
+              c:identifier="GDK_KEY_RELEASE_MASK"
+              glib:nick="key-release-mask"/>
       <member name="enter-notify-mask"
-                value="4096"
-                c:identifier="GDK_ENTER_NOTIFY_MASK"
-                glib:nick="enter-notify-mask"/>
+              value="4096"
+              c:identifier="GDK_ENTER_NOTIFY_MASK"
+              glib:nick="enter-notify-mask"/>
       <member name="leave-notify-mask"
-                value="8192"
-                c:identifier="GDK_LEAVE_NOTIFY_MASK"
-                glib:nick="leave-notify-mask"/>
+              value="8192"
+              c:identifier="GDK_LEAVE_NOTIFY_MASK"
+              glib:nick="leave-notify-mask"/>
       <member name="focus-change-mask"
-                value="16384"
-                c:identifier="GDK_FOCUS_CHANGE_MASK"
-                glib:nick="focus-change-mask"/>
+              value="16384"
+              c:identifier="GDK_FOCUS_CHANGE_MASK"
+              glib:nick="focus-change-mask"/>
       <member name="structure-mask"
-                value="32768"
-                c:identifier="GDK_STRUCTURE_MASK"
-                glib:nick="structure-mask"/>
+              value="32768"
+              c:identifier="GDK_STRUCTURE_MASK"
+              glib:nick="structure-mask"/>
       <member name="property-change-mask"
-                value="65536"
-                c:identifier="GDK_PROPERTY_CHANGE_MASK"
-                glib:nick="property-change-mask"/>
+              value="65536"
+              c:identifier="GDK_PROPERTY_CHANGE_MASK"
+              glib:nick="property-change-mask"/>
       <member name="visibility-notify-mask"
-                value="131072"
-                c:identifier="GDK_VISIBILITY_NOTIFY_MASK"
-                glib:nick="visibility-notify-mask"/>
+              value="131072"
+              c:identifier="GDK_VISIBILITY_NOTIFY_MASK"
+              glib:nick="visibility-notify-mask"/>
       <member name="proximity-in-mask"
-                value="262144"
-                c:identifier="GDK_PROXIMITY_IN_MASK"
-                glib:nick="proximity-in-mask"/>
+              value="262144"
+              c:identifier="GDK_PROXIMITY_IN_MASK"
+              glib:nick="proximity-in-mask"/>
       <member name="proximity-out-mask"
-                value="524288"
-                c:identifier="GDK_PROXIMITY_OUT_MASK"
-                glib:nick="proximity-out-mask"/>
+              value="524288"
+              c:identifier="GDK_PROXIMITY_OUT_MASK"
+              glib:nick="proximity-out-mask"/>
       <member name="substructure-mask"
-                value="1048576"
-                c:identifier="GDK_SUBSTRUCTURE_MASK"
-                glib:nick="substructure-mask"/>
+              value="1048576"
+              c:identifier="GDK_SUBSTRUCTURE_MASK"
+              glib:nick="substructure-mask"/>
       <member name="scroll-mask"
-                value="2097152"
-                c:identifier="GDK_SCROLL_MASK"
-                glib:nick="scroll-mask"/>
+              value="2097152"
+              c:identifier="GDK_SCROLL_MASK"
+              glib:nick="scroll-mask"/>
       <member name="all-events-mask"
-                value="4194302"
-                c:identifier="GDK_ALL_EVENTS_MASK"
-                glib:nick="all-events-mask"/>
+              value="4194302"
+              c:identifier="GDK_ALL_EVENTS_MASK"
+              glib:nick="all-events-mask"/>
     </bitfield>
     <enumeration name="VisibilityState"
                  c:type="GdkVisibilityState"
                  glib:type-name="GdkVisibilityState"
                  glib:get-type="gdk_visibility_state_get_type">
       <member name="unobscured"
-                value="0"
-                c:identifier="GDK_VISIBILITY_UNOBSCURED"
-                glib:nick="unobscured"/>
+              value="0"
+              c:identifier="GDK_VISIBILITY_UNOBSCURED"
+              glib:nick="unobscured"/>
       <member name="partial"
-                value="1"
-                c:identifier="GDK_VISIBILITY_PARTIAL"
-                glib:nick="partial"/>
+              value="1"
+              c:identifier="GDK_VISIBILITY_PARTIAL"
+              glib:nick="partial"/>
       <member name="fully-obscured"
-                value="2"
-                c:identifier="GDK_VISIBILITY_FULLY_OBSCURED"
-                glib:nick="fully-obscured"/>
+              value="2"
+              c:identifier="GDK_VISIBILITY_FULLY_OBSCURED"
+              glib:nick="fully-obscured"/>
     </enumeration>
     <enumeration name="ScrollDirection"
                  c:type="GdkScrollDirection"
@@ -1941,143 +1943,143 @@
                  glib:get-type="gdk_scroll_direction_get_type">
       <member name="up" value="0" c:identifier="GDK_SCROLL_UP" glib:nick="up"/>
       <member name="down"
-                value="1"
-                c:identifier="GDK_SCROLL_DOWN"
-                glib:nick="down"/>
+              value="1"
+              c:identifier="GDK_SCROLL_DOWN"
+              glib:nick="down"/>
       <member name="left"
-                value="2"
-                c:identifier="GDK_SCROLL_LEFT"
-                glib:nick="left"/>
+              value="2"
+              c:identifier="GDK_SCROLL_LEFT"
+              glib:nick="left"/>
       <member name="right"
-                value="3"
-                c:identifier="GDK_SCROLL_RIGHT"
-                glib:nick="right"/>
+              value="3"
+              c:identifier="GDK_SCROLL_RIGHT"
+              glib:nick="right"/>
     </enumeration>
     <enumeration name="NotifyType"
                  c:type="GdkNotifyType"
                  glib:type-name="GdkNotifyType"
                  glib:get-type="gdk_notify_type_get_type">
       <member name="ancestor"
-                value="0"
-                c:identifier="GDK_NOTIFY_ANCESTOR"
-                glib:nick="ancestor"/>
+              value="0"
+              c:identifier="GDK_NOTIFY_ANCESTOR"
+              glib:nick="ancestor"/>
       <member name="virtual"
-                value="1"
-                c:identifier="GDK_NOTIFY_VIRTUAL"
-                glib:nick="virtual"/>
+              value="1"
+              c:identifier="GDK_NOTIFY_VIRTUAL"
+              glib:nick="virtual"/>
       <member name="inferior"
-                value="2"
-                c:identifier="GDK_NOTIFY_INFERIOR"
-                glib:nick="inferior"/>
+              value="2"
+              c:identifier="GDK_NOTIFY_INFERIOR"
+              glib:nick="inferior"/>
       <member name="nonlinear"
-                value="3"
-                c:identifier="GDK_NOTIFY_NONLINEAR"
-                glib:nick="nonlinear"/>
+              value="3"
+              c:identifier="GDK_NOTIFY_NONLINEAR"
+              glib:nick="nonlinear"/>
       <member name="nonlinear-virtual"
-                value="4"
-                c:identifier="GDK_NOTIFY_NONLINEAR_VIRTUAL"
-                glib:nick="nonlinear-virtual"/>
+              value="4"
+              c:identifier="GDK_NOTIFY_NONLINEAR_VIRTUAL"
+              glib:nick="nonlinear-virtual"/>
       <member name="unknown"
-                value="5"
-                c:identifier="GDK_NOTIFY_UNKNOWN"
-                glib:nick="unknown"/>
+              value="5"
+              c:identifier="GDK_NOTIFY_UNKNOWN"
+              glib:nick="unknown"/>
     </enumeration>
     <enumeration name="CrossingMode"
                  c:type="GdkCrossingMode"
                  glib:type-name="GdkCrossingMode"
                  glib:get-type="gdk_crossing_mode_get_type">
       <member name="normal"
-                value="0"
-                c:identifier="GDK_CROSSING_NORMAL"
-                glib:nick="normal"/>
+              value="0"
+              c:identifier="GDK_CROSSING_NORMAL"
+              glib:nick="normal"/>
       <member name="grab"
-                value="1"
-                c:identifier="GDK_CROSSING_GRAB"
-                glib:nick="grab"/>
+              value="1"
+              c:identifier="GDK_CROSSING_GRAB"
+              glib:nick="grab"/>
       <member name="ungrab"
-                value="2"
-                c:identifier="GDK_CROSSING_UNGRAB"
-                glib:nick="ungrab"/>
+              value="2"
+              c:identifier="GDK_CROSSING_UNGRAB"
+              glib:nick="ungrab"/>
     </enumeration>
     <enumeration name="PropertyState"
                  c:type="GdkPropertyState"
                  glib:type-name="GdkPropertyState"
                  glib:get-type="gdk_property_state_get_type">
       <member name="new-value"
-                value="0"
-                c:identifier="GDK_PROPERTY_NEW_VALUE"
-                glib:nick="new-value"/>
+              value="0"
+              c:identifier="GDK_PROPERTY_NEW_VALUE"
+              glib:nick="new-value"/>
       <member name="delete"
-                value="1"
-                c:identifier="GDK_PROPERTY_DELETE"
-                glib:nick="delete"/>
+              value="1"
+              c:identifier="GDK_PROPERTY_DELETE"
+              glib:nick="delete"/>
     </enumeration>
     <bitfield name="WindowState"
               c:type="GdkWindowState"
               glib:type-name="GdkWindowState"
               glib:get-type="gdk_window_state_get_type">
       <member name="withdrawn"
-                value="1"
-                c:identifier="GDK_WINDOW_STATE_WITHDRAWN"
-                glib:nick="withdrawn"/>
+              value="1"
+              c:identifier="GDK_WINDOW_STATE_WITHDRAWN"
+              glib:nick="withdrawn"/>
       <member name="iconified"
-                value="2"
-                c:identifier="GDK_WINDOW_STATE_ICONIFIED"
-                glib:nick="iconified"/>
+              value="2"
+              c:identifier="GDK_WINDOW_STATE_ICONIFIED"
+              glib:nick="iconified"/>
       <member name="maximized"
-                value="4"
-                c:identifier="GDK_WINDOW_STATE_MAXIMIZED"
-                glib:nick="maximized"/>
+              value="4"
+              c:identifier="GDK_WINDOW_STATE_MAXIMIZED"
+              glib:nick="maximized"/>
       <member name="sticky"
-                value="8"
-                c:identifier="GDK_WINDOW_STATE_STICKY"
-                glib:nick="sticky"/>
+              value="8"
+              c:identifier="GDK_WINDOW_STATE_STICKY"
+              glib:nick="sticky"/>
       <member name="fullscreen"
-                value="16"
-                c:identifier="GDK_WINDOW_STATE_FULLSCREEN"
-                glib:nick="fullscreen"/>
+              value="16"
+              c:identifier="GDK_WINDOW_STATE_FULLSCREEN"
+              glib:nick="fullscreen"/>
       <member name="above"
-                value="32"
-                c:identifier="GDK_WINDOW_STATE_ABOVE"
-                glib:nick="above"/>
+              value="32"
+              c:identifier="GDK_WINDOW_STATE_ABOVE"
+              glib:nick="above"/>
       <member name="below"
-                value="64"
-                c:identifier="GDK_WINDOW_STATE_BELOW"
-                glib:nick="below"/>
+              value="64"
+              c:identifier="GDK_WINDOW_STATE_BELOW"
+              glib:nick="below"/>
     </bitfield>
     <enumeration name="SettingAction"
                  c:type="GdkSettingAction"
                  glib:type-name="GdkSettingAction"
                  glib:get-type="gdk_setting_action_get_type">
       <member name="new"
-                value="0"
-                c:identifier="GDK_SETTING_ACTION_NEW"
-                glib:nick="new"/>
+              value="0"
+              c:identifier="GDK_SETTING_ACTION_NEW"
+              glib:nick="new"/>
       <member name="changed"
-                value="1"
-                c:identifier="GDK_SETTING_ACTION_CHANGED"
-                glib:nick="changed"/>
+              value="1"
+              c:identifier="GDK_SETTING_ACTION_CHANGED"
+              glib:nick="changed"/>
       <member name="deleted"
-                value="2"
-                c:identifier="GDK_SETTING_ACTION_DELETED"
-                glib:nick="deleted"/>
+              value="2"
+              c:identifier="GDK_SETTING_ACTION_DELETED"
+              glib:nick="deleted"/>
     </enumeration>
     <enumeration name="OwnerChange"
                  c:type="GdkOwnerChange"
                  glib:type-name="GdkOwnerChange"
                  glib:get-type="gdk_owner_change_get_type">
       <member name="new-owner"
-                value="0"
-                c:identifier="GDK_OWNER_CHANGE_NEW_OWNER"
-                glib:nick="new-owner"/>
+              value="0"
+              c:identifier="GDK_OWNER_CHANGE_NEW_OWNER"
+              glib:nick="new-owner"/>
       <member name="destroy"
-                value="1"
-                c:identifier="GDK_OWNER_CHANGE_DESTROY"
-                glib:nick="destroy"/>
+              value="1"
+              c:identifier="GDK_OWNER_CHANGE_DESTROY"
+              glib:nick="destroy"/>
       <member name="close"
-                value="2"
-                c:identifier="GDK_OWNER_CHANGE_CLOSE"
-                glib:nick="close"/>
+              value="2"
+              c:identifier="GDK_OWNER_CHANGE_CLOSE"
+              glib:nick="close"/>
     </enumeration>
     <glib:boxed c:type="Event"
                 glib:name="Event"
@@ -2126,7 +2128,7 @@
       </constructor>
       <method name="put" c:identifier="gdk_event_put">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="event">
@@ -2136,7 +2138,7 @@
       </method>
       <method name="free" c:identifier="gdk_event_free">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="event">
@@ -2146,7 +2148,7 @@
       </method>
       <method name="get_time" c:identifier="gdk_event_get_time">
         <return-value>
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </return-value>
         <parameters>
           <parameter name="event">
@@ -2156,7 +2158,7 @@
       </method>
       <method name="get_state" c:identifier="gdk_event_get_state">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="event">
@@ -2169,7 +2171,7 @@
       </method>
       <method name="get_coords" c:identifier="gdk_event_get_coords">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="event">
@@ -2185,7 +2187,7 @@
       </method>
       <method name="get_root_coords" c:identifier="gdk_event_get_root_coords">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="event">
@@ -2201,7 +2203,7 @@
       </method>
       <method name="get_axis" c:identifier="gdk_event_get_axis">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="event">
@@ -2217,7 +2219,7 @@
       </method>
       <method name="set_screen" c:identifier="gdk_event_set_screen">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="event">
@@ -2241,7 +2243,7 @@
       <method name="send_client_message"
               c:identifier="gdk_event_send_client_message">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="event">
@@ -2255,7 +2257,7 @@
       <method name="send_clientmessage_toall"
               c:identifier="gdk_event_send_clientmessage_toall">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="event">
@@ -2266,13 +2268,13 @@
     </glib:boxed>
     <function name="events_pending" c:identifier="gdk_events_pending">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
     </function>
     <function name="event_request_motions"
               c:identifier="gdk_event_request_motions">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="event">
@@ -2282,14 +2284,14 @@
     </function>
     <function name="event_handler_set" c:identifier="gdk_event_handler_set">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="func">
           <type name="GdkEventFunc" c:type="GdkEventFunc"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="notify">
           <type name="GDestroyNotify" c:type="GDestroyNotify"/>
@@ -2298,23 +2300,23 @@
     </function>
     <function name="set_show_events" c:identifier="gdk_set_show_events">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="show_events">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="get_show_events" c:identifier="gdk_get_show_events">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
     </function>
     <function name="add_client_message_filter"
               c:identifier="gdk_add_client_message_filter">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="message_type">
@@ -2324,17 +2326,17 @@
           <type name="GdkFilterFunc" c:type="GdkFilterFunc"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
     <function name="setting_get" c:identifier="gdk_setting_get">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="value">
           <type name="GValue" c:type="GValue*"/>
@@ -2344,7 +2346,7 @@
     <record name="GdkDisplayPointerHooks" c:type="GdkDisplayPointerHooks">
       <callback name="get_pointer">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2414,7 +2416,7 @@
         </return-value>
         <parameters>
           <parameter name="display_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -2442,7 +2444,7 @@
       </constructor>
       <method name="get_name" c:identifier="gdk_display_get_name">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2452,7 +2454,7 @@
       </method>
       <method name="get_n_screens" c:identifier="gdk_display_get_n_screens">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2469,7 +2471,7 @@
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="screen_num">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -2486,34 +2488,35 @@
       </method>
       <method name="pointer_ungrab" c:identifier="gdk_display_pointer_ungrab">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="time_">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
-      <method name="keyboard_ungrab" c:identifier="gdk_display_keyboard_ungrab">
+      <method name="keyboard_ungrab"
+              c:identifier="gdk_display_keyboard_ungrab">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="time_">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
       <method name="pointer_is_grabbed"
               c:identifier="gdk_display_pointer_is_grabbed">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2523,7 +2526,7 @@
       </method>
       <method name="beep" c:identifier="gdk_display_beep">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2533,7 +2536,7 @@
       </method>
       <method name="sync" c:identifier="gdk_display_sync">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2543,7 +2546,7 @@
       </method>
       <method name="flush" c:identifier="gdk_display_flush">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2553,7 +2556,7 @@
       </method>
       <method name="close" c:identifier="gdk_display_close">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2593,7 +2596,7 @@
       </method>
       <method name="put_event" c:identifier="gdk_display_put_event">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2607,7 +2610,7 @@
       <method name="add_client_message_filter"
               c:identifier="gdk_display_add_client_message_filter">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2620,14 +2623,14 @@
             <type name="GdkFilterFunc" c:type="GdkFilterFunc"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_double_click_time"
               c:identifier="gdk_display_set_double_click_time">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2641,7 +2644,7 @@
       <method name="set_double_click_distance"
               c:identifier="gdk_display_set_double_click_distance">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2665,7 +2668,7 @@
       </method>
       <method name="get_pointer" c:identifier="gdk_display_get_pointer">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2674,13 +2677,13 @@
           <parameter name="screen">
             <type name="GdkScreen" c:type="GdkScreen**"/>
           </parameter>
-          <parameter name="x">
+          <parameter name="x" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
-          <parameter name="y">
+          <parameter name="y" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
-          <parameter name="mask">
+          <parameter name="mask" direction="out">
             <type name="GdkModifierType" c:type="GdkModifierType*"/>
           </parameter>
         </parameters>
@@ -2694,17 +2697,17 @@
           <parameter name="display">
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
-          <parameter name="win_x">
+          <parameter name="win_x" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
-          <parameter name="win_y">
+          <parameter name="win_y" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
       <method name="warp_pointer" c:identifier="gdk_display_warp_pointer">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2714,10 +2717,10 @@
             <type name="GdkScreen" c:type="GdkScreen*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -2725,7 +2728,7 @@
               c:identifier="gdk_display_set_pointer_hooks">
         <return-value>
           <type name="GdkDisplayPointerHooks"
-                  c:type="GdkDisplayPointerHooks*"/>
+                c:type="GdkDisplayPointerHooks*"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2733,14 +2736,14 @@
           </parameter>
           <parameter name="new_hooks">
             <type name="GdkDisplayPointerHooks"
-                    c:type="GdkDisplayPointerHooks*"/>
+                  c:type="GdkDisplayPointerHooks*"/>
           </parameter>
         </parameters>
       </method>
       <method name="supports_cursor_alpha"
               c:identifier="gdk_display_supports_cursor_alpha">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2751,7 +2754,7 @@
       <method name="supports_cursor_color"
               c:identifier="gdk_display_supports_cursor_color">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2773,16 +2776,16 @@
       <method name="get_maximal_cursor_size"
               c:identifier="gdk_display_get_maximal_cursor_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
-          <parameter name="width">
+          <parameter name="width" direction="out">
             <type name="guint" c:type="guint*"/>
           </parameter>
-          <parameter name="height">
+          <parameter name="height" direction="out">
             <type name="guint" c:type="guint*"/>
           </parameter>
         </parameters>
@@ -2801,7 +2804,7 @@
       <method name="supports_selection_notification"
               c:identifier="gdk_display_supports_selection_notification">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2812,7 +2815,7 @@
       <method name="request_selection_notification"
               c:identifier="gdk_display_request_selection_notification">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2826,7 +2829,7 @@
       <method name="supports_clipboard_persistence"
               c:identifier="gdk_display_supports_clipboard_persistence">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2834,9 +2837,10 @@
           </parameter>
         </parameters>
       </method>
-      <method name="store_clipboard" c:identifier="gdk_display_store_clipboard">
+      <method name="store_clipboard"
+              c:identifier="gdk_display_store_clipboard">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2846,19 +2850,20 @@
             <type name="GdkWindow" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="time_">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
           <parameter name="targets">
             <type name="GdkAtom" c:type="GdkAtom*"/>
           </parameter>
           <parameter name="n_targets">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="supports_shapes" c:identifier="gdk_display_supports_shapes">
+      <method name="supports_shapes"
+              c:identifier="gdk_display_supports_shapes">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2869,7 +2874,7 @@
       <method name="supports_input_shapes"
               c:identifier="gdk_display_supports_input_shapes">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2880,7 +2885,7 @@
       <method name="supports_composite"
               c:identifier="gdk_display_supports_composite">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2890,7 +2895,7 @@
       </method>
       <callback name="get_display_name">
         <return-value>
-          <type name="gchar*" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2900,7 +2905,7 @@
       </callback>
       <callback name="get_n_screens">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="display">
@@ -2917,7 +2922,7 @@
             <type name="GdkDisplay*" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="screen_num">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
@@ -2933,30 +2938,30 @@
       </callback>
       <callback name="closed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
             <type name="GdkDisplay*" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="is_error">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
       <glib:signal name="closed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </glib:signal>
     </class>
     <record name="GdkAppLaunchContextPrivate"
-              c:type="GdkAppLaunchContextPrivate"/>
+            c:type="GdkAppLaunchContextPrivate"/>
     <class name="AppLaunchContext"
            c:type="GdkAppLaunchContext"
            parent="GAppLaunchContext"
@@ -2970,7 +2975,7 @@
       <method name="set_display"
               c:identifier="gdk_app_launch_context_set_display">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
@@ -2984,7 +2989,7 @@
       <method name="set_screen"
               c:identifier="gdk_app_launch_context_set_screen">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
@@ -2998,34 +3003,34 @@
       <method name="set_desktop"
               c:identifier="gdk_app_launch_context_set_desktop">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
             <type name="AppLaunchContext" c:type="GdkAppLaunchContext*"/>
           </parameter>
           <parameter name="desktop">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_timestamp"
               c:identifier="gdk_app_launch_context_set_timestamp">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
             <type name="AppLaunchContext" c:type="GdkAppLaunchContext*"/>
           </parameter>
           <parameter name="timestamp">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_icon" c:identifier="gdk_app_launch_context_set_icon">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
@@ -3039,24 +3044,24 @@
       <method name="set_icon_name"
               c:identifier="gdk_app_launch_context_set_icon_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
             <type name="AppLaunchContext" c:type="GdkAppLaunchContext*"/>
           </parameter>
           <parameter name="icon_name">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </method>
     </class>
     <record name="GdkRgbCmap" c:type="GdkRgbCmap">
       <field name="colors">
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </field>
       <field name="n_colors">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="info_list">
         <type name="GSList*" c:type="GSList*"/>
@@ -3064,50 +3069,51 @@
     </record>
     <function name="rgb_init" c:identifier="gdk_rgb_init">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
-    <function name="rgb_xpixel_from_rgb" c:identifier="gdk_rgb_xpixel_from_rgb">
+    <function name="rgb_xpixel_from_rgb"
+              c:identifier="gdk_rgb_xpixel_from_rgb">
       <return-value>
-        <type name="gulong" c:type="gulong"/>
+        <type name="ulong" c:type="gulong"/>
       </return-value>
       <parameters>
         <parameter name="rgb">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
     <function name="rgb_gc_set_foreground"
               c:identifier="gdk_rgb_gc_set_foreground">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="gc">
           <type name="GdkGC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="rgb">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
     <function name="rgb_gc_set_background"
               c:identifier="gdk_rgb_gc_set_background">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="gc">
           <type name="GdkGC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="rgb">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
     <function name="rgb_find_color" c:identifier="gdk_rgb_find_color">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="colormap">
@@ -3123,21 +3129,21 @@
                  glib:type-name="GdkRgbDither"
                  glib:get-type="gdk_rgb_dither_get_type">
       <member name="none"
-                value="0"
-                c:identifier="GDK_RGB_DITHER_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="GDK_RGB_DITHER_NONE"
+              glib:nick="none"/>
       <member name="normal"
-                value="1"
-                c:identifier="GDK_RGB_DITHER_NORMAL"
-                glib:nick="normal"/>
+              value="1"
+              c:identifier="GDK_RGB_DITHER_NORMAL"
+              glib:nick="normal"/>
       <member name="max"
-                value="2"
-                c:identifier="GDK_RGB_DITHER_MAX"
-                glib:nick="max"/>
+              value="2"
+              c:identifier="GDK_RGB_DITHER_MAX"
+              glib:nick="max"/>
     </enumeration>
     <function name="draw_rgb_image" c:identifier="gdk_draw_rgb_image">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -3147,16 +3153,16 @@
           <type name="GdkGC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="dith">
           <type name="GdkRgbDither" c:type="GdkRgbDither"/>
@@ -3165,14 +3171,14 @@
           <type name="guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="rowstride">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_rgb_image_dithalign"
               c:identifier="gdk_draw_rgb_image_dithalign">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -3182,16 +3188,16 @@
           <type name="GdkGC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="dith">
           <type name="GdkRgbDither" c:type="GdkRgbDither"/>
@@ -3200,19 +3206,19 @@
           <type name="guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="rowstride">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="xdith">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="ydith">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_rgb_32_image" c:identifier="gdk_draw_rgb_32_image">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -3222,16 +3228,16 @@
           <type name="GdkGC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="dith">
           <type name="GdkRgbDither" c:type="GdkRgbDither"/>
@@ -3240,14 +3246,14 @@
           <type name="guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="rowstride">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_rgb_32_image_dithalign"
               c:identifier="gdk_draw_rgb_32_image_dithalign">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -3257,16 +3263,16 @@
           <type name="GdkGC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="dith">
           <type name="GdkRgbDither" c:type="GdkRgbDither"/>
@@ -3275,19 +3281,19 @@
           <type name="guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="rowstride">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="xdith">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="ydith">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_gray_image" c:identifier="gdk_draw_gray_image">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -3297,16 +3303,16 @@
           <type name="GdkGC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="dith">
           <type name="GdkRgbDither" c:type="GdkRgbDither"/>
@@ -3315,13 +3321,13 @@
           <type name="guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="rowstride">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_indexed_image" c:identifier="gdk_draw_indexed_image">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -3331,16 +3337,16 @@
           <type name="GdkGC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="dith">
           <type name="GdkRgbDither" c:type="GdkRgbDither"/>
@@ -3349,7 +3355,7 @@
           <type name="guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="rowstride">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="cmap">
           <type name="GdkRgbCmap" c:type="GdkRgbCmap*"/>
@@ -3365,13 +3371,13 @@
           <type name="guint32" c:type="guint32*"/>
         </parameter>
         <parameter name="n_colors">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="rgb_cmap_free" c:identifier="gdk_rgb_cmap_free">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cmap">
@@ -3381,31 +3387,31 @@
     </function>
     <function name="rgb_set_verbose" c:identifier="gdk_rgb_set_verbose">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="verbose">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="rgb_set_install" c:identifier="gdk_rgb_set_install">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="install">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="rgb_set_min_colors" c:identifier="gdk_rgb_set_min_colors">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="min_colors">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -3421,13 +3427,13 @@
     </function>
     <function name="rgb_ditherable" c:identifier="gdk_rgb_ditherable">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
     </function>
     <function name="rgb_colormap_ditherable"
               c:identifier="gdk_rgb_colormap_ditherable">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="cmap">
@@ -3438,7 +3444,7 @@
     <function name="pixbuf_render_threshold_alpha"
               c:identifier="gdk_pixbuf_render_threshold_alpha">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pixbuf">
@@ -3448,32 +3454,32 @@
           <type name="GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
         <parameter name="src_x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="src_y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="dest_x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="dest_y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="width">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="alpha_threshold">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="pixbuf_render_to_drawable"
               c:identifier="gdk_pixbuf_render_to_drawable">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pixbuf">
@@ -3486,38 +3492,38 @@
           <type name="GdkGC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="src_x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="src_y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="dest_x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="dest_y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="width">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="dither">
           <type name="GdkRgbDither" c:type="GdkRgbDither"/>
         </parameter>
         <parameter name="x_dither">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="y_dither">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="pixbuf_render_to_drawable_alpha"
               c:identifier="gdk_pixbuf_render_to_drawable_alpha">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pixbuf">
@@ -3527,44 +3533,44 @@
           <type name="GdkDrawable" c:type="GdkDrawable*"/>
         </parameter>
         <parameter name="src_x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="src_y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="dest_x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="dest_y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="width">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="alpha_mode">
           <type name="GdkPixbufAlphaMode" c:type="GdkPixbufAlphaMode"/>
         </parameter>
         <parameter name="alpha_threshold">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="dither">
           <type name="GdkRgbDither" c:type="GdkRgbDither"/>
         </parameter>
         <parameter name="x_dither">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="y_dither">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="pixbuf_render_pixmap_and_mask_for_colormap"
               c:identifier="gdk_pixbuf_render_pixmap_and_mask_for_colormap">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pixbuf">
@@ -3580,14 +3586,14 @@
           <type name="GdkBitmap" c:type="GdkBitmap**"/>
         </parameter>
         <parameter name="alpha_threshold">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="pixbuf_render_pixmap_and_mask"
               c:identifier="gdk_pixbuf_render_pixmap_and_mask">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pixbuf">
@@ -3600,7 +3606,7 @@
           <type name="GdkBitmap" c:type="GdkBitmap**"/>
         </parameter>
         <parameter name="alpha_threshold">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -3620,22 +3626,22 @@
           <type name="Colormap" c:type="GdkColormap*"/>
         </parameter>
         <parameter name="src_x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="src_y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="dest_x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="dest_y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="width">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -3655,22 +3661,22 @@
           <type name="Colormap" c:type="GdkColormap*"/>
         </parameter>
         <parameter name="src_x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="src_y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="dest_x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="dest_y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="width">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -3687,7 +3693,7 @@
     <function name="cairo_set_source_color"
               c:identifier="gdk_cairo_set_source_color">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -3701,7 +3707,7 @@
     <function name="cairo_set_source_pixbuf"
               c:identifier="gdk_cairo_set_source_pixbuf">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -3721,7 +3727,7 @@
     <function name="cairo_set_source_pixmap"
               c:identifier="gdk_cairo_set_source_pixmap">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -3740,7 +3746,7 @@
     </function>
     <function name="cairo_rectangle" c:identifier="gdk_cairo_rectangle">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -3753,7 +3759,7 @@
     </function>
     <function name="cairo_region" c:identifier="gdk_cairo_region">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -3769,306 +3775,306 @@
                  glib:type-name="GdkCursorType"
                  glib:get-type="gdk_cursor_type_get_type">
       <member name="x-cursor"
-                value="0"
-                c:identifier="GDK_X_CURSOR"
-                glib:nick="x-cursor"/>
+              value="0"
+              c:identifier="GDK_X_CURSOR"
+              glib:nick="x-cursor"/>
       <member name="arrow"
-                value="2"
-                c:identifier="GDK_ARROW"
-                glib:nick="arrow"/>
+              value="2"
+              c:identifier="GDK_ARROW"
+              glib:nick="arrow"/>
       <member name="based-arrow-down"
-                value="4"
-                c:identifier="GDK_BASED_ARROW_DOWN"
-                glib:nick="based-arrow-down"/>
+              value="4"
+              c:identifier="GDK_BASED_ARROW_DOWN"
+              glib:nick="based-arrow-down"/>
       <member name="based-arrow-up"
-                value="6"
-                c:identifier="GDK_BASED_ARROW_UP"
-                glib:nick="based-arrow-up"/>
+              value="6"
+              c:identifier="GDK_BASED_ARROW_UP"
+              glib:nick="based-arrow-up"/>
       <member name="boat" value="8" c:identifier="GDK_BOAT" glib:nick="boat"/>
       <member name="bogosity"
-                value="10"
-                c:identifier="GDK_BOGOSITY"
-                glib:nick="bogosity"/>
+              value="10"
+              c:identifier="GDK_BOGOSITY"
+              glib:nick="bogosity"/>
       <member name="bottom-left-corner"
-                value="12"
-                c:identifier="GDK_BOTTOM_LEFT_CORNER"
-                glib:nick="bottom-left-corner"/>
+              value="12"
+              c:identifier="GDK_BOTTOM_LEFT_CORNER"
+              glib:nick="bottom-left-corner"/>
       <member name="bottom-right-corner"
-                value="14"
-                c:identifier="GDK_BOTTOM_RIGHT_CORNER"
-                glib:nick="bottom-right-corner"/>
+              value="14"
+              c:identifier="GDK_BOTTOM_RIGHT_CORNER"
+              glib:nick="bottom-right-corner"/>
       <member name="bottom-side"
-                value="16"
-                c:identifier="GDK_BOTTOM_SIDE"
-                glib:nick="bottom-side"/>
+              value="16"
+              c:identifier="GDK_BOTTOM_SIDE"
+              glib:nick="bottom-side"/>
       <member name="bottom-tee"
-                value="18"
-                c:identifier="GDK_BOTTOM_TEE"
-                glib:nick="bottom-tee"/>
+              value="18"
+              c:identifier="GDK_BOTTOM_TEE"
+              glib:nick="bottom-tee"/>
       <member name="box-spiral"
-                value="20"
-                c:identifier="GDK_BOX_SPIRAL"
-                glib:nick="box-spiral"/>
+              value="20"
+              c:identifier="GDK_BOX_SPIRAL"
+              glib:nick="box-spiral"/>
       <member name="center-ptr"
-                value="22"
-                c:identifier="GDK_CENTER_PTR"
-                glib:nick="center-ptr"/>
+              value="22"
+              c:identifier="GDK_CENTER_PTR"
+              glib:nick="center-ptr"/>
       <member name="circle"
-                value="24"
-                c:identifier="GDK_CIRCLE"
-                glib:nick="circle"/>
+              value="24"
+              c:identifier="GDK_CIRCLE"
+              glib:nick="circle"/>
       <member name="clock"
-                value="26"
-                c:identifier="GDK_CLOCK"
-                glib:nick="clock"/>
+              value="26"
+              c:identifier="GDK_CLOCK"
+              glib:nick="clock"/>
       <member name="coffee-mug"
-                value="28"
-                c:identifier="GDK_COFFEE_MUG"
-                glib:nick="coffee-mug"/>
+              value="28"
+              c:identifier="GDK_COFFEE_MUG"
+              glib:nick="coffee-mug"/>
       <member name="cross"
-                value="30"
-                c:identifier="GDK_CROSS"
-                glib:nick="cross"/>
+              value="30"
+              c:identifier="GDK_CROSS"
+              glib:nick="cross"/>
       <member name="cross-reverse"
-                value="32"
-                c:identifier="GDK_CROSS_REVERSE"
-                glib:nick="cross-reverse"/>
+              value="32"
+              c:identifier="GDK_CROSS_REVERSE"
+              glib:nick="cross-reverse"/>
       <member name="crosshair"
-                value="34"
-                c:identifier="GDK_CROSSHAIR"
-                glib:nick="crosshair"/>
+              value="34"
+              c:identifier="GDK_CROSSHAIR"
+              glib:nick="crosshair"/>
       <member name="diamond-cross"
-                value="36"
-                c:identifier="GDK_DIAMOND_CROSS"
-                glib:nick="diamond-cross"/>
+              value="36"
+              c:identifier="GDK_DIAMOND_CROSS"
+              glib:nick="diamond-cross"/>
       <member name="dot" value="38" c:identifier="GDK_DOT" glib:nick="dot"/>
       <member name="dotbox"
-                value="40"
-                c:identifier="GDK_DOTBOX"
-                glib:nick="dotbox"/>
+              value="40"
+              c:identifier="GDK_DOTBOX"
+              glib:nick="dotbox"/>
       <member name="double-arrow"
-                value="42"
-                c:identifier="GDK_DOUBLE_ARROW"
-                glib:nick="double-arrow"/>
+              value="42"
+              c:identifier="GDK_DOUBLE_ARROW"
+              glib:nick="double-arrow"/>
       <member name="draft-large"
-                value="44"
-                c:identifier="GDK_DRAFT_LARGE"
-                glib:nick="draft-large"/>
+              value="44"
+              c:identifier="GDK_DRAFT_LARGE"
+              glib:nick="draft-large"/>
       <member name="draft-small"
-                value="46"
-                c:identifier="GDK_DRAFT_SMALL"
-                glib:nick="draft-small"/>
+              value="46"
+              c:identifier="GDK_DRAFT_SMALL"
+              glib:nick="draft-small"/>
       <member name="draped-box"
-                value="48"
-                c:identifier="GDK_DRAPED_BOX"
-                glib:nick="draped-box"/>
+              value="48"
+              c:identifier="GDK_DRAPED_BOX"
+              glib:nick="draped-box"/>
       <member name="exchange"
-                value="50"
-                c:identifier="GDK_EXCHANGE"
-                glib:nick="exchange"/>
+              value="50"
+              c:identifier="GDK_EXCHANGE"
+              glib:nick="exchange"/>
       <member name="fleur"
-                value="52"
-                c:identifier="GDK_FLEUR"
-                glib:nick="fleur"/>
+              value="52"
+              c:identifier="GDK_FLEUR"
+              glib:nick="fleur"/>
       <member name="gobbler"
-                value="54"
-                c:identifier="GDK_GOBBLER"
-                glib:nick="gobbler"/>
+              value="54"
+              c:identifier="GDK_GOBBLER"
+              glib:nick="gobbler"/>
       <member name="gumby"
-                value="56"
-                c:identifier="GDK_GUMBY"
-                glib:nick="gumby"/>
+              value="56"
+              c:identifier="GDK_GUMBY"
+              glib:nick="gumby"/>
       <member name="hand1"
-                value="58"
-                c:identifier="GDK_HAND1"
-                glib:nick="hand1"/>
+              value="58"
+              c:identifier="GDK_HAND1"
+              glib:nick="hand1"/>
       <member name="hand2"
-                value="60"
-                c:identifier="GDK_HAND2"
-                glib:nick="hand2"/>
+              value="60"
+              c:identifier="GDK_HAND2"
+              glib:nick="hand2"/>
       <member name="heart"
-                value="62"
-                c:identifier="GDK_HEART"
-                glib:nick="heart"/>
+              value="62"
+              c:identifier="GDK_HEART"
+              glib:nick="heart"/>
       <member name="icon" value="64" c:identifier="GDK_ICON" glib:nick="icon"/>
       <member name="iron-cross"
-                value="66"
-                c:identifier="GDK_IRON_CROSS"
-                glib:nick="iron-cross"/>
+              value="66"
+              c:identifier="GDK_IRON_CROSS"
+              glib:nick="iron-cross"/>
       <member name="left-ptr"
-                value="68"
-                c:identifier="GDK_LEFT_PTR"
-                glib:nick="left-ptr"/>
+              value="68"
+              c:identifier="GDK_LEFT_PTR"
+              glib:nick="left-ptr"/>
       <member name="left-side"
-                value="70"
-                c:identifier="GDK_LEFT_SIDE"
-                glib:nick="left-side"/>
+              value="70"
+              c:identifier="GDK_LEFT_SIDE"
+              glib:nick="left-side"/>
       <member name="left-tee"
-                value="72"
-                c:identifier="GDK_LEFT_TEE"
-                glib:nick="left-tee"/>
+              value="72"
+              c:identifier="GDK_LEFT_TEE"
+              glib:nick="left-tee"/>
       <member name="leftbutton"
-                value="74"
-                c:identifier="GDK_LEFTBUTTON"
-                glib:nick="leftbutton"/>
+              value="74"
+              c:identifier="GDK_LEFTBUTTON"
+              glib:nick="leftbutton"/>
       <member name="ll-angle"
-                value="76"
-                c:identifier="GDK_LL_ANGLE"
-                glib:nick="ll-angle"/>
+              value="76"
+              c:identifier="GDK_LL_ANGLE"
+              glib:nick="ll-angle"/>
       <member name="lr-angle"
-                value="78"
-                c:identifier="GDK_LR_ANGLE"
-                glib:nick="lr-angle"/>
+              value="78"
+              c:identifier="GDK_LR_ANGLE"
+              glib:nick="lr-angle"/>
       <member name="man" value="80" c:identifier="GDK_MAN" glib:nick="man"/>
       <member name="middlebutton"
-                value="82"
-                c:identifier="GDK_MIDDLEBUTTON"
-                glib:nick="middlebutton"/>
+              value="82"
+              c:identifier="GDK_MIDDLEBUTTON"
+              glib:nick="middlebutton"/>
       <member name="mouse"
-                value="84"
-                c:identifier="GDK_MOUSE"
-                glib:nick="mouse"/>
+              value="84"
+              c:identifier="GDK_MOUSE"
+              glib:nick="mouse"/>
       <member name="pencil"
-                value="86"
-                c:identifier="GDK_PENCIL"
-                glib:nick="pencil"/>
+              value="86"
+              c:identifier="GDK_PENCIL"
+              glib:nick="pencil"/>
       <member name="pirate"
-                value="88"
-                c:identifier="GDK_PIRATE"
-                glib:nick="pirate"/>
+              value="88"
+              c:identifier="GDK_PIRATE"
+              glib:nick="pirate"/>
       <member name="plus" value="90" c:identifier="GDK_PLUS" glib:nick="plus"/>
       <member name="question-arrow"
-                value="92"
-                c:identifier="GDK_QUESTION_ARROW"
-                glib:nick="question-arrow"/>
+              value="92"
+              c:identifier="GDK_QUESTION_ARROW"
+              glib:nick="question-arrow"/>
       <member name="right-ptr"
-                value="94"
-                c:identifier="GDK_RIGHT_PTR"
-                glib:nick="right-ptr"/>
+              value="94"
+              c:identifier="GDK_RIGHT_PTR"
+              glib:nick="right-ptr"/>
       <member name="right-side"
-                value="96"
-                c:identifier="GDK_RIGHT_SIDE"
-                glib:nick="right-side"/>
+              value="96"
+              c:identifier="GDK_RIGHT_SIDE"
+              glib:nick="right-side"/>
       <member name="right-tee"
-                value="98"
-                c:identifier="GDK_RIGHT_TEE"
-                glib:nick="right-tee"/>
+              value="98"
+              c:identifier="GDK_RIGHT_TEE"
+              glib:nick="right-tee"/>
       <member name="rightbutton"
-                value="100"
-                c:identifier="GDK_RIGHTBUTTON"
-                glib:nick="rightbutton"/>
+              value="100"
+              c:identifier="GDK_RIGHTBUTTON"
+              glib:nick="rightbutton"/>
       <member name="rtl-logo"
-                value="102"
-                c:identifier="GDK_RTL_LOGO"
-                glib:nick="rtl-logo"/>
+              value="102"
+              c:identifier="GDK_RTL_LOGO"
+              glib:nick="rtl-logo"/>
       <member name="sailboat"
-                value="104"
-                c:identifier="GDK_SAILBOAT"
-                glib:nick="sailboat"/>
+              value="104"
+              c:identifier="GDK_SAILBOAT"
+              glib:nick="sailboat"/>
       <member name="sb-down-arrow"
-                value="106"
-                c:identifier="GDK_SB_DOWN_ARROW"
-                glib:nick="sb-down-arrow"/>
+              value="106"
+              c:identifier="GDK_SB_DOWN_ARROW"
+              glib:nick="sb-down-arrow"/>
       <member name="sb-h-double-arrow"
-                value="108"
-                c:identifier="GDK_SB_H_DOUBLE_ARROW"
-                glib:nick="sb-h-double-arrow"/>
+              value="108"
+              c:identifier="GDK_SB_H_DOUBLE_ARROW"
+              glib:nick="sb-h-double-arrow"/>
       <member name="sb-left-arrow"
-                value="110"
-                c:identifier="GDK_SB_LEFT_ARROW"
-                glib:nick="sb-left-arrow"/>
+              value="110"
+              c:identifier="GDK_SB_LEFT_ARROW"
+              glib:nick="sb-left-arrow"/>
       <member name="sb-right-arrow"
-                value="112"
-                c:identifier="GDK_SB_RIGHT_ARROW"
-                glib:nick="sb-right-arrow"/>
+              value="112"
+              c:identifier="GDK_SB_RIGHT_ARROW"
+              glib:nick="sb-right-arrow"/>
       <member name="sb-up-arrow"
-                value="114"
-                c:identifier="GDK_SB_UP_ARROW"
-                glib:nick="sb-up-arrow"/>
+              value="114"
+              c:identifier="GDK_SB_UP_ARROW"
+              glib:nick="sb-up-arrow"/>
       <member name="sb-v-double-arrow"
-                value="116"
-                c:identifier="GDK_SB_V_DOUBLE_ARROW"
-                glib:nick="sb-v-double-arrow"/>
+              value="116"
+              c:identifier="GDK_SB_V_DOUBLE_ARROW"
+              glib:nick="sb-v-double-arrow"/>
       <member name="shuttle"
-                value="118"
-                c:identifier="GDK_SHUTTLE"
-                glib:nick="shuttle"/>
+              value="118"
+              c:identifier="GDK_SHUTTLE"
+              glib:nick="shuttle"/>
       <member name="sizing"
-                value="120"
-                c:identifier="GDK_SIZING"
-                glib:nick="sizing"/>
+              value="120"
+              c:identifier="GDK_SIZING"
+              glib:nick="sizing"/>
       <member name="spider"
-                value="122"
-                c:identifier="GDK_SPIDER"
-                glib:nick="spider"/>
+              value="122"
+              c:identifier="GDK_SPIDER"
+              glib:nick="spider"/>
       <member name="spraycan"
-                value="124"
-                c:identifier="GDK_SPRAYCAN"
-                glib:nick="spraycan"/>
+              value="124"
+              c:identifier="GDK_SPRAYCAN"
+              glib:nick="spraycan"/>
       <member name="star"
-                value="126"
-                c:identifier="GDK_STAR"
-                glib:nick="star"/>
+              value="126"
+              c:identifier="GDK_STAR"
+              glib:nick="star"/>
       <member name="target"
-                value="128"
-                c:identifier="GDK_TARGET"
-                glib:nick="target"/>
+              value="128"
+              c:identifier="GDK_TARGET"
+              glib:nick="target"/>
       <member name="tcross"
-                value="130"
-                c:identifier="GDK_TCROSS"
-                glib:nick="tcross"/>
+              value="130"
+              c:identifier="GDK_TCROSS"
+              glib:nick="tcross"/>
       <member name="top-left-arrow"
-                value="132"
-                c:identifier="GDK_TOP_LEFT_ARROW"
-                glib:nick="top-left-arrow"/>
+              value="132"
+              c:identifier="GDK_TOP_LEFT_ARROW"
+              glib:nick="top-left-arrow"/>
       <member name="top-left-corner"
-                value="134"
-                c:identifier="GDK_TOP_LEFT_CORNER"
-                glib:nick="top-left-corner"/>
+              value="134"
+              c:identifier="GDK_TOP_LEFT_CORNER"
+              glib:nick="top-left-corner"/>
       <member name="top-right-corner"
-                value="136"
-                c:identifier="GDK_TOP_RIGHT_CORNER"
-                glib:nick="top-right-corner"/>
+              value="136"
+              c:identifier="GDK_TOP_RIGHT_CORNER"
+              glib:nick="top-right-corner"/>
       <member name="top-side"
-                value="138"
-                c:identifier="GDK_TOP_SIDE"
-                glib:nick="top-side"/>
+              value="138"
+              c:identifier="GDK_TOP_SIDE"
+              glib:nick="top-side"/>
       <member name="top-tee"
-                value="140"
-                c:identifier="GDK_TOP_TEE"
-                glib:nick="top-tee"/>
+              value="140"
+              c:identifier="GDK_TOP_TEE"
+              glib:nick="top-tee"/>
       <member name="trek"
-                value="142"
-                c:identifier="GDK_TREK"
-                glib:nick="trek"/>
+              value="142"
+              c:identifier="GDK_TREK"
+              glib:nick="trek"/>
       <member name="ul-angle"
-                value="144"
-                c:identifier="GDK_UL_ANGLE"
-                glib:nick="ul-angle"/>
+              value="144"
+              c:identifier="GDK_UL_ANGLE"
+              glib:nick="ul-angle"/>
       <member name="umbrella"
-                value="146"
-                c:identifier="GDK_UMBRELLA"
-                glib:nick="umbrella"/>
+              value="146"
+              c:identifier="GDK_UMBRELLA"
+              glib:nick="umbrella"/>
       <member name="ur-angle"
-                value="148"
-                c:identifier="GDK_UR_ANGLE"
-                glib:nick="ur-angle"/>
+              value="148"
+              c:identifier="GDK_UR_ANGLE"
+              glib:nick="ur-angle"/>
       <member name="watch"
-                value="150"
-                c:identifier="GDK_WATCH"
-                glib:nick="watch"/>
+              value="150"
+              c:identifier="GDK_WATCH"
+              glib:nick="watch"/>
       <member name="xterm"
-                value="152"
-                c:identifier="GDK_XTERM"
-                glib:nick="xterm"/>
+              value="152"
+              c:identifier="GDK_XTERM"
+              glib:nick="xterm"/>
       <member name="last-cursor"
-                value="153"
-                c:identifier="GDK_LAST_CURSOR"
-                glib:nick="last-cursor"/>
+              value="153"
+              c:identifier="GDK_LAST_CURSOR"
+              glib:nick="last-cursor"/>
       <member name="cursor-is-pixmap"
-                value="-1"
-                c:identifier="GDK_CURSOR_IS_PIXMAP"
-                glib:nick="cursor-is-pixmap"/>
+              value="-1"
+              c:identifier="GDK_CURSOR_IS_PIXMAP"
+              glib:nick="cursor-is-pixmap"/>
     </enumeration>
     <glib:boxed c:type="Cursor"
                 glib:name="Cursor"
@@ -4117,10 +4123,10 @@
             <type name="Color" c:type="GdkColor*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </constructor>
@@ -4137,10 +4143,10 @@
             <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </constructor>
@@ -4154,7 +4160,8 @@
           </parameter>
         </parameters>
       </constructor>
-      <constructor name="new_from_name" c:identifier="gdk_cursor_new_from_name">
+      <constructor name="new_from_name"
+                   c:identifier="gdk_cursor_new_from_name">
         <return-value>
           <type name="Cursor" c:type="GdkCursor*"/>
         </return-value>
@@ -4163,7 +4170,7 @@
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -4179,7 +4186,7 @@
       </method>
       <method name="unref" c:identifier="gdk_cursor_unref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="cursor">
@@ -4211,7 +4218,7 @@
       <method name="set_default_display"
               c:identifier="gdk_display_manager_set_default_display">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display_manager">
@@ -4238,7 +4245,7 @@
       </property>
       <callback name="display_opened">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display_manager">
@@ -4251,7 +4258,7 @@
       </callback>
       <glib:signal name="display-opened">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -4289,22 +4296,22 @@
         <type name="GdkSubwindowMode" c:type="GdkSubwindowMode"/>
       </field>
       <field name="ts_x_origin">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="ts_y_origin">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="clip_x_origin">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="clip_y_origin">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="graphics_exposures">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="line_width">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="line_style">
         <type name="GdkLineStyle" c:type="GdkLineStyle"/>
@@ -4321,42 +4328,42 @@
                  glib:type-name="GdkCapStyle"
                  glib:get-type="gdk_cap_style_get_type">
       <member name="not-last"
-                value="0"
-                c:identifier="GDK_CAP_NOT_LAST"
-                glib:nick="not-last"/>
+              value="0"
+              c:identifier="GDK_CAP_NOT_LAST"
+              glib:nick="not-last"/>
       <member name="butt"
-                value="1"
-                c:identifier="GDK_CAP_BUTT"
-                glib:nick="butt"/>
+              value="1"
+              c:identifier="GDK_CAP_BUTT"
+              glib:nick="butt"/>
       <member name="round"
-                value="2"
-                c:identifier="GDK_CAP_ROUND"
-                glib:nick="round"/>
+              value="2"
+              c:identifier="GDK_CAP_ROUND"
+              glib:nick="round"/>
       <member name="projecting"
-                value="3"
-                c:identifier="GDK_CAP_PROJECTING"
-                glib:nick="projecting"/>
+              value="3"
+              c:identifier="GDK_CAP_PROJECTING"
+              glib:nick="projecting"/>
     </enumeration>
     <enumeration name="Fill"
                  c:type="GdkFill"
                  glib:type-name="GdkFill"
                  glib:get-type="gdk_fill_get_type">
       <member name="solid"
-                value="0"
-                c:identifier="GDK_SOLID"
-                glib:nick="solid"/>
+              value="0"
+              c:identifier="GDK_SOLID"
+              glib:nick="solid"/>
       <member name="tiled"
-                value="1"
-                c:identifier="GDK_TILED"
-                glib:nick="tiled"/>
+              value="1"
+              c:identifier="GDK_TILED"
+              glib:nick="tiled"/>
       <member name="stippled"
-                value="2"
-                c:identifier="GDK_STIPPLED"
-                glib:nick="stippled"/>
+              value="2"
+              c:identifier="GDK_STIPPLED"
+              glib:nick="stippled"/>
       <member name="opaque-stippled"
-                value="3"
-                c:identifier="GDK_OPAQUE_STIPPLED"
-                glib:nick="opaque-stippled"/>
+              value="3"
+              c:identifier="GDK_OPAQUE_STIPPLED"
+              glib:nick="opaque-stippled"/>
     </enumeration>
     <enumeration name="Function"
                  c:type="GdkFunction"
@@ -4364,41 +4371,41 @@
                  glib:get-type="gdk_function_get_type">
       <member name="copy" value="0" c:identifier="GDK_COPY" glib:nick="copy"/>
       <member name="invert"
-                value="1"
-                c:identifier="GDK_INVERT"
-                glib:nick="invert"/>
+              value="1"
+              c:identifier="GDK_INVERT"
+              glib:nick="invert"/>
       <member name="xor" value="2" c:identifier="GDK_XOR" glib:nick="xor"/>
       <member name="clear"
-                value="3"
-                c:identifier="GDK_CLEAR"
-                glib:nick="clear"/>
+              value="3"
+              c:identifier="GDK_CLEAR"
+              glib:nick="clear"/>
       <member name="and" value="4" c:identifier="GDK_AND" glib:nick="and"/>
       <member name="and-reverse"
-                value="5"
-                c:identifier="GDK_AND_REVERSE"
-                glib:nick="and-reverse"/>
+              value="5"
+              c:identifier="GDK_AND_REVERSE"
+              glib:nick="and-reverse"/>
       <member name="and-invert"
-                value="6"
-                c:identifier="GDK_AND_INVERT"
-                glib:nick="and-invert"/>
+              value="6"
+              c:identifier="GDK_AND_INVERT"
+              glib:nick="and-invert"/>
       <member name="noop" value="7" c:identifier="GDK_NOOP" glib:nick="noop"/>
       <member name="or" value="8" c:identifier="GDK_OR" glib:nick="or"/>
       <member name="equiv"
-                value="9"
-                c:identifier="GDK_EQUIV"
-                glib:nick="equiv"/>
+              value="9"
+              c:identifier="GDK_EQUIV"
+              glib:nick="equiv"/>
       <member name="or-reverse"
-                value="10"
-                c:identifier="GDK_OR_REVERSE"
-                glib:nick="or-reverse"/>
+              value="10"
+              c:identifier="GDK_OR_REVERSE"
+              glib:nick="or-reverse"/>
       <member name="copy-invert"
-                value="11"
-                c:identifier="GDK_COPY_INVERT"
-                glib:nick="copy-invert"/>
+              value="11"
+              c:identifier="GDK_COPY_INVERT"
+              glib:nick="copy-invert"/>
       <member name="or-invert"
-                value="12"
-                c:identifier="GDK_OR_INVERT"
-                glib:nick="or-invert"/>
+              value="12"
+              c:identifier="GDK_OR_INVERT"
+              glib:nick="or-invert"/>
       <member name="nand" value="13" c:identifier="GDK_NAND" glib:nick="nand"/>
       <member name="nor" value="14" c:identifier="GDK_NOR" glib:nick="nor"/>
       <member name="set" value="15" c:identifier="GDK_SET" glib:nick="set"/>
@@ -4408,124 +4415,124 @@
                  glib:type-name="GdkJoinStyle"
                  glib:get-type="gdk_join_style_get_type">
       <member name="miter"
-                value="0"
-                c:identifier="GDK_JOIN_MITER"
-                glib:nick="miter"/>
+              value="0"
+              c:identifier="GDK_JOIN_MITER"
+              glib:nick="miter"/>
       <member name="round"
-                value="1"
-                c:identifier="GDK_JOIN_ROUND"
-                glib:nick="round"/>
+              value="1"
+              c:identifier="GDK_JOIN_ROUND"
+              glib:nick="round"/>
       <member name="bevel"
-                value="2"
-                c:identifier="GDK_JOIN_BEVEL"
-                glib:nick="bevel"/>
+              value="2"
+              c:identifier="GDK_JOIN_BEVEL"
+              glib:nick="bevel"/>
     </enumeration>
     <enumeration name="LineStyle"
                  c:type="GdkLineStyle"
                  glib:type-name="GdkLineStyle"
                  glib:get-type="gdk_line_style_get_type">
       <member name="solid"
-                value="0"
-                c:identifier="GDK_LINE_SOLID"
-                glib:nick="solid"/>
+              value="0"
+              c:identifier="GDK_LINE_SOLID"
+              glib:nick="solid"/>
       <member name="on-off-dash"
-                value="1"
-                c:identifier="GDK_LINE_ON_OFF_DASH"
-                glib:nick="on-off-dash"/>
+              value="1"
+              c:identifier="GDK_LINE_ON_OFF_DASH"
+              glib:nick="on-off-dash"/>
       <member name="double-dash"
-                value="2"
-                c:identifier="GDK_LINE_DOUBLE_DASH"
-                glib:nick="double-dash"/>
+              value="2"
+              c:identifier="GDK_LINE_DOUBLE_DASH"
+              glib:nick="double-dash"/>
     </enumeration>
     <enumeration name="SubwindowMode"
                  c:type="GdkSubwindowMode"
                  glib:type-name="GdkSubwindowMode"
                  glib:get-type="gdk_subwindow_mode_get_type">
       <member name="clip-by-children"
-                value="0"
-                c:identifier="GDK_CLIP_BY_CHILDREN"
-                glib:nick="clip-by-children"/>
+              value="0"
+              c:identifier="GDK_CLIP_BY_CHILDREN"
+              glib:nick="clip-by-children"/>
       <member name="include-inferiors"
-                value="1"
-                c:identifier="GDK_INCLUDE_INFERIORS"
-                glib:nick="include-inferiors"/>
+              value="1"
+              c:identifier="GDK_INCLUDE_INFERIORS"
+              glib:nick="include-inferiors"/>
     </enumeration>
     <bitfield name="GCValuesMask"
               c:type="GdkGCValuesMask"
               glib:type-name="GdkGCValuesMask"
               glib:get-type="gdk_gc_values_mask_get_type">
       <member name="foreground"
-                value="1"
-                c:identifier="GDK_GC_FOREGROUND"
-                glib:nick="foreground"/>
+              value="1"
+              c:identifier="GDK_GC_FOREGROUND"
+              glib:nick="foreground"/>
       <member name="background"
-                value="2"
-                c:identifier="GDK_GC_BACKGROUND"
-                glib:nick="background"/>
+              value="2"
+              c:identifier="GDK_GC_BACKGROUND"
+              glib:nick="background"/>
       <member name="font"
-                value="4"
-                c:identifier="GDK_GC_FONT"
-                glib:nick="font"/>
+              value="4"
+              c:identifier="GDK_GC_FONT"
+              glib:nick="font"/>
       <member name="function"
-                value="8"
-                c:identifier="GDK_GC_FUNCTION"
-                glib:nick="function"/>
+              value="8"
+              c:identifier="GDK_GC_FUNCTION"
+              glib:nick="function"/>
       <member name="fill"
-                value="16"
-                c:identifier="GDK_GC_FILL"
-                glib:nick="fill"/>
+              value="16"
+              c:identifier="GDK_GC_FILL"
+              glib:nick="fill"/>
       <member name="tile"
-                value="32"
-                c:identifier="GDK_GC_TILE"
-                glib:nick="tile"/>
+              value="32"
+              c:identifier="GDK_GC_TILE"
+              glib:nick="tile"/>
       <member name="stipple"
-                value="64"
-                c:identifier="GDK_GC_STIPPLE"
-                glib:nick="stipple"/>
+              value="64"
+              c:identifier="GDK_GC_STIPPLE"
+              glib:nick="stipple"/>
       <member name="clip-mask"
-                value="128"
-                c:identifier="GDK_GC_CLIP_MASK"
-                glib:nick="clip-mask"/>
+              value="128"
+              c:identifier="GDK_GC_CLIP_MASK"
+              glib:nick="clip-mask"/>
       <member name="subwindow"
-                value="256"
-                c:identifier="GDK_GC_SUBWINDOW"
-                glib:nick="subwindow"/>
+              value="256"
+              c:identifier="GDK_GC_SUBWINDOW"
+              glib:nick="subwindow"/>
       <member name="ts-x-origin"
-                value="512"
-                c:identifier="GDK_GC_TS_X_ORIGIN"
-                glib:nick="ts-x-origin"/>
+              value="512"
+              c:identifier="GDK_GC_TS_X_ORIGIN"
+              glib:nick="ts-x-origin"/>
       <member name="ts-y-origin"
-                value="1024"
-                c:identifier="GDK_GC_TS_Y_ORIGIN"
-                glib:nick="ts-y-origin"/>
+              value="1024"
+              c:identifier="GDK_GC_TS_Y_ORIGIN"
+              glib:nick="ts-y-origin"/>
       <member name="clip-x-origin"
-                value="2048"
-                c:identifier="GDK_GC_CLIP_X_ORIGIN"
-                glib:nick="clip-x-origin"/>
+              value="2048"
+              c:identifier="GDK_GC_CLIP_X_ORIGIN"
+              glib:nick="clip-x-origin"/>
       <member name="clip-y-origin"
-                value="4096"
-                c:identifier="GDK_GC_CLIP_Y_ORIGIN"
-                glib:nick="clip-y-origin"/>
+              value="4096"
+              c:identifier="GDK_GC_CLIP_Y_ORIGIN"
+              glib:nick="clip-y-origin"/>
       <member name="exposures"
-                value="8192"
-                c:identifier="GDK_GC_EXPOSURES"
-                glib:nick="exposures"/>
+              value="8192"
+              c:identifier="GDK_GC_EXPOSURES"
+              glib:nick="exposures"/>
       <member name="line-width"
-                value="16384"
-                c:identifier="GDK_GC_LINE_WIDTH"
-                glib:nick="line-width"/>
+              value="16384"
+              c:identifier="GDK_GC_LINE_WIDTH"
+              glib:nick="line-width"/>
       <member name="line-style"
-                value="32768"
-                c:identifier="GDK_GC_LINE_STYLE"
-                glib:nick="line-style"/>
+              value="32768"
+              c:identifier="GDK_GC_LINE_STYLE"
+              glib:nick="line-style"/>
       <member name="cap-style"
-                value="65536"
-                c:identifier="GDK_GC_CAP_STYLE"
-                glib:nick="cap-style"/>
+              value="65536"
+              c:identifier="GDK_GC_CAP_STYLE"
+              glib:nick="cap-style"/>
       <member name="join-style"
-                value="131072"
-                c:identifier="GDK_GC_JOIN_STYLE"
-                glib:nick="join-style"/>
+              value="131072"
+              c:identifier="GDK_GC_JOIN_STYLE"
+              glib:nick="join-style"/>
     </bitfield>
     <class name="GC"
            c:type="GdkGC"
@@ -4542,7 +4549,8 @@
           </parameter>
         </parameters>
       </constructor>
-      <constructor name="new_with_values" c:identifier="gdk_gc_new_with_values">
+      <constructor name="new_with_values"
+                   c:identifier="gdk_gc_new_with_values">
         <return-value>
           <type name="GC" c:type="GdkGC*"/>
         </return-value>
@@ -4570,7 +4578,7 @@
       </constructor>
       <method name="unref" c:identifier="gdk_gc_unref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4580,7 +4588,7 @@
       </method>
       <method name="get_values" c:identifier="gdk_gc_get_values">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4593,7 +4601,7 @@
       </method>
       <method name="set_values" c:identifier="gdk_gc_set_values">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4609,7 +4617,7 @@
       </method>
       <method name="set_foreground" c:identifier="gdk_gc_set_foreground">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4622,7 +4630,7 @@
       </method>
       <method name="set_background" c:identifier="gdk_gc_set_background">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4635,7 +4643,7 @@
       </method>
       <method name="set_font" c:identifier="gdk_gc_set_font">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4648,7 +4656,7 @@
       </method>
       <method name="set_function" c:identifier="gdk_gc_set_function">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4661,7 +4669,7 @@
       </method>
       <method name="set_fill" c:identifier="gdk_gc_set_fill">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4674,7 +4682,7 @@
       </method>
       <method name="set_tile" c:identifier="gdk_gc_set_tile">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4687,7 +4695,7 @@
       </method>
       <method name="set_stipple" c:identifier="gdk_gc_set_stipple">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4700,39 +4708,39 @@
       </method>
       <method name="set_ts_origin" c:identifier="gdk_gc_set_ts_origin">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
             <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_clip_origin" c:identifier="gdk_gc_set_clip_origin">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
             <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_clip_mask" c:identifier="gdk_gc_set_clip_mask">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4746,7 +4754,7 @@
       <method name="set_clip_rectangle"
               c:identifier="gdk_gc_set_clip_rectangle">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4759,7 +4767,7 @@
       </method>
       <method name="set_clip_region" c:identifier="gdk_gc_set_clip_region">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4772,7 +4780,7 @@
       </method>
       <method name="set_subwindow" c:identifier="gdk_gc_set_subwindow">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4785,28 +4793,28 @@
       </method>
       <method name="set_exposures" c:identifier="gdk_gc_set_exposures">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
             <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="exposures">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_line_attributes"
               c:identifier="gdk_gc_set_line_attributes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
             <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="line_width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="line_style">
             <type name="GdkLineStyle" c:type="GdkLineStyle"/>
@@ -4821,42 +4829,42 @@
       </method>
       <method name="set_dashes" c:identifier="gdk_gc_set_dashes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
             <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="dash_offset">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dash_list">
-            <type name="gint8" c:type="gint8"/>
+            <type name="int8" c:type="gint8"/>
           </parameter>
           <parameter name="n">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="offset" c:identifier="gdk_gc_offset">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
             <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="x_offset">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y_offset">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="copy" c:identifier="gdk_gc_copy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="dst_gc">
@@ -4869,7 +4877,7 @@
       </method>
       <method name="set_colormap" c:identifier="gdk_gc_set_colormap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4892,7 +4900,7 @@
       </method>
       <method name="set_rgb_fg_color" c:identifier="gdk_gc_set_rgb_fg_color">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4905,7 +4913,7 @@
       </method>
       <method name="set_rgb_bg_color" c:identifier="gdk_gc_set_rgb_bg_color">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4928,7 +4936,7 @@
       </method>
       <callback name="get_values">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4941,7 +4949,7 @@
       </callback>
       <callback name="set_values">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4957,41 +4965,41 @@
       </callback>
       <callback name="set_dashes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gc">
             <type name="GdkGC*" c:type="GdkGC*"/>
           </parameter>
           <parameter name="dash_offset">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dash_list">
-            <type name="gint8" c:type="gint8"/>
+            <type name="int8" c:type="gint8"/>
           </parameter>
           <parameter name="n">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="_gdk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gdk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gdk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gdk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
@@ -5032,17 +5040,17 @@
       </constructor>
       <method name="set_data" c:identifier="gdk_drawable_set_data">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
             <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="destroy_func">
             <type name="GDestroyNotify" c:type="GDestroyNotify"/>
@@ -5051,36 +5059,36 @@
       </method>
       <method name="get_data" c:identifier="gdk_drawable_get_data">
         <return-value>
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
             <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_size" c:identifier="gdk_drawable_get_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
             <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
-          <parameter name="width">
+          <parameter name="width" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
-          <parameter name="height">
+          <parameter name="height" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_colormap" c:identifier="gdk_drawable_set_colormap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5113,7 +5121,7 @@
       </method>
       <method name="get_depth" c:identifier="gdk_drawable_get_depth">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5143,7 +5151,7 @@
       </method>
       <method name="unref" c:identifier="gdk_drawable_unref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5160,16 +5168,16 @@
             <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -5185,22 +5193,22 @@
             <type name="GdkImage" c:type="GdkImage*"/>
           </parameter>
           <parameter name="src_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="src_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dest_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dest_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -5244,7 +5252,7 @@
       </callback>
       <callback name="draw_rectangle">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5254,25 +5262,25 @@
             <type name="GdkGC*" c:type="GdkGC*"/>
           </parameter>
           <parameter name="filled">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_arc">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5282,31 +5290,31 @@
             <type name="GdkGC*" c:type="GdkGC*"/>
           </parameter>
           <parameter name="filled">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="angle1">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="angle2">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_polygon">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5316,19 +5324,19 @@
             <type name="GdkGC*" c:type="GdkGC*"/>
           </parameter>
           <parameter name="filled">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="points">
             <type name="GdkPoint*" c:type="GdkPoint*"/>
           </parameter>
           <parameter name="npoints">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5341,22 +5349,22 @@
             <type name="GdkGC*" c:type="GdkGC*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="text">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="text_length">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_text_wc">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5369,22 +5377,22 @@
             <type name="GdkGC*" c:type="GdkGC*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="text">
             <type name="GdkWChar*" c:type="GdkWChar*"/>
           </parameter>
           <parameter name="text_length">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_drawable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5397,28 +5405,28 @@
             <type name="GdkDrawable*" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="xsrc">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="ysrc">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="xdest">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="ydest">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_points">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5431,13 +5439,13 @@
             <type name="GdkPoint*" c:type="GdkPoint*"/>
           </parameter>
           <parameter name="npoints">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_segments">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5450,13 +5458,13 @@
             <type name="GdkSegment*" c:type="GdkSegment*"/>
           </parameter>
           <parameter name="nsegs">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_lines">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5469,13 +5477,13 @@
             <type name="GdkPoint*" c:type="GdkPoint*"/>
           </parameter>
           <parameter name="npoints">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_glyphs">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5488,10 +5496,10 @@
             <type name="PangoFont*" c:type="PangoFont*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="glyphs">
             <type name="PangoGlyphString*" c:type="PangoGlyphString*"/>
@@ -5500,7 +5508,7 @@
       </callback>
       <callback name="draw_image">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5513,28 +5521,28 @@
             <type name="GdkImage*" c:type="GdkImage*"/>
           </parameter>
           <parameter name="xsrc">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="ysrc">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="xdest">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="ydest">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_depth">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5544,7 +5552,7 @@
       </callback>
       <callback name="get_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5560,7 +5568,7 @@
       </callback>
       <callback name="set_colormap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5610,16 +5618,16 @@
             <type name="GdkDrawable*" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
@@ -5652,16 +5660,16 @@
             <type name="GdkDrawable*" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="composite_x_offset">
             <type name="gint*" c:type="gint*"/>
@@ -5673,7 +5681,7 @@
       </callback>
       <callback name="draw_pixbuf">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5686,31 +5694,31 @@
             <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="src_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="src_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dest_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dest_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dither">
             <type name="GdkRgbDither" c:type="GdkRgbDither"/>
           </parameter>
           <parameter name="x_dither">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y_dither">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
@@ -5726,28 +5734,28 @@
             <type name="GdkImage*" c:type="GdkImage*"/>
           </parameter>
           <parameter name="src_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="src_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dest_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dest_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_glyphs_transformed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5763,10 +5771,10 @@
             <type name="PangoFont*" c:type="PangoFont*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="glyphs">
             <type name="PangoGlyphString*" c:type="PangoGlyphString*"/>
@@ -5775,7 +5783,7 @@
       </callback>
       <callback name="draw_trapezoids">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5788,7 +5796,7 @@
             <type name="GdkTrapezoid*" c:type="GdkTrapezoid*"/>
           </parameter>
           <parameter name="n_trapezoids">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
@@ -5804,68 +5812,68 @@
       </callback>
       <callback name="_gdk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gdk_reserved5">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gdk_reserved6">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gdk_reserved7">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gdk_reserved9">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gdk_reserved10">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gdk_reserved11">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gdk_reserved12">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gdk_reserved13">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gdk_reserved14">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gdk_reserved15">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gdk_reserved16">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
     <function name="draw_point" c:identifier="gdk_draw_point">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -5875,16 +5883,16 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_line" c:identifier="gdk_draw_line">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -5894,22 +5902,22 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="x1_">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y1_">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="x2_">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y2_">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_rectangle" c:identifier="gdk_draw_rectangle">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -5919,25 +5927,25 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="filled">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_arc" c:identifier="gdk_draw_arc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -5947,31 +5955,31 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="filled">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="angle1">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="angle2">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_polygon" c:identifier="gdk_draw_polygon">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -5981,19 +5989,19 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="filled">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="points">
           <type name="GdkPoint" c:type="GdkPoint*"/>
         </parameter>
         <parameter name="n_points">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_string" c:identifier="gdk_draw_string">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6006,19 +6014,19 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="string">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_text" c:identifier="gdk_draw_text">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6031,22 +6039,22 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="text_length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_text_wc" c:identifier="gdk_draw_text_wc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6059,22 +6067,22 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="text">
           <type name="GdkWChar" c:type="GdkWChar*"/>
         </parameter>
         <parameter name="text_length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_drawable" c:identifier="gdk_draw_drawable">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6087,28 +6095,28 @@
           <type name="Drawable" c:type="GdkDrawable*"/>
         </parameter>
         <parameter name="xsrc">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="ysrc">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="xdest">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="ydest">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_image" c:identifier="gdk_draw_image">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6121,28 +6129,28 @@
           <type name="GdkImage" c:type="GdkImage*"/>
         </parameter>
         <parameter name="xsrc">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="ysrc">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="xdest">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="ydest">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_points" c:identifier="gdk_draw_points">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6155,13 +6163,13 @@
           <type name="GdkPoint" c:type="GdkPoint*"/>
         </parameter>
         <parameter name="n_points">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_segments" c:identifier="gdk_draw_segments">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6174,13 +6182,13 @@
           <type name="GdkSegment" c:type="GdkSegment*"/>
         </parameter>
         <parameter name="n_segs">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_lines" c:identifier="gdk_draw_lines">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6193,13 +6201,13 @@
           <type name="GdkPoint" c:type="GdkPoint*"/>
         </parameter>
         <parameter name="n_points">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_pixbuf" c:identifier="gdk_draw_pixbuf">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6212,37 +6220,37 @@
           <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="src_x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="src_y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="dest_x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="dest_y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="dither">
           <type name="GdkRgbDither" c:type="GdkRgbDither"/>
         </parameter>
         <parameter name="x_dither">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y_dither">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_glyphs" c:identifier="gdk_draw_glyphs">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6255,10 +6263,10 @@
           <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="glyphs">
           <type name="PangoGlyphString" c:type="PangoGlyphString*"/>
@@ -6267,7 +6275,7 @@
     </function>
     <function name="draw_layout_line" c:identifier="gdk_draw_layout_line">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6277,10 +6285,10 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="line">
           <type name="PangoLayoutLine" c:type="PangoLayoutLine*"/>
@@ -6289,7 +6297,7 @@
     </function>
     <function name="draw_layout" c:identifier="gdk_draw_layout">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6299,10 +6307,10 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="layout">
           <type name="Pango.Layout" c:type="PangoLayout*"/>
@@ -6312,7 +6320,7 @@
     <function name="draw_layout_line_with_colors"
               c:identifier="gdk_draw_layout_line_with_colors">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6322,10 +6330,10 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="line">
           <type name="PangoLayoutLine" c:type="PangoLayoutLine*"/>
@@ -6341,7 +6349,7 @@
     <function name="draw_layout_with_colors"
               c:identifier="gdk_draw_layout_with_colors">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6351,10 +6359,10 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="layout">
           <type name="Pango.Layout" c:type="PangoLayout*"/>
@@ -6370,7 +6378,7 @@
     <function name="draw_glyphs_transformed"
               c:identifier="gdk_draw_glyphs_transformed">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6386,10 +6394,10 @@
           <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="glyphs">
           <type name="PangoGlyphString" c:type="PangoGlyphString*"/>
@@ -6398,7 +6406,7 @@
     </function>
     <function name="draw_trapezoids" c:identifier="gdk_draw_trapezoids">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -6411,7 +6419,7 @@
           <type name="GdkTrapezoid" c:type="GdkTrapezoid*"/>
         </parameter>
         <parameter name="n_trapezoids">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -6420,429 +6428,429 @@
                  glib:type-name="GdkFontType"
                  glib:get-type="gdk_font_type_get_type">
       <member name="font"
-                value="0"
-                c:identifier="GDK_FONT_FONT"
-                glib:nick="font"/>
+              value="0"
+              c:identifier="GDK_FONT_FONT"
+              glib:nick="font"/>
       <member name="fontset"
-                value="1"
-                c:identifier="GDK_FONT_FONTSET"
-                glib:nick="fontset"/>
+              value="1"
+              c:identifier="GDK_FONT_FONTSET"
+              glib:nick="fontset"/>
     </enumeration>
     <enumeration name="ImageType"
                  c:type="GdkImageType"
                  glib:type-name="GdkImageType"
                  glib:get-type="gdk_image_type_get_type">
       <member name="normal"
-                value="0"
-                c:identifier="GDK_IMAGE_NORMAL"
-                glib:nick="normal"/>
+              value="0"
+              c:identifier="GDK_IMAGE_NORMAL"
+              glib:nick="normal"/>
       <member name="shared"
-                value="1"
-                c:identifier="GDK_IMAGE_SHARED"
-                glib:nick="shared"/>
+              value="1"
+              c:identifier="GDK_IMAGE_SHARED"
+              glib:nick="shared"/>
       <member name="fastest"
-                value="2"
-                c:identifier="GDK_IMAGE_FASTEST"
-                glib:nick="fastest"/>
+              value="2"
+              c:identifier="GDK_IMAGE_FASTEST"
+              glib:nick="fastest"/>
     </enumeration>
     <enumeration name="PropMode"
                  c:type="GdkPropMode"
                  glib:type-name="GdkPropMode"
                  glib:get-type="gdk_prop_mode_get_type">
       <member name="replace"
-                value="0"
-                c:identifier="GDK_PROP_MODE_REPLACE"
-                glib:nick="replace"/>
+              value="0"
+              c:identifier="GDK_PROP_MODE_REPLACE"
+              glib:nick="replace"/>
       <member name="prepend"
-                value="1"
-                c:identifier="GDK_PROP_MODE_PREPEND"
-                glib:nick="prepend"/>
+              value="1"
+              c:identifier="GDK_PROP_MODE_PREPEND"
+              glib:nick="prepend"/>
       <member name="append"
-                value="2"
-                c:identifier="GDK_PROP_MODE_APPEND"
-                glib:nick="append"/>
+              value="2"
+              c:identifier="GDK_PROP_MODE_APPEND"
+              glib:nick="append"/>
     </enumeration>
     <enumeration name="FillRule"
                  c:type="GdkFillRule"
                  glib:type-name="GdkFillRule"
                  glib:get-type="gdk_fill_rule_get_type">
       <member name="even-odd-rule"
-                value="0"
-                c:identifier="GDK_EVEN_ODD_RULE"
-                glib:nick="even-odd-rule"/>
+              value="0"
+              c:identifier="GDK_EVEN_ODD_RULE"
+              glib:nick="even-odd-rule"/>
       <member name="winding-rule"
-                value="1"
-                c:identifier="GDK_WINDING_RULE"
-                glib:nick="winding-rule"/>
+              value="1"
+              c:identifier="GDK_WINDING_RULE"
+              glib:nick="winding-rule"/>
     </enumeration>
     <enumeration name="OverlapType"
                  c:type="GdkOverlapType"
                  glib:type-name="GdkOverlapType"
                  glib:get-type="gdk_overlap_type_get_type">
       <member name="in"
-                value="0"
-                c:identifier="GDK_OVERLAP_RECTANGLE_IN"
-                glib:nick="in"/>
+              value="0"
+              c:identifier="GDK_OVERLAP_RECTANGLE_IN"
+              glib:nick="in"/>
       <member name="out"
-                value="1"
-                c:identifier="GDK_OVERLAP_RECTANGLE_OUT"
-                glib:nick="out"/>
+              value="1"
+              c:identifier="GDK_OVERLAP_RECTANGLE_OUT"
+              glib:nick="out"/>
       <member name="part"
-                value="2"
-                c:identifier="GDK_OVERLAP_RECTANGLE_PART"
-                glib:nick="part"/>
+              value="2"
+              c:identifier="GDK_OVERLAP_RECTANGLE_PART"
+              glib:nick="part"/>
     </enumeration>
     <enumeration name="VisualType"
                  c:type="GdkVisualType"
                  glib:type-name="GdkVisualType"
                  glib:get-type="gdk_visual_type_get_type">
       <member name="static-gray"
-                value="0"
-                c:identifier="GDK_VISUAL_STATIC_GRAY"
-                glib:nick="static-gray"/>
+              value="0"
+              c:identifier="GDK_VISUAL_STATIC_GRAY"
+              glib:nick="static-gray"/>
       <member name="grayscale"
-                value="1"
-                c:identifier="GDK_VISUAL_GRAYSCALE"
-                glib:nick="grayscale"/>
+              value="1"
+              c:identifier="GDK_VISUAL_GRAYSCALE"
+              glib:nick="grayscale"/>
       <member name="static-color"
-                value="2"
-                c:identifier="GDK_VISUAL_STATIC_COLOR"
-                glib:nick="static-color"/>
+              value="2"
+              c:identifier="GDK_VISUAL_STATIC_COLOR"
+              glib:nick="static-color"/>
       <member name="pseudo-color"
-                value="3"
-                c:identifier="GDK_VISUAL_PSEUDO_COLOR"
-                glib:nick="pseudo-color"/>
+              value="3"
+              c:identifier="GDK_VISUAL_PSEUDO_COLOR"
+              glib:nick="pseudo-color"/>
       <member name="true-color"
-                value="4"
-                c:identifier="GDK_VISUAL_TRUE_COLOR"
-                glib:nick="true-color"/>
+              value="4"
+              c:identifier="GDK_VISUAL_TRUE_COLOR"
+              glib:nick="true-color"/>
       <member name="direct-color"
-                value="5"
-                c:identifier="GDK_VISUAL_DIRECT_COLOR"
-                glib:nick="direct-color"/>
+              value="5"
+              c:identifier="GDK_VISUAL_DIRECT_COLOR"
+              glib:nick="direct-color"/>
     </enumeration>
     <enumeration name="WindowClass"
                  c:type="GdkWindowClass"
                  glib:type-name="GdkWindowClass"
                  glib:get-type="gdk_window_class_get_type">
       <member name="output"
-                value="0"
-                c:identifier="GDK_INPUT_OUTPUT"
-                glib:nick="output"/>
+              value="0"
+              c:identifier="GDK_INPUT_OUTPUT"
+              glib:nick="output"/>
       <member name="only"
-                value="1"
-                c:identifier="GDK_INPUT_ONLY"
-                glib:nick="only"/>
+              value="1"
+              c:identifier="GDK_INPUT_ONLY"
+              glib:nick="only"/>
     </enumeration>
     <enumeration name="WindowType"
                  c:type="GdkWindowType"
                  glib:type-name="GdkWindowType"
                  glib:get-type="gdk_window_type_get_type">
       <member name="root"
-                value="0"
-                c:identifier="GDK_WINDOW_ROOT"
-                glib:nick="root"/>
+              value="0"
+              c:identifier="GDK_WINDOW_ROOT"
+              glib:nick="root"/>
       <member name="toplevel"
-                value="1"
-                c:identifier="GDK_WINDOW_TOPLEVEL"
-                glib:nick="toplevel"/>
+              value="1"
+              c:identifier="GDK_WINDOW_TOPLEVEL"
+              glib:nick="toplevel"/>
       <member name="child"
-                value="2"
-                c:identifier="GDK_WINDOW_CHILD"
-                glib:nick="child"/>
+              value="2"
+              c:identifier="GDK_WINDOW_CHILD"
+              glib:nick="child"/>
       <member name="dialog"
-                value="3"
-                c:identifier="GDK_WINDOW_DIALOG"
-                glib:nick="dialog"/>
+              value="3"
+              c:identifier="GDK_WINDOW_DIALOG"
+              glib:nick="dialog"/>
       <member name="temp"
-                value="4"
-                c:identifier="GDK_WINDOW_TEMP"
-                glib:nick="temp"/>
+              value="4"
+              c:identifier="GDK_WINDOW_TEMP"
+              glib:nick="temp"/>
       <member name="foreign"
-                value="5"
-                c:identifier="GDK_WINDOW_FOREIGN"
-                glib:nick="foreign"/>
+              value="5"
+              c:identifier="GDK_WINDOW_FOREIGN"
+              glib:nick="foreign"/>
     </enumeration>
     <bitfield name="WindowAttributesType"
               c:type="GdkWindowAttributesType"
               glib:type-name="GdkWindowAttributesType"
               glib:get-type="gdk_window_attributes_type_get_type">
       <member name="title"
-                value="2"
-                c:identifier="GDK_WA_TITLE"
-                glib:nick="title"/>
+              value="2"
+              c:identifier="GDK_WA_TITLE"
+              glib:nick="title"/>
       <member name="x" value="4" c:identifier="GDK_WA_X" glib:nick="x"/>
       <member name="y" value="8" c:identifier="GDK_WA_Y" glib:nick="y"/>
       <member name="cursor"
-                value="16"
-                c:identifier="GDK_WA_CURSOR"
-                glib:nick="cursor"/>
+              value="16"
+              c:identifier="GDK_WA_CURSOR"
+              glib:nick="cursor"/>
       <member name="colormap"
-                value="32"
-                c:identifier="GDK_WA_COLORMAP"
-                glib:nick="colormap"/>
+              value="32"
+              c:identifier="GDK_WA_COLORMAP"
+              glib:nick="colormap"/>
       <member name="visual"
-                value="64"
-                c:identifier="GDK_WA_VISUAL"
-                glib:nick="visual"/>
+              value="64"
+              c:identifier="GDK_WA_VISUAL"
+              glib:nick="visual"/>
       <member name="wmclass"
-                value="128"
-                c:identifier="GDK_WA_WMCLASS"
-                glib:nick="wmclass"/>
+              value="128"
+              c:identifier="GDK_WA_WMCLASS"
+              glib:nick="wmclass"/>
       <member name="noredir"
-                value="256"
-                c:identifier="GDK_WA_NOREDIR"
-                glib:nick="noredir"/>
+              value="256"
+              c:identifier="GDK_WA_NOREDIR"
+              glib:nick="noredir"/>
       <member name="type-hint"
-                value="512"
-                c:identifier="GDK_WA_TYPE_HINT"
-                glib:nick="type-hint"/>
+              value="512"
+              c:identifier="GDK_WA_TYPE_HINT"
+              glib:nick="type-hint"/>
     </bitfield>
     <bitfield name="WindowHints"
               c:type="GdkWindowHints"
               glib:type-name="GdkWindowHints"
               glib:get-type="gdk_window_hints_get_type">
       <member name="pos"
-                value="1"
-                c:identifier="GDK_HINT_POS"
-                glib:nick="pos"/>
+              value="1"
+              c:identifier="GDK_HINT_POS"
+              glib:nick="pos"/>
       <member name="min-size"
-                value="2"
-                c:identifier="GDK_HINT_MIN_SIZE"
-                glib:nick="min-size"/>
+              value="2"
+              c:identifier="GDK_HINT_MIN_SIZE"
+              glib:nick="min-size"/>
       <member name="max-size"
-                value="4"
-                c:identifier="GDK_HINT_MAX_SIZE"
-                glib:nick="max-size"/>
+              value="4"
+              c:identifier="GDK_HINT_MAX_SIZE"
+              glib:nick="max-size"/>
       <member name="base-size"
-                value="8"
-                c:identifier="GDK_HINT_BASE_SIZE"
-                glib:nick="base-size"/>
+              value="8"
+              c:identifier="GDK_HINT_BASE_SIZE"
+              glib:nick="base-size"/>
       <member name="aspect"
-                value="16"
-                c:identifier="GDK_HINT_ASPECT"
-                glib:nick="aspect"/>
+              value="16"
+              c:identifier="GDK_HINT_ASPECT"
+              glib:nick="aspect"/>
       <member name="resize-inc"
-                value="32"
-                c:identifier="GDK_HINT_RESIZE_INC"
-                glib:nick="resize-inc"/>
+              value="32"
+              c:identifier="GDK_HINT_RESIZE_INC"
+              glib:nick="resize-inc"/>
       <member name="win-gravity"
-                value="64"
-                c:identifier="GDK_HINT_WIN_GRAVITY"
-                glib:nick="win-gravity"/>
+              value="64"
+              c:identifier="GDK_HINT_WIN_GRAVITY"
+              glib:nick="win-gravity"/>
       <member name="user-pos"
-                value="128"
-                c:identifier="GDK_HINT_USER_POS"
-                glib:nick="user-pos"/>
+              value="128"
+              c:identifier="GDK_HINT_USER_POS"
+              glib:nick="user-pos"/>
       <member name="user-size"
-                value="256"
-                c:identifier="GDK_HINT_USER_SIZE"
-                glib:nick="user-size"/>
+              value="256"
+              c:identifier="GDK_HINT_USER_SIZE"
+              glib:nick="user-size"/>
     </bitfield>
     <enumeration name="WindowTypeHint"
                  c:type="GdkWindowTypeHint"
                  glib:type-name="GdkWindowTypeHint"
                  glib:get-type="gdk_window_type_hint_get_type">
       <member name="normal"
-                value="0"
-                c:identifier="GDK_WINDOW_TYPE_HINT_NORMAL"
-                glib:nick="normal"/>
+              value="0"
+              c:identifier="GDK_WINDOW_TYPE_HINT_NORMAL"
+              glib:nick="normal"/>
       <member name="dialog"
-                value="1"
-                c:identifier="GDK_WINDOW_TYPE_HINT_DIALOG"
-                glib:nick="dialog"/>
+              value="1"
+              c:identifier="GDK_WINDOW_TYPE_HINT_DIALOG"
+              glib:nick="dialog"/>
       <member name="menu"
-                value="2"
-                c:identifier="GDK_WINDOW_TYPE_HINT_MENU"
-                glib:nick="menu"/>
+              value="2"
+              c:identifier="GDK_WINDOW_TYPE_HINT_MENU"
+              glib:nick="menu"/>
       <member name="toolbar"
-                value="3"
-                c:identifier="GDK_WINDOW_TYPE_HINT_TOOLBAR"
-                glib:nick="toolbar"/>
+              value="3"
+              c:identifier="GDK_WINDOW_TYPE_HINT_TOOLBAR"
+              glib:nick="toolbar"/>
       <member name="splashscreen"
-                value="4"
-                c:identifier="GDK_WINDOW_TYPE_HINT_SPLASHSCREEN"
-                glib:nick="splashscreen"/>
+              value="4"
+              c:identifier="GDK_WINDOW_TYPE_HINT_SPLASHSCREEN"
+              glib:nick="splashscreen"/>
       <member name="utility"
-                value="5"
-                c:identifier="GDK_WINDOW_TYPE_HINT_UTILITY"
-                glib:nick="utility"/>
+              value="5"
+              c:identifier="GDK_WINDOW_TYPE_HINT_UTILITY"
+              glib:nick="utility"/>
       <member name="dock"
-                value="6"
-                c:identifier="GDK_WINDOW_TYPE_HINT_DOCK"
-                glib:nick="dock"/>
+              value="6"
+              c:identifier="GDK_WINDOW_TYPE_HINT_DOCK"
+              glib:nick="dock"/>
       <member name="desktop"
-                value="7"
-                c:identifier="GDK_WINDOW_TYPE_HINT_DESKTOP"
-                glib:nick="desktop"/>
+              value="7"
+              c:identifier="GDK_WINDOW_TYPE_HINT_DESKTOP"
+              glib:nick="desktop"/>
       <member name="dropdown-menu"
-                value="8"
-                c:identifier="GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU"
-                glib:nick="dropdown-menu"/>
+              value="8"
+              c:identifier="GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU"
+              glib:nick="dropdown-menu"/>
       <member name="popup-menu"
-                value="9"
-                c:identifier="GDK_WINDOW_TYPE_HINT_POPUP_MENU"
-                glib:nick="popup-menu"/>
+              value="9"
+              c:identifier="GDK_WINDOW_TYPE_HINT_POPUP_MENU"
+              glib:nick="popup-menu"/>
       <member name="tooltip"
-                value="10"
-                c:identifier="GDK_WINDOW_TYPE_HINT_TOOLTIP"
-                glib:nick="tooltip"/>
+              value="10"
+              c:identifier="GDK_WINDOW_TYPE_HINT_TOOLTIP"
+              glib:nick="tooltip"/>
       <member name="notification"
-                value="11"
-                c:identifier="GDK_WINDOW_TYPE_HINT_NOTIFICATION"
-                glib:nick="notification"/>
+              value="11"
+              c:identifier="GDK_WINDOW_TYPE_HINT_NOTIFICATION"
+              glib:nick="notification"/>
       <member name="combo"
-                value="12"
-                c:identifier="GDK_WINDOW_TYPE_HINT_COMBO"
-                glib:nick="combo"/>
+              value="12"
+              c:identifier="GDK_WINDOW_TYPE_HINT_COMBO"
+              glib:nick="combo"/>
       <member name="dnd"
-                value="13"
-                c:identifier="GDK_WINDOW_TYPE_HINT_DND"
-                glib:nick="dnd"/>
+              value="13"
+              c:identifier="GDK_WINDOW_TYPE_HINT_DND"
+              glib:nick="dnd"/>
     </enumeration>
     <bitfield name="WMDecoration"
               c:type="GdkWMDecoration"
               glib:type-name="GdkWMDecoration"
               glib:get-type="gdk_wm_decoration_get_type">
       <member name="all"
-                value="1"
-                c:identifier="GDK_DECOR_ALL"
-                glib:nick="all"/>
+              value="1"
+              c:identifier="GDK_DECOR_ALL"
+              glib:nick="all"/>
       <member name="border"
-                value="2"
-                c:identifier="GDK_DECOR_BORDER"
-                glib:nick="border"/>
+              value="2"
+              c:identifier="GDK_DECOR_BORDER"
+              glib:nick="border"/>
       <member name="resizeh"
-                value="4"
-                c:identifier="GDK_DECOR_RESIZEH"
-                glib:nick="resizeh"/>
+              value="4"
+              c:identifier="GDK_DECOR_RESIZEH"
+              glib:nick="resizeh"/>
       <member name="title"
-                value="8"
-                c:identifier="GDK_DECOR_TITLE"
-                glib:nick="title"/>
+              value="8"
+              c:identifier="GDK_DECOR_TITLE"
+              glib:nick="title"/>
       <member name="menu"
-                value="16"
-                c:identifier="GDK_DECOR_MENU"
-                glib:nick="menu"/>
+              value="16"
+              c:identifier="GDK_DECOR_MENU"
+              glib:nick="menu"/>
       <member name="minimize"
-                value="32"
-                c:identifier="GDK_DECOR_MINIMIZE"
-                glib:nick="minimize"/>
+              value="32"
+              c:identifier="GDK_DECOR_MINIMIZE"
+              glib:nick="minimize"/>
       <member name="maximize"
-                value="64"
-                c:identifier="GDK_DECOR_MAXIMIZE"
-                glib:nick="maximize"/>
+              value="64"
+              c:identifier="GDK_DECOR_MAXIMIZE"
+              glib:nick="maximize"/>
     </bitfield>
     <bitfield name="WMFunction"
               c:type="GdkWMFunction"
               glib:type-name="GdkWMFunction"
               glib:get-type="gdk_wm_function_get_type">
       <member name="all"
-                value="1"
-                c:identifier="GDK_FUNC_ALL"
-                glib:nick="all"/>
+              value="1"
+              c:identifier="GDK_FUNC_ALL"
+              glib:nick="all"/>
       <member name="resize"
-                value="2"
-                c:identifier="GDK_FUNC_RESIZE"
-                glib:nick="resize"/>
+              value="2"
+              c:identifier="GDK_FUNC_RESIZE"
+              glib:nick="resize"/>
       <member name="move"
-                value="4"
-                c:identifier="GDK_FUNC_MOVE"
-                glib:nick="move"/>
+              value="4"
+              c:identifier="GDK_FUNC_MOVE"
+              glib:nick="move"/>
       <member name="minimize"
-                value="8"
-                c:identifier="GDK_FUNC_MINIMIZE"
-                glib:nick="minimize"/>
+              value="8"
+              c:identifier="GDK_FUNC_MINIMIZE"
+              glib:nick="minimize"/>
       <member name="maximize"
-                value="16"
-                c:identifier="GDK_FUNC_MAXIMIZE"
-                glib:nick="maximize"/>
+              value="16"
+              c:identifier="GDK_FUNC_MAXIMIZE"
+              glib:nick="maximize"/>
       <member name="close"
-                value="32"
-                c:identifier="GDK_FUNC_CLOSE"
-                glib:nick="close"/>
+              value="32"
+              c:identifier="GDK_FUNC_CLOSE"
+              glib:nick="close"/>
     </bitfield>
     <enumeration name="Gravity"
                  c:type="GdkGravity"
                  glib:type-name="GdkGravity"
                  glib:get-type="gdk_gravity_get_type">
       <member name="north-west"
-                value="1"
-                c:identifier="GDK_GRAVITY_NORTH_WEST"
-                glib:nick="north-west"/>
+              value="1"
+              c:identifier="GDK_GRAVITY_NORTH_WEST"
+              glib:nick="north-west"/>
       <member name="north"
-                value="2"
-                c:identifier="GDK_GRAVITY_NORTH"
-                glib:nick="north"/>
+              value="2"
+              c:identifier="GDK_GRAVITY_NORTH"
+              glib:nick="north"/>
       <member name="north-east"
-                value="3"
-                c:identifier="GDK_GRAVITY_NORTH_EAST"
-                glib:nick="north-east"/>
+              value="3"
+              c:identifier="GDK_GRAVITY_NORTH_EAST"
+              glib:nick="north-east"/>
       <member name="west"
-                value="4"
-                c:identifier="GDK_GRAVITY_WEST"
-                glib:nick="west"/>
+              value="4"
+              c:identifier="GDK_GRAVITY_WEST"
+              glib:nick="west"/>
       <member name="center"
-                value="5"
-                c:identifier="GDK_GRAVITY_CENTER"
-                glib:nick="center"/>
+              value="5"
+              c:identifier="GDK_GRAVITY_CENTER"
+              glib:nick="center"/>
       <member name="east"
-                value="6"
-                c:identifier="GDK_GRAVITY_EAST"
-                glib:nick="east"/>
+              value="6"
+              c:identifier="GDK_GRAVITY_EAST"
+              glib:nick="east"/>
       <member name="south-west"
-                value="7"
-                c:identifier="GDK_GRAVITY_SOUTH_WEST"
-                glib:nick="south-west"/>
+              value="7"
+              c:identifier="GDK_GRAVITY_SOUTH_WEST"
+              glib:nick="south-west"/>
       <member name="south"
-                value="8"
-                c:identifier="GDK_GRAVITY_SOUTH"
-                glib:nick="south"/>
+              value="8"
+              c:identifier="GDK_GRAVITY_SOUTH"
+              glib:nick="south"/>
       <member name="south-east"
-                value="9"
-                c:identifier="GDK_GRAVITY_SOUTH_EAST"
-                glib:nick="south-east"/>
+              value="9"
+              c:identifier="GDK_GRAVITY_SOUTH_EAST"
+              glib:nick="south-east"/>
       <member name="static"
-                value="10"
-                c:identifier="GDK_GRAVITY_STATIC"
-                glib:nick="static"/>
+              value="10"
+              c:identifier="GDK_GRAVITY_STATIC"
+              glib:nick="static"/>
     </enumeration>
     <enumeration name="WindowEdge"
                  c:type="GdkWindowEdge"
                  glib:type-name="GdkWindowEdge"
                  glib:get-type="gdk_window_edge_get_type">
       <member name="north-west"
-                value="0"
-                c:identifier="GDK_WINDOW_EDGE_NORTH_WEST"
-                glib:nick="north-west"/>
+              value="0"
+              c:identifier="GDK_WINDOW_EDGE_NORTH_WEST"
+              glib:nick="north-west"/>
       <member name="north"
-                value="1"
-                c:identifier="GDK_WINDOW_EDGE_NORTH"
-                glib:nick="north"/>
+              value="1"
+              c:identifier="GDK_WINDOW_EDGE_NORTH"
+              glib:nick="north"/>
       <member name="north-east"
-                value="2"
-                c:identifier="GDK_WINDOW_EDGE_NORTH_EAST"
-                glib:nick="north-east"/>
+              value="2"
+              c:identifier="GDK_WINDOW_EDGE_NORTH_EAST"
+              glib:nick="north-east"/>
       <member name="west"
-                value="3"
-                c:identifier="GDK_WINDOW_EDGE_WEST"
-                glib:nick="west"/>
+              value="3"
+              c:identifier="GDK_WINDOW_EDGE_WEST"
+              glib:nick="west"/>
       <member name="east"
-                value="4"
-                c:identifier="GDK_WINDOW_EDGE_EAST"
-                glib:nick="east"/>
+              value="4"
+              c:identifier="GDK_WINDOW_EDGE_EAST"
+              glib:nick="east"/>
       <member name="south-west"
-                value="5"
-                c:identifier="GDK_WINDOW_EDGE_SOUTH_WEST"
-                glib:nick="south-west"/>
+              value="5"
+              c:identifier="GDK_WINDOW_EDGE_SOUTH_WEST"
+              glib:nick="south-west"/>
       <member name="south"
-                value="6"
-                c:identifier="GDK_WINDOW_EDGE_SOUTH"
-                glib:nick="south"/>
+              value="6"
+              c:identifier="GDK_WINDOW_EDGE_SOUTH"
+              glib:nick="south"/>
       <member name="south-east"
-                value="7"
-                c:identifier="GDK_WINDOW_EDGE_SOUTH_EAST"
-                glib:nick="south-east"/>
+              value="7"
+              c:identifier="GDK_WINDOW_EDGE_SOUTH_EAST"
+              glib:nick="south-east"/>
     </enumeration>
     <glib:boxed c:type="Font"
                 glib:name="Font"
@@ -6868,7 +6876,7 @@
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="font_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -6892,7 +6900,7 @@
         </return-value>
         <parameters>
           <parameter name="font_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -6909,7 +6917,7 @@
       </constructor>
       <method name="unref" c:identifier="gdk_font_unref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="font">
@@ -6919,7 +6927,7 @@
       </method>
       <method name="id" c:identifier="gdk_font_id">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="font">
@@ -6929,7 +6937,7 @@
       </method>
       <method name="equal" c:identifier="gdk_font_equal">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="fonta">
@@ -6961,7 +6969,7 @@
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="fontset_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -6971,42 +6979,42 @@
       </return-value>
       <parameters>
         <parameter name="fontset_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="string_width" c:identifier="gdk_string_width">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="font">
           <type name="Font" c:type="GdkFont*"/>
         </parameter>
         <parameter name="string">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="text_width" c:identifier="gdk_text_width">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="font">
           <type name="Font" c:type="GdkFont*"/>
         </parameter>
         <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="text_length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="text_width_wc" c:identifier="gdk_text_width_wc">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="font">
@@ -7016,13 +7024,13 @@
           <type name="GdkWChar" c:type="GdkWChar*"/>
         </parameter>
         <parameter name="text_length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="char_width" c:identifier="gdk_char_width">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="font">
@@ -7035,7 +7043,7 @@
     </function>
     <function name="char_width_wc" c:identifier="gdk_char_width_wc">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="font">
@@ -7048,36 +7056,36 @@
     </function>
     <function name="string_measure" c:identifier="gdk_string_measure">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="font">
           <type name="Font" c:type="GdkFont*"/>
         </parameter>
         <parameter name="string">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="text_measure" c:identifier="gdk_text_measure">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="font">
           <type name="Font" c:type="GdkFont*"/>
         </parameter>
         <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="text_length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="char_measure" c:identifier="gdk_char_measure">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="font">
@@ -7090,36 +7098,36 @@
     </function>
     <function name="string_height" c:identifier="gdk_string_height">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="font">
           <type name="Font" c:type="GdkFont*"/>
         </parameter>
         <parameter name="string">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="text_height" c:identifier="gdk_text_height">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="font">
           <type name="Font" c:type="GdkFont*"/>
         </parameter>
         <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="text_length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="char_height" c:identifier="gdk_char_height">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="font">
@@ -7132,17 +7140,17 @@
     </function>
     <function name="text_extents" c:identifier="gdk_text_extents">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="font">
           <type name="Font" c:type="GdkFont*"/>
         </parameter>
         <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="text_length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="lbearing">
           <type name="gint" c:type="gint*"/>
@@ -7163,7 +7171,7 @@
     </function>
     <function name="text_extents_wc" c:identifier="gdk_text_extents_wc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="font">
@@ -7173,7 +7181,7 @@
           <type name="GdkWChar" c:type="GdkWChar*"/>
         </parameter>
         <parameter name="text_length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="lbearing">
           <type name="gint" c:type="gint*"/>
@@ -7194,14 +7202,14 @@
     </function>
     <function name="string_extents" c:identifier="gdk_string_extents">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="font">
           <type name="Font" c:type="GdkFont*"/>
         </parameter>
         <parameter name="string">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="lbearing">
           <type name="gint" c:type="gint*"/>
@@ -7237,10 +7245,10 @@
             <type name="GdkVisual" c:type="GdkVisual*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </constructor>
@@ -7253,16 +7261,16 @@
             <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </constructor>
@@ -7278,7 +7286,7 @@
       </constructor>
       <method name="unref" c:identifier="gdk_image_unref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -7288,42 +7296,42 @@
       </method>
       <method name="put_pixel" c:identifier="gdk_image_put_pixel">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
             <type name="Image" c:type="GdkImage*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="pixel">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_pixel" c:identifier="gdk_image_get_pixel">
         <return-value>
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </return-value>
         <parameters>
           <parameter name="image">
             <type name="Image" c:type="GdkImage*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_colormap" c:identifier="gdk_image_set_colormap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -7350,10 +7358,10 @@
         <type name="guint" c:type="guint"/>
       </field>
       <field name="group">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="level">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
     </record>
     <class name="Keymap"
@@ -7393,7 +7401,7 @@
       <method name="translate_keyboard_state"
               c:identifier="gdk_keymap_translate_keyboard_state">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="keymap">
@@ -7406,15 +7414,15 @@
             <type name="ModifierType" c:type="GdkModifierType"/>
           </parameter>
           <parameter name="group">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="keyval">
+          <parameter name="keyval" direction="out">
             <type name="guint" c:type="guint*"/>
           </parameter>
-          <parameter name="effective_group">
+          <parameter name="effective_group" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
-          <parameter name="level">
+          <parameter name="level" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
           <parameter name="consumed_modifiers">
@@ -7425,7 +7433,7 @@
       <method name="get_entries_for_keyval"
               c:identifier="gdk_keymap_get_entries_for_keyval">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="keymap">
@@ -7434,10 +7442,10 @@
           <parameter name="keyval">
             <type name="guint" c:type="guint"/>
           </parameter>
-          <parameter name="keys">
+          <parameter name="keys" direction="out">
             <type name="GdkKeymapKey" c:type="GdkKeymapKey**"/>
           </parameter>
-          <parameter name="n_keys">
+          <parameter name="n_keys" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
@@ -7445,7 +7453,7 @@
       <method name="get_entries_for_keycode"
               c:identifier="gdk_keymap_get_entries_for_keycode">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="keymap">
@@ -7454,7 +7462,7 @@
           <parameter name="hardware_keycode">
             <type name="guint" c:type="guint"/>
           </parameter>
-          <parameter name="keys">
+          <parameter name="keys" direction="out">
             <type name="GdkKeymapKey" c:type="GdkKeymapKey**"/>
           </parameter>
           <parameter name="keyvals">
@@ -7478,7 +7486,7 @@
       <method name="have_bidi_layouts"
               c:identifier="gdk_keymap_have_bidi_layouts">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="keymap">
@@ -7488,7 +7496,7 @@
       </method>
       <callback name="direction_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="keymap">
@@ -7498,7 +7506,7 @@
       </callback>
       <callback name="keys_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="keymap">
@@ -7508,18 +7516,18 @@
       </callback>
       <glib:signal name="direction-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="keys-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
     </class>
     <function name="keyval_name" c:identifier="gdk_keyval_name">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="keyval">
@@ -7533,22 +7541,23 @@
       </return-value>
       <parameters>
         <parameter name="keyval_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="keyval_convert_case" c:identifier="gdk_keyval_convert_case">
+    <function name="keyval_convert_case"
+              c:identifier="gdk_keyval_convert_case">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="symbol">
           <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="lower">
+        <parameter name="lower" direction="out">
           <type name="guint" c:type="guint*"/>
         </parameter>
-        <parameter name="upper">
+        <parameter name="upper" direction="out">
           <type name="guint" c:type="guint*"/>
         </parameter>
       </parameters>
@@ -7575,7 +7584,7 @@
     </function>
     <function name="keyval_is_upper" c:identifier="gdk_keyval_is_upper">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="keyval">
@@ -7585,7 +7594,7 @@
     </function>
     <function name="keyval_is_lower" c:identifier="gdk_keyval_is_lower">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="keyval">
@@ -7595,7 +7604,7 @@
     </function>
     <function name="keyval_to_unicode" c:identifier="gdk_keyval_to_unicode">
       <return-value>
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </return-value>
       <parameters>
         <parameter name="keyval">
@@ -7609,7 +7618,7 @@
       </return-value>
       <parameters>
         <parameter name="wc">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
@@ -7622,7 +7631,7 @@
       <method name="set_drawable"
               c:identifier="gdk_pango_renderer_set_drawable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gdk_renderer">
@@ -7635,7 +7644,7 @@
       </method>
       <method name="set_gc" c:identifier="gdk_pango_renderer_set_gc">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gdk_renderer">
@@ -7648,7 +7657,7 @@
       </method>
       <method name="set_stipple" c:identifier="gdk_pango_renderer_set_stipple">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gdk_renderer">
@@ -7665,7 +7674,7 @@
       <method name="set_override_color"
               c:identifier="gdk_pango_renderer_set_override_color">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="gdk_renderer">
@@ -7723,7 +7732,7 @@
     <function name="pango_context_set_colormap"
               c:identifier="gdk_pango_context_set_colormap">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -7744,16 +7753,16 @@
           <type name="PangoLayoutLine" c:type="PangoLayoutLine*"/>
         </parameter>
         <parameter name="x_origin">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y_origin">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="index_ranges">
           <type name="gint" c:type="gint*"/>
         </parameter>
         <parameter name="n_ranges">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -7767,16 +7776,16 @@
           <type name="Pango.Layout" c:type="PangoLayout*"/>
         </parameter>
         <parameter name="x_origin">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y_origin">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="index_ranges">
           <type name="gint" c:type="gint*"/>
         </parameter>
         <parameter name="n_ranges">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -7793,7 +7802,7 @@
         <type name="PangoAttribute" c:type="PangoAttribute"/>
       </field>
       <field name="embossed">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </field>
     </record>
     <record name="GdkPangoAttrEmbossColor" c:type="GdkPangoAttrEmbossColor">
@@ -7822,7 +7831,7 @@
       </return-value>
       <parameters>
         <parameter name="embossed">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
@@ -7845,7 +7854,7 @@
         <type name="GdkDrawable*" c:type="GdkDrawable*"/>
       </field>
       <field name="depth">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
     </record>
     <class name="Pixmap"
@@ -7862,13 +7871,13 @@
             <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="depth">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </constructor>
@@ -7882,16 +7891,16 @@
             <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="data">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="depth">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="fg">
             <type name="Color" c:type="GdkColor*"/>
@@ -7910,14 +7919,14 @@
           <parameter name="drawable">
             <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
-          <parameter name="mask">
+          <parameter name="mask" direction="out">
             <type name="GdkBitmap" c:type="GdkBitmap**"/>
           </parameter>
           <parameter name="transparent_color">
             <type name="Color" c:type="GdkColor*"/>
           </parameter>
           <parameter name="filename">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -7933,14 +7942,14 @@
           <parameter name="colormap">
             <type name="Colormap" c:type="GdkColormap*"/>
           </parameter>
-          <parameter name="mask">
+          <parameter name="mask" direction="out">
             <type name="GdkBitmap" c:type="GdkBitmap**"/>
           </parameter>
           <parameter name="transparent_color">
             <type name="Color" c:type="GdkColor*"/>
           </parameter>
           <parameter name="filename">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -7953,7 +7962,7 @@
           <parameter name="drawable">
             <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
-          <parameter name="mask">
+          <parameter name="mask" direction="out">
             <type name="GdkBitmap" c:type="GdkBitmap**"/>
           </parameter>
           <parameter name="transparent_color">
@@ -7976,7 +7985,7 @@
           <parameter name="colormap">
             <type name="Colormap" c:type="GdkColormap*"/>
           </parameter>
-          <parameter name="mask">
+          <parameter name="mask" direction="out">
             <type name="GdkBitmap" c:type="GdkBitmap**"/>
           </parameter>
           <parameter name="transparent_color">
@@ -8048,13 +8057,13 @@
             <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="depth">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </constructor>
@@ -8069,13 +8078,13 @@
           <type name="Drawable" c:type="GdkDrawable*"/>
         </parameter>
         <parameter name="data">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -8085,10 +8094,10 @@
       </return-value>
       <parameters>
         <parameter name="atom_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="only_if_exists">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
@@ -8099,13 +8108,13 @@
       </return-value>
       <parameters>
         <parameter name="atom_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="atom_name" c:identifier="gdk_atom_name">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="atom">
@@ -8115,7 +8124,7 @@
     </function>
     <function name="property_get" c:identifier="gdk_property_get">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="window">
@@ -8128,13 +8137,13 @@
           <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="offset">
-          <type name="gulong" c:type="gulong"/>
+          <type name="ulong" c:type="gulong"/>
         </parameter>
         <parameter name="length">
-          <type name="gulong" c:type="gulong"/>
+          <type name="ulong" c:type="gulong"/>
         </parameter>
         <parameter name="pdelete">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="actual_property_type">
           <type name="GdkAtom" c:type="GdkAtom*"/>
@@ -8152,7 +8161,7 @@
     </function>
     <function name="property_change" c:identifier="gdk_property_change">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="window">
@@ -8165,7 +8174,7 @@
           <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="mode">
           <type name="PropMode" c:type="GdkPropMode"/>
@@ -8174,13 +8183,13 @@
           <type name="guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="nelements">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="property_delete" c:identifier="gdk_property_delete">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="window">
@@ -8194,20 +8203,20 @@
     <function name="text_property_to_text_list"
               c:identifier="gdk_text_property_to_text_list">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="encoding">
           <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="text">
           <type name="guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="list">
           <type name="gchar" c:type="gchar***"/>
@@ -8217,20 +8226,20 @@
     <function name="text_property_to_utf8_list"
               c:identifier="gdk_text_property_to_utf8_list">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="encoding">
           <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="text">
           <type name="guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="list">
           <type name="gchar" c:type="gchar***"/>
@@ -8240,11 +8249,11 @@
     <function name="utf8_to_compound_text"
               c:identifier="gdk_utf8_to_compound_text">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="encoding">
           <type name="GdkAtom" c:type="GdkAtom*"/>
@@ -8263,11 +8272,11 @@
     <function name="string_to_compound_text"
               c:identifier="gdk_string_to_compound_text">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="encoding">
           <type name="GdkAtom" c:type="GdkAtom*"/>
@@ -8286,7 +8295,7 @@
     <function name="text_property_to_text_list_for_display"
               c:identifier="gdk_text_property_to_text_list_for_display">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -8296,13 +8305,13 @@
           <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="text">
           <type name="guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="list">
           <type name="gchar" c:type="gchar***"/>
@@ -8312,7 +8321,7 @@
     <function name="text_property_to_utf8_list_for_display"
               c:identifier="gdk_text_property_to_utf8_list_for_display">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -8322,13 +8331,13 @@
           <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="text">
           <type name="guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="list">
           <type name="gchar" c:type="gchar***"/>
@@ -8338,25 +8347,25 @@
     <function name="utf8_to_string_target"
               c:identifier="gdk_utf8_to_string_target">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="string_to_compound_text_for_display"
               c:identifier="gdk_string_to_compound_text_for_display">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="display">
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="str">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="encoding">
           <type name="GdkAtom" c:type="GdkAtom*"/>
@@ -8375,14 +8384,14 @@
     <function name="utf8_to_compound_text_for_display"
               c:identifier="gdk_utf8_to_compound_text_for_display">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="display">
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="str">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="encoding">
           <type name="GdkAtom" c:type="GdkAtom*"/>
@@ -8400,7 +8409,7 @@
     </function>
     <function name="free_text_list" c:identifier="gdk_free_text_list">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -8410,7 +8419,7 @@
     </function>
     <function name="free_compound_text" c:identifier="gdk_free_compound_text">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="ctext">
@@ -8420,14 +8429,14 @@
     </function>
     <callback name="GdkSpanFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="span">
           <type name="GdkSpan*" c:type="GdkSpan*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
@@ -8445,7 +8454,7 @@
           <type name="GdkPoint" c:type="GdkPoint*"/>
         </parameter>
         <parameter name="n_points">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="fill_rule">
           <type name="FillRule" c:type="GdkFillRule"/>
@@ -8474,7 +8483,7 @@
     </function>
     <function name="region_destroy" c:identifier="gdk_region_destroy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="region">
@@ -8484,7 +8493,7 @@
     </function>
     <function name="region_get_clipbox" c:identifier="gdk_region_get_clipbox">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="region">
@@ -8498,7 +8507,7 @@
     <function name="region_get_rectangles"
               c:identifier="gdk_region_get_rectangles">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="region">
@@ -8514,7 +8523,7 @@
     </function>
     <function name="region_empty" c:identifier="gdk_region_empty">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="region">
@@ -8524,7 +8533,7 @@
     </function>
     <function name="region_equal" c:identifier="gdk_region_equal">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="region1">
@@ -8537,17 +8546,17 @@
     </function>
     <function name="region_point_in" c:identifier="gdk_region_point_in">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="region">
           <type name="GdkRegion" c:type="GdkRegion*"/>
         </parameter>
         <parameter name="x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -8566,40 +8575,40 @@
     </function>
     <function name="region_offset" c:identifier="gdk_region_offset">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="region">
           <type name="GdkRegion" c:type="GdkRegion*"/>
         </parameter>
         <parameter name="dx">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="dy">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="region_shrink" c:identifier="gdk_region_shrink">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="region">
           <type name="GdkRegion" c:type="GdkRegion*"/>
         </parameter>
         <parameter name="dx">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="dy">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="region_union_with_rect"
               c:identifier="gdk_region_union_with_rect">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="region">
@@ -8612,7 +8621,7 @@
     </function>
     <function name="region_intersect" c:identifier="gdk_region_intersect">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="source1">
@@ -8625,7 +8634,7 @@
     </function>
     <function name="region_union" c:identifier="gdk_region_union">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="source1">
@@ -8638,7 +8647,7 @@
     </function>
     <function name="region_subtract" c:identifier="gdk_region_subtract">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="source1">
@@ -8651,7 +8660,7 @@
     </function>
     <function name="region_xor" c:identifier="gdk_region_xor">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="source1">
@@ -8665,7 +8674,7 @@
     <function name="region_spans_intersect_foreach"
               c:identifier="gdk_region_spans_intersect_foreach">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="region">
@@ -8675,16 +8684,16 @@
           <type name="GdkSpan" c:type="GdkSpan*"/>
         </parameter>
         <parameter name="n_spans">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="sorted">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="function">
           <type name="GdkSpanFunc" c:type="GdkSpanFunc"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
@@ -8712,7 +8721,7 @@
       <method name="set_default_colormap"
               c:identifier="gdk_screen_set_default_colormap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8789,7 +8798,7 @@
       </method>
       <method name="is_composited" c:identifier="gdk_screen_is_composited">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8819,7 +8828,7 @@
       </method>
       <method name="get_number" c:identifier="gdk_screen_get_number">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8829,7 +8838,7 @@
       </method>
       <method name="get_width" c:identifier="gdk_screen_get_width">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8839,7 +8848,7 @@
       </method>
       <method name="get_height" c:identifier="gdk_screen_get_height">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8849,7 +8858,7 @@
       </method>
       <method name="get_width_mm" c:identifier="gdk_screen_get_width_mm">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8859,7 +8868,7 @@
       </method>
       <method name="get_height_mm" c:identifier="gdk_screen_get_height_mm">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8891,7 +8900,7 @@
       <method name="make_display_name"
               c:identifier="gdk_screen_make_display_name">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8901,7 +8910,7 @@
       </method>
       <method name="get_n_monitors" c:identifier="gdk_screen_get_n_monitors">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8912,14 +8921,14 @@
       <method name="get_monitor_geometry"
               c:identifier="gdk_screen_get_monitor_geometry">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="screen">
             <type name="Screen" c:type="GdkScreen*"/>
           </parameter>
           <parameter name="monitor_num">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dest">
             <type name="GdkRectangle" c:type="GdkRectangle*"/>
@@ -8929,24 +8938,24 @@
       <method name="get_monitor_at_point"
               c:identifier="gdk_screen_get_monitor_at_point">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="screen">
             <type name="Screen" c:type="GdkScreen*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_monitor_at_window"
               c:identifier="gdk_screen_get_monitor_at_window">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8960,49 +8969,49 @@
       <method name="get_monitor_width_mm"
               c:identifier="gdk_screen_get_monitor_width_mm">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="screen">
             <type name="Screen" c:type="GdkScreen*"/>
           </parameter>
           <parameter name="monitor_num">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_monitor_height_mm"
               c:identifier="gdk_screen_get_monitor_height_mm">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="screen">
             <type name="Screen" c:type="GdkScreen*"/>
           </parameter>
           <parameter name="monitor_num">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_monitor_plug_name"
               c:identifier="gdk_screen_get_monitor_plug_name">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="screen">
             <type name="Screen" c:type="GdkScreen*"/>
           </parameter>
           <parameter name="monitor_num">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="broadcast_client_message"
               c:identifier="gdk_screen_broadcast_client_message">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -9015,14 +9024,14 @@
       </method>
       <method name="get_setting" c:identifier="gdk_screen_get_setting">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="screen">
             <type name="Screen" c:type="GdkScreen*"/>
           </parameter>
           <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="value">
             <type name="GValue" c:type="GValue*"/>
@@ -9032,7 +9041,7 @@
       <method name="set_font_options"
               c:identifier="gdk_screen_set_font_options">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -9056,20 +9065,20 @@
       </method>
       <method name="set_resolution" c:identifier="gdk_screen_set_resolution">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="screen">
             <type name="Screen" c:type="GdkScreen*"/>
           </parameter>
           <parameter name="dpi">
-            <type name="gdouble" c:type="gdouble"/>
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_resolution" c:identifier="gdk_screen_get_resolution">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -9100,14 +9109,14 @@
         </parameters>
       </method>
       <property name="font-options">
-        <type name="gpointer" c:type="gpointer"/>
+        <type name="any" c:type="gpointer"/>
       </property>
       <property name="resolution">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </property>
       <callback name="size_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -9117,7 +9126,7 @@
       </callback>
       <callback name="composited_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -9127,7 +9136,7 @@
       </callback>
       <callback name="monitors_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -9137,23 +9146,24 @@
       </callback>
       <glib:signal name="size-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="composited-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="monitors-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
     </class>
-    <function name="selection_owner_set" c:identifier="gdk_selection_owner_set">
+    <function name="selection_owner_set"
+              c:identifier="gdk_selection_owner_set">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="owner">
@@ -9163,14 +9173,15 @@
           <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
         <parameter name="send_event">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_owner_get" c:identifier="gdk_selection_owner_get">
+    <function name="selection_owner_get"
+              c:identifier="gdk_selection_owner_get">
       <return-value>
         <type name="GdkWindow*" c:type="GdkWindow*"/>
       </return-value>
@@ -9183,7 +9194,7 @@
     <function name="selection_owner_set_for_display"
               c:identifier="gdk_selection_owner_set_for_display">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -9196,10 +9207,10 @@
           <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
         <parameter name="send_event">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
@@ -9219,7 +9230,7 @@
     </function>
     <function name="selection_convert" c:identifier="gdk_selection_convert">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="requestor">
@@ -9232,14 +9243,14 @@
           <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
     <function name="selection_property_get"
               c:identifier="gdk_selection_property_get">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="requestor">
@@ -9259,11 +9270,11 @@
     <function name="selection_send_notify"
               c:identifier="gdk_selection_send_notify">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="requestor">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
         <parameter name="selection">
           <type name="GdkAtom" c:type="GdkAtom"/>
@@ -9275,21 +9286,21 @@
           <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
     <function name="selection_send_notify_for_display"
               c:identifier="gdk_selection_send_notify_for_display">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="display">
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="requestor">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
         <parameter name="selection">
           <type name="GdkAtom" c:type="GdkAtom"/>
@@ -9301,20 +9312,20 @@
           <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
     <function name="spawn_on_screen" c:identifier="gdk_spawn_on_screen">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="screen">
           <type name="Screen" c:type="GdkScreen*"/>
         </parameter>
         <parameter name="working_directory">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="argv">
           <type name="gchar" c:type="gchar**"/>
@@ -9329,7 +9340,7 @@
           <type name="GSpawnChildSetupFunc" c:type="GSpawnChildSetupFunc"/>
         </parameter>
         <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="child_pid">
           <type name="gint" c:type="gint*"/>
@@ -9342,14 +9353,14 @@
     <function name="spawn_on_screen_with_pipes"
               c:identifier="gdk_spawn_on_screen_with_pipes">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="screen">
           <type name="Screen" c:type="GdkScreen*"/>
         </parameter>
         <parameter name="working_directory">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="argv">
           <type name="gchar" c:type="gchar**"/>
@@ -9364,7 +9375,7 @@
           <type name="GSpawnChildSetupFunc" c:type="GSpawnChildSetupFunc"/>
         </parameter>
         <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="child_pid">
           <type name="gint" c:type="gint*"/>
@@ -9386,14 +9397,14 @@
     <function name="spawn_command_line_on_screen"
               c:identifier="gdk_spawn_command_line_on_screen">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="screen">
           <type name="Screen" c:type="GdkScreen*"/>
         </parameter>
         <parameter name="command_line">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
           <type name="GError" c:type="GError**"/>
@@ -9402,34 +9413,34 @@
     </function>
     <record name="GdkGeometry" c:type="GdkGeometry">
       <field name="min_width">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="min_height">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="max_width">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="max_height">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="base_width">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="base_height">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="width_inc">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="height_inc">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="min_aspect">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="max_aspect">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </field>
       <field name="win_gravity">
         <type name="GdkGravity" c:type="GdkGravity"/>
@@ -9437,22 +9448,22 @@
     </record>
     <record name="GdkWindowAttr" c:type="GdkWindowAttr">
       <field name="title">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="event_mask">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="x">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="y">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="width">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="height">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="wclass">
         <type name="GdkWindowClass" c:type="GdkWindowClass"/>
@@ -9470,13 +9481,13 @@
         <type name="GdkCursor*" c:type="GdkCursor*"/>
       </field>
       <field name="wmclass_name">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="wmclass_class">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="override_redirect">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </field>
       <field name="type_hint">
         <type name="GdkWindowTypeHint" c:type="GdkWindowTypeHint"/>
@@ -9531,16 +9542,16 @@
         <type name="GdkWindowObject*" c:type="GdkWindowObject*"/>
       </field>
       <field name="user_data">
-        <type name="gpointer" c:type="gpointer"/>
+        <type name="any" c:type="gpointer"/>
       </field>
       <field name="x">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="y">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="extension_events">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="filters">
         <type name="GList*" c:type="GList*"/>
@@ -9564,13 +9575,13 @@
         <type name="guint" c:type="guint"/>
       </field>
       <field name="window_type">
-        <type name="guint8" c:type="guint8"/>
+        <type name="uint8" c:type="guint8"/>
       </field>
       <field name="depth">
-        <type name="guint8" c:type="guint8"/>
+        <type name="uint8" c:type="guint8"/>
       </field>
       <field name="resize_count">
-        <type name="guint8" c:type="guint8"/>
+        <type name="uint8" c:type="guint8"/>
       </field>
       <field name="state">
         <type name="GdkWindowState" c:type="GdkWindowState"/>
@@ -9626,7 +9637,7 @@
             <type name="GdkWindowAttr" c:type="GdkWindowAttr*"/>
           </parameter>
           <parameter name="attributes_mask">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </constructor>
@@ -9635,10 +9646,10 @@
           <type name="Window" c:type="GdkWindow*"/>
         </return-value>
         <parameters>
-          <parameter name="win_x">
+          <parameter name="win_x" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
-          <parameter name="win_y">
+          <parameter name="win_y" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
@@ -9742,7 +9753,7 @@
       </constructor>
       <method name="destroy" c:identifier="gdk_window_destroy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -9762,7 +9773,7 @@
       </method>
       <method name="show" c:identifier="gdk_window_show">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -9772,7 +9783,7 @@
       </method>
       <method name="hide" c:identifier="gdk_window_hide">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -9782,7 +9793,7 @@
       </method>
       <method name="withdraw" c:identifier="gdk_window_withdraw">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -9792,7 +9803,7 @@
       </method>
       <method name="show_unraised" c:identifier="gdk_window_show_unraised">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -9802,61 +9813,61 @@
       </method>
       <method name="move" c:identifier="gdk_window_move">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="resize" c:identifier="gdk_window_resize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="move_resize" c:identifier="gdk_window_move_resize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="reparent" c:identifier="gdk_window_reparent">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -9866,16 +9877,16 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="clear" c:identifier="gdk_window_clear">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -9885,51 +9896,51 @@
       </method>
       <method name="clear_area" c:identifier="gdk_window_clear_area">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="clear_area_e" c:identifier="gdk_window_clear_area_e">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="raise" c:identifier="gdk_window_raise">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -9939,7 +9950,7 @@
       </method>
       <method name="lower" c:identifier="gdk_window_lower">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -9949,75 +9960,75 @@
       </method>
       <method name="focus" c:identifier="gdk_window_focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="timestamp">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_user_data" c:identifier="gdk_window_set_user_data">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_override_redirect"
               c:identifier="gdk_window_set_override_redirect">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="override_redirect">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_accept_focus"
               c:identifier="gdk_window_set_accept_focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="accept_focus">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_focus_on_map"
               c:identifier="gdk_window_set_focus_on_map">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="focus_on_map">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="add_filter" c:identifier="gdk_window_add_filter">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10027,13 +10038,13 @@
             <type name="GdkFilterFunc" c:type="GdkFilterFunc"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
       <method name="remove_filter" c:identifier="gdk_window_remove_filter">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10043,29 +10054,29 @@
             <type name="GdkFilterFunc" c:type="GdkFilterFunc"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
       <method name="scroll" c:identifier="gdk_window_scroll">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="dx">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dy">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="move_region" c:identifier="gdk_window_move_region">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10075,17 +10086,17 @@
             <type name="GdkRegion" c:type="GdkRegion*"/>
           </parameter>
           <parameter name="dx">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dy">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="shape_combine_mask"
               c:identifier="gdk_window_shape_combine_mask">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10095,17 +10106,17 @@
             <type name="GdkBitmap" c:type="GdkBitmap*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="shape_combine_region"
               c:identifier="gdk_window_shape_combine_region">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10115,17 +10126,17 @@
             <type name="GdkRegion" c:type="GdkRegion*"/>
           </parameter>
           <parameter name="offset_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="offset_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_child_shapes"
               c:identifier="gdk_window_set_child_shapes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10135,21 +10146,21 @@
       </method>
       <method name="set_composited" c:identifier="gdk_window_set_composited">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="composited">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="merge_child_shapes"
               c:identifier="gdk_window_merge_child_shapes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10160,7 +10171,7 @@
       <method name="input_shape_combine_mask"
               c:identifier="gdk_window_input_shape_combine_mask">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10170,17 +10181,17 @@
             <type name="GdkBitmap" c:type="GdkBitmap*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="input_shape_combine_region"
               c:identifier="gdk_window_input_shape_combine_region">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10190,17 +10201,17 @@
             <type name="GdkRegion" c:type="GdkRegion*"/>
           </parameter>
           <parameter name="offset_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="offset_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_child_input_shapes"
               c:identifier="gdk_window_set_child_input_shapes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10211,7 +10222,7 @@
       <method name="merge_child_input_shapes"
               c:identifier="gdk_window_merge_child_input_shapes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10221,7 +10232,7 @@
       </method>
       <method name="is_visible" c:identifier="gdk_window_is_visible">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10231,7 +10242,7 @@
       </method>
       <method name="is_viewable" c:identifier="gdk_window_is_viewable">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10252,51 +10263,51 @@
       <method name="set_static_gravities"
               c:identifier="gdk_window_set_static_gravities">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="use_static">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_hints" c:identifier="gdk_window_set_hints">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="min_width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="min_height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="max_width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="max_height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="flags">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_type_hint" c:identifier="gdk_window_set_type_hint">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10319,63 +10330,63 @@
       </method>
       <method name="set_modal_hint" c:identifier="gdk_window_set_modal_hint">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="modal">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_skip_taskbar_hint"
               c:identifier="gdk_window_set_skip_taskbar_hint">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="skips_taskbar">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_skip_pager_hint"
               c:identifier="gdk_window_set_skip_pager_hint">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="skips_pager">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_urgency_hint"
               c:identifier="gdk_window_set_urgency_hint">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="urgent">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_geometry_hints"
               c:identifier="gdk_window_set_geometry_hints">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10392,7 +10403,7 @@
       <method name="begin_paint_rect"
               c:identifier="gdk_window_begin_paint_rect">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10406,7 +10417,7 @@
       <method name="begin_paint_region"
               c:identifier="gdk_window_begin_paint_region">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10419,7 +10430,7 @@
       </method>
       <method name="end_paint" c:identifier="gdk_window_end_paint">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10429,47 +10440,47 @@
       </method>
       <method name="set_title" c:identifier="gdk_window_set_title">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="title">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_role" c:identifier="gdk_window_set_role">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="role">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_startup_id" c:identifier="gdk_window_set_startup_id">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="startup_id">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_transient_for"
               c:identifier="gdk_window_set_transient_for">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10482,7 +10493,7 @@
       </method>
       <method name="set_background" c:identifier="gdk_window_set_background">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10495,7 +10506,7 @@
       </method>
       <method name="set_back_pixmap" c:identifier="gdk_window_set_back_pixmap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10505,13 +10516,13 @@
             <type name="Pixmap" c:type="GdkPixmap*"/>
           </parameter>
           <parameter name="parent_relative">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_cursor" c:identifier="gdk_window_set_cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10524,7 +10535,7 @@
       </method>
       <method name="get_user_data" c:identifier="gdk_window_get_user_data">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10537,7 +10548,7 @@
       </method>
       <method name="get_geometry" c:identifier="gdk_window_get_geometry">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10562,7 +10573,7 @@
       </method>
       <method name="get_position" c:identifier="gdk_window_get_position">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10578,7 +10589,7 @@
       </method>
       <method name="get_origin" c:identifier="gdk_window_get_origin">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10595,7 +10606,7 @@
       <method name="get_deskrelative_origin"
               c:identifier="gdk_window_get_deskrelative_origin">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10611,7 +10622,7 @@
       </method>
       <method name="get_root_origin" c:identifier="gdk_window_get_root_origin">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10628,7 +10639,7 @@
       <method name="get_frame_extents"
               c:identifier="gdk_window_get_frame_extents">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10671,7 +10682,7 @@
       </method>
       <method name="set_events" c:identifier="gdk_window_set_events">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10684,7 +10695,7 @@
       </method>
       <method name="set_icon_list" c:identifier="gdk_window_set_icon_list">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10697,7 +10708,7 @@
       </method>
       <method name="set_icon" c:identifier="gdk_window_set_icon">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10716,20 +10727,20 @@
       </method>
       <method name="set_icon_name" c:identifier="gdk_window_set_icon_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_group" c:identifier="gdk_window_set_group">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10742,7 +10753,7 @@
       </method>
       <method name="set_decorations" c:identifier="gdk_window_set_decorations">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10755,7 +10766,7 @@
       </method>
       <method name="get_decorations" c:identifier="gdk_window_get_decorations">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10768,7 +10779,7 @@
       </method>
       <method name="set_functions" c:identifier="gdk_window_set_functions">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10781,7 +10792,7 @@
       </method>
       <method name="beep" c:identifier="gdk_window_beep">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10791,7 +10802,7 @@
       </method>
       <method name="iconify" c:identifier="gdk_window_iconify">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10801,7 +10812,7 @@
       </method>
       <method name="deiconify" c:identifier="gdk_window_deiconify">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10811,7 +10822,7 @@
       </method>
       <method name="stick" c:identifier="gdk_window_stick">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10821,7 +10832,7 @@
       </method>
       <method name="unstick" c:identifier="gdk_window_unstick">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10831,7 +10842,7 @@
       </method>
       <method name="maximize" c:identifier="gdk_window_maximize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10841,7 +10852,7 @@
       </method>
       <method name="unmaximize" c:identifier="gdk_window_unmaximize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10851,7 +10862,7 @@
       </method>
       <method name="fullscreen" c:identifier="gdk_window_fullscreen">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10861,7 +10872,7 @@
       </method>
       <method name="unfullscreen" c:identifier="gdk_window_unfullscreen">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10871,46 +10882,46 @@
       </method>
       <method name="set_keep_above" c:identifier="gdk_window_set_keep_above">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_keep_below" c:identifier="gdk_window_set_keep_below">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_opacity" c:identifier="gdk_window_set_opacity">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="opacity">
-            <type name="gdouble" c:type="gdouble"/>
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
       <method name="register_dnd" c:identifier="gdk_window_register_dnd">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10921,7 +10932,7 @@
       <method name="begin_resize_drag"
               c:identifier="gdk_window_begin_resize_drag">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10931,44 +10942,44 @@
             <type name="WindowEdge" c:type="GdkWindowEdge"/>
           </parameter>
           <parameter name="button">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="root_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="root_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="timestamp">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
       <method name="begin_move_drag" c:identifier="gdk_window_begin_move_drag">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="button">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="root_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="root_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="timestamp">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
       <method name="invalidate_rect" c:identifier="gdk_window_invalidate_rect">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10978,14 +10989,14 @@
             <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="invalidate_children">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="invalidate_region"
               c:identifier="gdk_window_invalidate_region">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10995,14 +11006,14 @@
             <type name="GdkRegion" c:type="GdkRegion*"/>
           </parameter>
           <parameter name="invalidate_children">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="invalidate_maybe_recurse"
               c:identifier="gdk_window_invalidate_maybe_recurse">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -11015,7 +11026,7 @@
             <type name="???" c:type="???*"/>
           </parameter>
           <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
@@ -11031,7 +11042,7 @@
       </method>
       <method name="freeze_updates" c:identifier="gdk_window_freeze_updates">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -11041,7 +11052,7 @@
       </method>
       <method name="thaw_updates" c:identifier="gdk_window_thaw_updates">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -11052,7 +11063,7 @@
       <method name="freeze_toplevel_updates_libgtk_only"
               c:identifier="gdk_window_freeze_toplevel_updates_libgtk_only">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -11063,7 +11074,7 @@
       <method name="thaw_toplevel_updates_libgtk_only"
               c:identifier="gdk_window_thaw_toplevel_updates_libgtk_only">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -11073,21 +11084,21 @@
       </method>
       <method name="process_updates" c:identifier="gdk_window_process_updates">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="update_children">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_internal_paint_info"
               c:identifier="gdk_window_get_internal_paint_info">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -11107,7 +11118,7 @@
       <method name="enable_synchronized_configure"
               c:identifier="gdk_window_enable_synchronized_configure">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -11118,7 +11129,7 @@
       <method name="configure_finished"
               c:identifier="gdk_window_configure_finished">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -11129,7 +11140,7 @@
       <method name="redirect_to_drawable"
               c:identifier="gdk_window_redirect_to_drawable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -11139,29 +11150,29 @@
             <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="src_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="src_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dest_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dest_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="remove_redirection"
               c:identifier="gdk_window_remove_redirection">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -11171,7 +11182,7 @@
       </method>
       <method name="destroy_notify" c:identifier="gdk_window_destroy_notify">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -11182,11 +11193,11 @@
     </class>
     <function name="set_sm_client_id" c:identifier="gdk_set_sm_client_id">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="sm_client_id">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -11199,24 +11210,24 @@
     <function name="window_process_all_updates"
               c:identifier="gdk_window_process_all_updates">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="window_set_debug_updates"
               c:identifier="gdk_window_set_debug_updates">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="setting">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="window_constrain_size"
               c:identifier="gdk_window_constrain_size">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="geometry">
@@ -11226,10 +11237,10 @@
           <type name="guint" c:type="guint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="new_width">
           <type name="gint" c:type="gint*"/>
@@ -11257,7 +11268,7 @@
     </function>
     <function name="test_render_sync" c:identifier="gdk_test_render_sync">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="window">
@@ -11267,17 +11278,17 @@
     </function>
     <function name="test_simulate_key" c:identifier="gdk_test_simulate_key">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="window">
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="keyval">
           <type name="guint" c:type="guint"/>
@@ -11293,17 +11304,17 @@
     <function name="test_simulate_button"
               c:identifier="gdk_test_simulate_button">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="window">
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="button">
           <type name="guint" c:type="guint"/>
@@ -11338,7 +11349,7 @@
         </return-value>
         <parameters>
           <parameter name="depth">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </constructor>
@@ -11360,7 +11371,7 @@
         </return-value>
         <parameters>
           <parameter name="depth">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="visual_type">
             <type name="VisualType" c:type="GdkVisualType"/>
@@ -11381,7 +11392,7 @@
     <function name="visual_get_best_depth"
               c:identifier="gdk_visual_get_best_depth">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
     </function>
     <function name="visual_get_best_type"
@@ -11392,20 +11403,20 @@
     </function>
     <function name="query_depths" c:identifier="gdk_query_depths">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="depths">
+        <parameter name="depths" direction="out">
           <type name="gint" c:type="gint**"/>
         </parameter>
-        <parameter name="count">
+        <parameter name="count" direction="out">
           <type name="gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
     <function name="query_visual_types" c:identifier="gdk_query_visual_types">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="visual_types">
@@ -11423,7 +11434,7 @@
     </function>
     <function name="parse_args" c:identifier="gdk_parse_args">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="argc">
@@ -11436,7 +11447,7 @@
     </function>
     <function name="init" c:identifier="gdk_init">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="argc">
@@ -11449,7 +11460,7 @@
     </function>
     <function name="init_check" c:identifier="gdk_init_check">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="argc">
@@ -11463,7 +11474,7 @@
     <function name="add_option_entries_libgtk_only"
               c:identifier="gdk_add_option_entries_libgtk_only">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="group">
@@ -11474,82 +11485,82 @@
     <function name="pre_parse_libgtk_only"
               c:identifier="gdk_pre_parse_libgtk_only">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="exit" c:identifier="gdk_exit">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="error_code">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="set_locale" c:identifier="gdk_set_locale">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
     <function name="get_program_class" c:identifier="gdk_get_program_class">
       <return-value>
-        <type name="char*" c:type="char*"/>
+        <type name="string" c:type="char*"/>
       </return-value>
     </function>
     <function name="set_program_class" c:identifier="gdk_set_program_class">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="program_class">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
     <function name="error_trap_push" c:identifier="gdk_error_trap_push">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="error_trap_pop" c:identifier="gdk_error_trap_pop">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
     </function>
     <function name="set_use_xshm" c:identifier="gdk_set_use_xshm">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="use_xshm">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="get_use_xshm" c:identifier="gdk_get_use_xshm">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
     </function>
     <function name="get_display" c:identifier="gdk_get_display">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
     <function name="get_display_arg_name"
               c:identifier="gdk_get_display_arg_name">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
     <function name="input_add_full" c:identifier="gdk_input_add_full">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="condition">
           <type name="InputCondition" c:type="GdkInputCondition"/>
@@ -11558,20 +11569,20 @@
           <type name="GdkInputFunction" c:type="GdkInputFunction"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy">
-          <type name="GdkDestroyNotify" c:type="GdkDestroyNotify"/>
+          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
     <function name="input_add" c:identifier="gdk_input_add">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="condition">
           <type name="InputCondition" c:type="GdkInputCondition"/>
@@ -11580,17 +11591,17 @@
           <type name="GdkInputFunction" c:type="GdkInputFunction"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
     <function name="input_remove" c:identifier="gdk_input_remove">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="tag">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -11603,7 +11614,7 @@
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="owner_events">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="event_mask">
           <type name="EventMask" c:type="GdkEventMask"/>
@@ -11615,7 +11626,7 @@
           <type name="Cursor" c:type="GdkCursor*"/>
         </parameter>
         <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
@@ -11628,17 +11639,17 @@
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="owner_events">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
     <function name="pointer_grab_info_libgtk_only"
               c:identifier="gdk_pointer_grab_info_libgtk_only">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -11655,7 +11666,7 @@
     <function name="keyboard_grab_info_libgtk_only"
               c:identifier="gdk_keyboard_grab_info_libgtk_only">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -11671,63 +11682,63 @@
     </function>
     <function name="pointer_ungrab" c:identifier="gdk_pointer_ungrab">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
     <function name="keyboard_ungrab" c:identifier="gdk_keyboard_ungrab">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
     <function name="pointer_is_grabbed" c:identifier="gdk_pointer_is_grabbed">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
     </function>
     <function name="screen_width" c:identifier="gdk_screen_width">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
     </function>
     <function name="screen_height" c:identifier="gdk_screen_height">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
     </function>
     <function name="screen_width_mm" c:identifier="gdk_screen_width_mm">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
     </function>
     <function name="screen_height_mm" c:identifier="gdk_screen_height_mm">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
     </function>
     <function name="beep" c:identifier="gdk_beep">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="flush" c:identifier="gdk_flush">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="set_double_click_time"
               c:identifier="gdk_set_double_click_time">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="msec">
@@ -11735,9 +11746,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="rectangle_intersect" c:identifier="gdk_rectangle_intersect">
+    <function name="rectangle_intersect"
+              c:identifier="gdk_rectangle_intersect">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="src1">
@@ -11753,7 +11765,7 @@
     </function>
     <function name="rectangle_union" c:identifier="gdk_rectangle_union">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="src1">
@@ -11774,7 +11786,7 @@
     </glib:boxed>
     <function name="wcstombs" c:identifier="gdk_wcstombs">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="src">
@@ -11784,24 +11796,24 @@
     </function>
     <function name="mbstowcs" c:identifier="gdk_mbstowcs">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="dest">
           <type name="GdkWChar" c:type="GdkWChar*"/>
         </parameter>
         <parameter name="src">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="dest_max">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="event_send_client_message_for_display"
               c:identifier="gdk_event_send_client_message_for_display">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -11818,39 +11830,39 @@
     <function name="notify_startup_complete"
               c:identifier="gdk_notify_startup_complete">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="notify_startup_complete_with_id"
               c:identifier="gdk_notify_startup_complete_with_id">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="startup_id">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="threads_enter" c:identifier="gdk_threads_enter">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="threads_leave" c:identifier="gdk_threads_leave">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="threads_init" c:identifier="gdk_threads_init">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="threads_set_lock_functions"
               c:identifier="gdk_threads_set_lock_functions">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="enter_fn">
@@ -11868,13 +11880,13 @@
       </return-value>
       <parameters>
         <parameter name="priority">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="function">
           <type name="GSourceFunc" c:type="GSourceFunc"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="notify">
           <type name="GDestroyNotify" c:type="GDestroyNotify"/>
@@ -11890,7 +11902,7 @@
           <type name="GSourceFunc" c:type="GSourceFunc"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
@@ -11901,7 +11913,7 @@
       </return-value>
       <parameters>
         <parameter name="priority">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="interval">
           <type name="guint" c:type="guint"/>
@@ -11910,14 +11922,15 @@
           <type name="GSourceFunc" c:type="GSourceFunc"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="notify">
           <type name="GDestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
-    <function name="threads_add_timeout" c:identifier="gdk_threads_add_timeout">
+    <function name="threads_add_timeout"
+              c:identifier="gdk_threads_add_timeout">
       <return-value>
         <type name="guint" c:type="guint"/>
       </return-value>
@@ -11929,14 +11942,14 @@
           <type name="GSourceFunc" c:type="GSourceFunc"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
     <function name="synthesize_window_state"
               c:identifier="gdk_synthesize_window_state">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="window">
@@ -12060,7 +12073,8 @@
         </parameter>
       </parameters>
     </function>
-    <function name="x11_gc_get_xdisplay" c:identifier="gdk_x11_gc_get_xdisplay">
+    <function name="x11_gc_get_xdisplay"
+              c:identifier="gdk_x11_gc_get_xdisplay">
       <return-value>
         <type name="Display*" c:type="Display*"/>
       </return-value>
@@ -12094,7 +12108,7 @@
     <function name="x11_screen_get_screen_number"
               c:identifier="gdk_x11_screen_get_screen_number">
       <return-value>
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="screen">
@@ -12105,21 +12119,21 @@
     <function name="x11_window_set_user_time"
               c:identifier="gdk_x11_window_set_user_time">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="window">
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="timestamp">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
     <function name="x11_window_move_to_current_desktop"
               c:identifier="gdk_x11_window_move_to_current_desktop">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="window">
@@ -12130,7 +12144,7 @@
     <function name="x11_screen_get_window_manager_name"
               c:identifier="gdk_x11_screen_get_window_manager_name">
       <return-value>
-        <type name="char*" c:type="char*"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
         <parameter name="screen">
@@ -12153,7 +12167,7 @@
     <function name="x11_get_default_screen"
               c:identifier="gdk_x11_get_default_screen">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
     </function>
     <function name="x11_screen_lookup_visual"
@@ -12197,7 +12211,7 @@
     <function name="xid_table_lookup_for_display"
               c:identifier="gdk_xid_table_lookup_for_display">
       <return-value>
-        <type name="gpointer" c:type="gpointer"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -12208,9 +12222,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="x11_get_server_time" c:identifier="gdk_x11_get_server_time">
+    <function name="x11_get_server_time"
+              c:identifier="gdk_x11_get_server_time">
       <return-value>
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </return-value>
       <parameters>
         <parameter name="window">
@@ -12221,7 +12236,7 @@
     <function name="x11_display_get_user_time"
               c:identifier="gdk_x11_display_get_user_time">
       <return-value>
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -12232,7 +12247,7 @@
     <function name="x11_display_get_startup_notification_id"
               c:identifier="gdk_x11_display_get_startup_notification_id">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -12243,38 +12258,38 @@
     <function name="x11_display_set_cursor_theme"
               c:identifier="gdk_x11_display_set_cursor_theme">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="display">
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="theme">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="size">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="x11_display_broadcast_startup_message"
               c:identifier="gdk_x11_display_broadcast_startup_message">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="display">
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="message_type">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
     <function name="x11_screen_supports_net_wm_hint"
               c:identifier="gdk_x11_screen_supports_net_wm_hint">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="screen">
@@ -12295,13 +12310,13 @@
           <type name="Screen" c:type="GdkScreen*"/>
         </parameter>
         <parameter name="monitor_num">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="xid_table_lookup" c:identifier="gdk_xid_table_lookup">
       <return-value>
-        <type name="gpointer" c:type="gpointer"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
         <parameter name="xid">
@@ -12311,7 +12326,7 @@
     </function>
     <function name="net_wm_supports" c:identifier="gdk_net_wm_supports">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="property">
@@ -12321,15 +12336,16 @@
     </function>
     <function name="x11_grab_server" c:identifier="gdk_x11_grab_server">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="x11_ungrab_server" c:identifier="gdk_x11_ungrab_server">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
-    <function name="x11_lookup_xdisplay" c:identifier="gdk_x11_lookup_xdisplay">
+    <function name="x11_lookup_xdisplay"
+              c:identifier="gdk_x11_lookup_xdisplay">
       <return-value>
         <type name="GdkDisplay*" c:type="GdkDisplay*"/>
       </return-value>
@@ -12377,14 +12393,14 @@
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="atom_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="x11_get_xatom_name_for_display"
               c:identifier="gdk_x11_get_xatom_name_for_display">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -12422,13 +12438,13 @@
       </return-value>
       <parameters>
         <parameter name="atom_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="x11_get_xatom_name" c:identifier="gdk_x11_get_xatom_name">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="xatom">
@@ -12438,7 +12454,7 @@
     </function>
     <function name="x11_display_grab" c:identifier="gdk_x11_display_grab">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -12448,7 +12464,7 @@
     </function>
     <function name="x11_display_ungrab" c:identifier="gdk_x11_display_ungrab">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -12459,23 +12475,23 @@
     <function name="x11_register_standard_event_type"
               c:identifier="gdk_x11_register_standard_event_type">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="display">
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="event_base">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="n_events">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="x11_font_get_xfont" c:identifier="gdk_x11_font_get_xfont">
       <return-value>
-        <type name="gpointer" c:type="gpointer"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
         <parameter name="font">
@@ -12496,7 +12512,7 @@
     </function>
     <function name="x11_font_get_name" c:identifier="gdk_x11_font_get_name">
       <return-value>
-        <type name="char*" c:type="char*"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
         <parameter name="font">
diff --git a/gir-repository/gir/gtk-x11-2.0.gir b/gir-repository/gir/gtk-x11-2.0.gir
index e5bdd22..f18a451 100644
--- a/gir-repository/gir/gtk-x11-2.0.gir
+++ b/gir-repository/gir/gtk-x11-2.0.gir
@@ -8,41 +8,41 @@
                  glib:type-name="GtkAnchorType"
                  glib:get-type="gtk_anchor_type_get_type">
       <member name="center"
-                value="0"
-                c:identifier="GTK_ANCHOR_CENTER"
-                glib:nick="center"/>
+              value="0"
+              c:identifier="GTK_ANCHOR_CENTER"
+              glib:nick="center"/>
       <member name="north"
-                value="1"
-                c:identifier="GTK_ANCHOR_NORTH"
-                glib:nick="north"/>
+              value="1"
+              c:identifier="GTK_ANCHOR_NORTH"
+              glib:nick="north"/>
       <member name="north-west"
-                value="2"
-                c:identifier="GTK_ANCHOR_NORTH_WEST"
-                glib:nick="north-west"/>
+              value="2"
+              c:identifier="GTK_ANCHOR_NORTH_WEST"
+              glib:nick="north-west"/>
       <member name="north-east"
-                value="3"
-                c:identifier="GTK_ANCHOR_NORTH_EAST"
-                glib:nick="north-east"/>
+              value="3"
+              c:identifier="GTK_ANCHOR_NORTH_EAST"
+              glib:nick="north-east"/>
       <member name="south"
-                value="4"
-                c:identifier="GTK_ANCHOR_SOUTH"
-                glib:nick="south"/>
+              value="4"
+              c:identifier="GTK_ANCHOR_SOUTH"
+              glib:nick="south"/>
       <member name="south-west"
-                value="5"
-                c:identifier="GTK_ANCHOR_SOUTH_WEST"
-                glib:nick="south-west"/>
+              value="5"
+              c:identifier="GTK_ANCHOR_SOUTH_WEST"
+              glib:nick="south-west"/>
       <member name="south-east"
-                value="6"
-                c:identifier="GTK_ANCHOR_SOUTH_EAST"
-                glib:nick="south-east"/>
+              value="6"
+              c:identifier="GTK_ANCHOR_SOUTH_EAST"
+              glib:nick="south-east"/>
       <member name="west"
-                value="7"
-                c:identifier="GTK_ANCHOR_WEST"
-                glib:nick="west"/>
+              value="7"
+              c:identifier="GTK_ANCHOR_WEST"
+              glib:nick="west"/>
       <member name="east"
-                value="8"
-                c:identifier="GTK_ANCHOR_EAST"
-                glib:nick="east"/>
+              value="8"
+              c:identifier="GTK_ANCHOR_EAST"
+              glib:nick="east"/>
       <member name="n" value="1" c:identifier="GTK_ANCHOR_N" glib:nick="n"/>
       <member name="nw" value="2" c:identifier="GTK_ANCHOR_NW" glib:nick="nw"/>
       <member name="ne" value="3" c:identifier="GTK_ANCHOR_NE" glib:nick="ne"/>
@@ -58,34 +58,34 @@
                  glib:get-type="gtk_arrow_type_get_type">
       <member name="up" value="0" c:identifier="GTK_ARROW_UP" glib:nick="up"/>
       <member name="down"
-                value="1"
-                c:identifier="GTK_ARROW_DOWN"
-                glib:nick="down"/>
+              value="1"
+              c:identifier="GTK_ARROW_DOWN"
+              glib:nick="down"/>
       <member name="left"
-                value="2"
-                c:identifier="GTK_ARROW_LEFT"
-                glib:nick="left"/>
+              value="2"
+              c:identifier="GTK_ARROW_LEFT"
+              glib:nick="left"/>
       <member name="right"
-                value="3"
-                c:identifier="GTK_ARROW_RIGHT"
-                glib:nick="right"/>
+              value="3"
+              c:identifier="GTK_ARROW_RIGHT"
+              glib:nick="right"/>
       <member name="none"
-                value="4"
-                c:identifier="GTK_ARROW_NONE"
-                glib:nick="none"/>
+              value="4"
+              c:identifier="GTK_ARROW_NONE"
+              glib:nick="none"/>
     </enumeration>
     <bitfield name="AttachOptions"
               c:type="GtkAttachOptions"
               glib:type-name="GtkAttachOptions"
               glib:get-type="gtk_attach_options_get_type">
       <member name="expand"
-                value="1"
-                c:identifier="GTK_EXPAND"
-                glib:nick="expand"/>
+              value="1"
+              c:identifier="GTK_EXPAND"
+              glib:nick="expand"/>
       <member name="shrink"
-                value="2"
-                c:identifier="GTK_SHRINK"
-                glib:nick="shrink"/>
+              value="2"
+              c:identifier="GTK_SHRINK"
+              glib:nick="shrink"/>
       <member name="fill" value="4" c:identifier="GTK_FILL" glib:nick="fill"/>
     </bitfield>
     <enumeration name="ButtonBoxStyle"
@@ -93,1043 +93,1043 @@
                  glib:type-name="GtkButtonBoxStyle"
                  glib:get-type="gtk_button_box_style_get_type">
       <member name="default-style"
-                value="0"
-                c:identifier="GTK_BUTTONBOX_DEFAULT_STYLE"
-                glib:nick="default-style"/>
+              value="0"
+              c:identifier="GTK_BUTTONBOX_DEFAULT_STYLE"
+              glib:nick="default-style"/>
       <member name="spread"
-                value="1"
-                c:identifier="GTK_BUTTONBOX_SPREAD"
-                glib:nick="spread"/>
+              value="1"
+              c:identifier="GTK_BUTTONBOX_SPREAD"
+              glib:nick="spread"/>
       <member name="edge"
-                value="2"
-                c:identifier="GTK_BUTTONBOX_EDGE"
-                glib:nick="edge"/>
+              value="2"
+              c:identifier="GTK_BUTTONBOX_EDGE"
+              glib:nick="edge"/>
       <member name="start"
-                value="3"
-                c:identifier="GTK_BUTTONBOX_START"
-                glib:nick="start"/>
+              value="3"
+              c:identifier="GTK_BUTTONBOX_START"
+              glib:nick="start"/>
       <member name="end"
-                value="4"
-                c:identifier="GTK_BUTTONBOX_END"
-                glib:nick="end"/>
+              value="4"
+              c:identifier="GTK_BUTTONBOX_END"
+              glib:nick="end"/>
       <member name="center"
-                value="5"
-                c:identifier="GTK_BUTTONBOX_CENTER"
-                glib:nick="center"/>
+              value="5"
+              c:identifier="GTK_BUTTONBOX_CENTER"
+              glib:nick="center"/>
     </enumeration>
     <enumeration name="CurveType"
                  c:type="GtkCurveType"
                  glib:type-name="GtkCurveType"
                  glib:get-type="gtk_curve_type_get_type">
       <member name="linear"
-                value="0"
-                c:identifier="GTK_CURVE_TYPE_LINEAR"
-                glib:nick="linear"/>
+              value="0"
+              c:identifier="GTK_CURVE_TYPE_LINEAR"
+              glib:nick="linear"/>
       <member name="spline"
-                value="1"
-                c:identifier="GTK_CURVE_TYPE_SPLINE"
-                glib:nick="spline"/>
+              value="1"
+              c:identifier="GTK_CURVE_TYPE_SPLINE"
+              glib:nick="spline"/>
       <member name="free"
-                value="2"
-                c:identifier="GTK_CURVE_TYPE_FREE"
-                glib:nick="free"/>
+              value="2"
+              c:identifier="GTK_CURVE_TYPE_FREE"
+              glib:nick="free"/>
     </enumeration>
     <enumeration name="DeleteType"
                  c:type="GtkDeleteType"
                  glib:type-name="GtkDeleteType"
                  glib:get-type="gtk_delete_type_get_type">
       <member name="chars"
-                value="0"
-                c:identifier="GTK_DELETE_CHARS"
-                glib:nick="chars"/>
+              value="0"
+              c:identifier="GTK_DELETE_CHARS"
+              glib:nick="chars"/>
       <member name="word-ends"
-                value="1"
-                c:identifier="GTK_DELETE_WORD_ENDS"
-                glib:nick="word-ends"/>
+              value="1"
+              c:identifier="GTK_DELETE_WORD_ENDS"
+              glib:nick="word-ends"/>
       <member name="words"
-                value="2"
-                c:identifier="GTK_DELETE_WORDS"
-                glib:nick="words"/>
+              value="2"
+              c:identifier="GTK_DELETE_WORDS"
+              glib:nick="words"/>
       <member name="display-lines"
-                value="3"
-                c:identifier="GTK_DELETE_DISPLAY_LINES"
-                glib:nick="display-lines"/>
+              value="3"
+              c:identifier="GTK_DELETE_DISPLAY_LINES"
+              glib:nick="display-lines"/>
       <member name="display-line-ends"
-                value="4"
-                c:identifier="GTK_DELETE_DISPLAY_LINE_ENDS"
-                glib:nick="display-line-ends"/>
+              value="4"
+              c:identifier="GTK_DELETE_DISPLAY_LINE_ENDS"
+              glib:nick="display-line-ends"/>
       <member name="paragraph-ends"
-                value="5"
-                c:identifier="GTK_DELETE_PARAGRAPH_ENDS"
-                glib:nick="paragraph-ends"/>
+              value="5"
+              c:identifier="GTK_DELETE_PARAGRAPH_ENDS"
+              glib:nick="paragraph-ends"/>
       <member name="paragraphs"
-                value="6"
-                c:identifier="GTK_DELETE_PARAGRAPHS"
-                glib:nick="paragraphs"/>
+              value="6"
+              c:identifier="GTK_DELETE_PARAGRAPHS"
+              glib:nick="paragraphs"/>
       <member name="whitespace"
-                value="7"
-                c:identifier="GTK_DELETE_WHITESPACE"
-                glib:nick="whitespace"/>
+              value="7"
+              c:identifier="GTK_DELETE_WHITESPACE"
+              glib:nick="whitespace"/>
     </enumeration>
     <enumeration name="DirectionType"
                  c:type="GtkDirectionType"
                  glib:type-name="GtkDirectionType"
                  glib:get-type="gtk_direction_type_get_type">
       <member name="tab-forward"
-                value="0"
-                c:identifier="GTK_DIR_TAB_FORWARD"
-                glib:nick="tab-forward"/>
+              value="0"
+              c:identifier="GTK_DIR_TAB_FORWARD"
+              glib:nick="tab-forward"/>
       <member name="tab-backward"
-                value="1"
-                c:identifier="GTK_DIR_TAB_BACKWARD"
-                glib:nick="tab-backward"/>
+              value="1"
+              c:identifier="GTK_DIR_TAB_BACKWARD"
+              glib:nick="tab-backward"/>
       <member name="up" value="2" c:identifier="GTK_DIR_UP" glib:nick="up"/>
       <member name="down"
-                value="3"
-                c:identifier="GTK_DIR_DOWN"
-                glib:nick="down"/>
+              value="3"
+              c:identifier="GTK_DIR_DOWN"
+              glib:nick="down"/>
       <member name="left"
-                value="4"
-                c:identifier="GTK_DIR_LEFT"
-                glib:nick="left"/>
+              value="4"
+              c:identifier="GTK_DIR_LEFT"
+              glib:nick="left"/>
       <member name="right"
-                value="5"
-                c:identifier="GTK_DIR_RIGHT"
-                glib:nick="right"/>
+              value="5"
+              c:identifier="GTK_DIR_RIGHT"
+              glib:nick="right"/>
     </enumeration>
     <enumeration name="ExpanderStyle"
                  c:type="GtkExpanderStyle"
                  glib:type-name="GtkExpanderStyle"
                  glib:get-type="gtk_expander_style_get_type">
       <member name="collapsed"
-                value="0"
-                c:identifier="GTK_EXPANDER_COLLAPSED"
-                glib:nick="collapsed"/>
+              value="0"
+              c:identifier="GTK_EXPANDER_COLLAPSED"
+              glib:nick="collapsed"/>
       <member name="semi-collapsed"
-                value="1"
-                c:identifier="GTK_EXPANDER_SEMI_COLLAPSED"
-                glib:nick="semi-collapsed"/>
+              value="1"
+              c:identifier="GTK_EXPANDER_SEMI_COLLAPSED"
+              glib:nick="semi-collapsed"/>
       <member name="semi-expanded"
-                value="2"
-                c:identifier="GTK_EXPANDER_SEMI_EXPANDED"
-                glib:nick="semi-expanded"/>
+              value="2"
+              c:identifier="GTK_EXPANDER_SEMI_EXPANDED"
+              glib:nick="semi-expanded"/>
       <member name="expanded"
-                value="3"
-                c:identifier="GTK_EXPANDER_EXPANDED"
-                glib:nick="expanded"/>
+              value="3"
+              c:identifier="GTK_EXPANDER_EXPANDED"
+              glib:nick="expanded"/>
     </enumeration>
     <enumeration name="IconSize"
                  c:type="GtkIconSize"
                  glib:type-name="GtkIconSize"
                  glib:get-type="gtk_icon_size_get_type">
       <member name="invalid"
-                value="0"
-                c:identifier="GTK_ICON_SIZE_INVALID"
-                glib:nick="invalid"/>
+              value="0"
+              c:identifier="GTK_ICON_SIZE_INVALID"
+              glib:nick="invalid"/>
       <member name="menu"
-                value="1"
-                c:identifier="GTK_ICON_SIZE_MENU"
-                glib:nick="menu"/>
+              value="1"
+              c:identifier="GTK_ICON_SIZE_MENU"
+              glib:nick="menu"/>
       <member name="small-toolbar"
-                value="2"
-                c:identifier="GTK_ICON_SIZE_SMALL_TOOLBAR"
-                glib:nick="small-toolbar"/>
+              value="2"
+              c:identifier="GTK_ICON_SIZE_SMALL_TOOLBAR"
+              glib:nick="small-toolbar"/>
       <member name="large-toolbar"
-                value="3"
-                c:identifier="GTK_ICON_SIZE_LARGE_TOOLBAR"
-                glib:nick="large-toolbar"/>
+              value="3"
+              c:identifier="GTK_ICON_SIZE_LARGE_TOOLBAR"
+              glib:nick="large-toolbar"/>
       <member name="button"
-                value="4"
-                c:identifier="GTK_ICON_SIZE_BUTTON"
-                glib:nick="button"/>
+              value="4"
+              c:identifier="GTK_ICON_SIZE_BUTTON"
+              glib:nick="button"/>
       <member name="dnd"
-                value="5"
-                c:identifier="GTK_ICON_SIZE_DND"
-                glib:nick="dnd"/>
+              value="5"
+              c:identifier="GTK_ICON_SIZE_DND"
+              glib:nick="dnd"/>
       <member name="dialog"
-                value="6"
-                c:identifier="GTK_ICON_SIZE_DIALOG"
-                glib:nick="dialog"/>
+              value="6"
+              c:identifier="GTK_ICON_SIZE_DIALOG"
+              glib:nick="dialog"/>
     </enumeration>
     <enumeration name="SensitivityType"
                  c:type="GtkSensitivityType"
                  glib:type-name="GtkSensitivityType"
                  glib:get-type="gtk_sensitivity_type_get_type">
       <member name="auto"
-                value="0"
-                c:identifier="GTK_SENSITIVITY_AUTO"
-                glib:nick="auto"/>
+              value="0"
+              c:identifier="GTK_SENSITIVITY_AUTO"
+              glib:nick="auto"/>
       <member name="on"
-                value="1"
-                c:identifier="GTK_SENSITIVITY_ON"
-                glib:nick="on"/>
+              value="1"
+              c:identifier="GTK_SENSITIVITY_ON"
+              glib:nick="on"/>
       <member name="off"
-                value="2"
-                c:identifier="GTK_SENSITIVITY_OFF"
-                glib:nick="off"/>
+              value="2"
+              c:identifier="GTK_SENSITIVITY_OFF"
+              glib:nick="off"/>
     </enumeration>
     <enumeration name="SideType"
                  c:type="GtkSideType"
                  glib:type-name="GtkSideType"
                  glib:get-type="gtk_side_type_get_type">
       <member name="top"
-                value="0"
-                c:identifier="GTK_SIDE_TOP"
-                glib:nick="top"/>
+              value="0"
+              c:identifier="GTK_SIDE_TOP"
+              glib:nick="top"/>
       <member name="bottom"
-                value="1"
-                c:identifier="GTK_SIDE_BOTTOM"
-                glib:nick="bottom"/>
+              value="1"
+              c:identifier="GTK_SIDE_BOTTOM"
+              glib:nick="bottom"/>
       <member name="left"
-                value="2"
-                c:identifier="GTK_SIDE_LEFT"
-                glib:nick="left"/>
+              value="2"
+              c:identifier="GTK_SIDE_LEFT"
+              glib:nick="left"/>
       <member name="right"
-                value="3"
-                c:identifier="GTK_SIDE_RIGHT"
-                glib:nick="right"/>
+              value="3"
+              c:identifier="GTK_SIDE_RIGHT"
+              glib:nick="right"/>
     </enumeration>
     <enumeration name="TextDirection"
                  c:type="GtkTextDirection"
                  glib:type-name="GtkTextDirection"
                  glib:get-type="gtk_text_direction_get_type">
       <member name="none"
-                value="0"
-                c:identifier="GTK_TEXT_DIR_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="GTK_TEXT_DIR_NONE"
+              glib:nick="none"/>
       <member name="ltr"
-                value="1"
-                c:identifier="GTK_TEXT_DIR_LTR"
-                glib:nick="ltr"/>
+              value="1"
+              c:identifier="GTK_TEXT_DIR_LTR"
+              glib:nick="ltr"/>
       <member name="rtl"
-                value="2"
-                c:identifier="GTK_TEXT_DIR_RTL"
-                glib:nick="rtl"/>
+              value="2"
+              c:identifier="GTK_TEXT_DIR_RTL"
+              glib:nick="rtl"/>
     </enumeration>
     <enumeration name="Justification"
                  c:type="GtkJustification"
                  glib:type-name="GtkJustification"
                  glib:get-type="gtk_justification_get_type">
       <member name="left"
-                value="0"
-                c:identifier="GTK_JUSTIFY_LEFT"
-                glib:nick="left"/>
+              value="0"
+              c:identifier="GTK_JUSTIFY_LEFT"
+              glib:nick="left"/>
       <member name="right"
-                value="1"
-                c:identifier="GTK_JUSTIFY_RIGHT"
-                glib:nick="right"/>
+              value="1"
+              c:identifier="GTK_JUSTIFY_RIGHT"
+              glib:nick="right"/>
       <member name="center"
-                value="2"
-                c:identifier="GTK_JUSTIFY_CENTER"
-                glib:nick="center"/>
+              value="2"
+              c:identifier="GTK_JUSTIFY_CENTER"
+              glib:nick="center"/>
       <member name="fill"
-                value="3"
-                c:identifier="GTK_JUSTIFY_FILL"
-                glib:nick="fill"/>
+              value="3"
+              c:identifier="GTK_JUSTIFY_FILL"
+              glib:nick="fill"/>
     </enumeration>
     <enumeration name="MatchType"
                  c:type="GtkMatchType"
                  glib:type-name="GtkMatchType"
                  glib:get-type="gtk_match_type_get_type">
       <member name="all"
-                value="0"
-                c:identifier="GTK_MATCH_ALL"
-                glib:nick="all"/>
+              value="0"
+              c:identifier="GTK_MATCH_ALL"
+              glib:nick="all"/>
       <member name="all-tail"
-                value="1"
-                c:identifier="GTK_MATCH_ALL_TAIL"
-                glib:nick="all-tail"/>
+              value="1"
+              c:identifier="GTK_MATCH_ALL_TAIL"
+              glib:nick="all-tail"/>
       <member name="head"
-                value="2"
-                c:identifier="GTK_MATCH_HEAD"
-                glib:nick="head"/>
+              value="2"
+              c:identifier="GTK_MATCH_HEAD"
+              glib:nick="head"/>
       <member name="tail"
-                value="3"
-                c:identifier="GTK_MATCH_TAIL"
-                glib:nick="tail"/>
+              value="3"
+              c:identifier="GTK_MATCH_TAIL"
+              glib:nick="tail"/>
       <member name="exact"
-                value="4"
-                c:identifier="GTK_MATCH_EXACT"
-                glib:nick="exact"/>
+              value="4"
+              c:identifier="GTK_MATCH_EXACT"
+              glib:nick="exact"/>
       <member name="last"
-                value="5"
-                c:identifier="GTK_MATCH_LAST"
-                glib:nick="last"/>
+              value="5"
+              c:identifier="GTK_MATCH_LAST"
+              glib:nick="last"/>
     </enumeration>
     <enumeration name="MenuDirectionType"
                  c:type="GtkMenuDirectionType"
                  glib:type-name="GtkMenuDirectionType"
                  glib:get-type="gtk_menu_direction_type_get_type">
       <member name="parent"
-                value="0"
-                c:identifier="GTK_MENU_DIR_PARENT"
-                glib:nick="parent"/>
+              value="0"
+              c:identifier="GTK_MENU_DIR_PARENT"
+              glib:nick="parent"/>
       <member name="child"
-                value="1"
-                c:identifier="GTK_MENU_DIR_CHILD"
-                glib:nick="child"/>
+              value="1"
+              c:identifier="GTK_MENU_DIR_CHILD"
+              glib:nick="child"/>
       <member name="next"
-                value="2"
-                c:identifier="GTK_MENU_DIR_NEXT"
-                glib:nick="next"/>
+              value="2"
+              c:identifier="GTK_MENU_DIR_NEXT"
+              glib:nick="next"/>
       <member name="prev"
-                value="3"
-                c:identifier="GTK_MENU_DIR_PREV"
-                glib:nick="prev"/>
+              value="3"
+              c:identifier="GTK_MENU_DIR_PREV"
+              glib:nick="prev"/>
     </enumeration>
     <enumeration name="MetricType"
                  c:type="GtkMetricType"
                  glib:type-name="GtkMetricType"
                  glib:get-type="gtk_metric_type_get_type">
       <member name="pixels"
-                value="0"
-                c:identifier="GTK_PIXELS"
-                glib:nick="pixels"/>
+              value="0"
+              c:identifier="GTK_PIXELS"
+              glib:nick="pixels"/>
       <member name="inches"
-                value="1"
-                c:identifier="GTK_INCHES"
-                glib:nick="inches"/>
+              value="1"
+              c:identifier="GTK_INCHES"
+              glib:nick="inches"/>
       <member name="centimeters"
-                value="2"
-                c:identifier="GTK_CENTIMETERS"
-                glib:nick="centimeters"/>
+              value="2"
+              c:identifier="GTK_CENTIMETERS"
+              glib:nick="centimeters"/>
     </enumeration>
     <enumeration name="MovementStep"
                  c:type="GtkMovementStep"
                  glib:type-name="GtkMovementStep"
                  glib:get-type="gtk_movement_step_get_type">
       <member name="logical-positions"
-                value="0"
-                c:identifier="GTK_MOVEMENT_LOGICAL_POSITIONS"
-                glib:nick="logical-positions"/>
+              value="0"
+              c:identifier="GTK_MOVEMENT_LOGICAL_POSITIONS"
+              glib:nick="logical-positions"/>
       <member name="visual-positions"
-                value="1"
-                c:identifier="GTK_MOVEMENT_VISUAL_POSITIONS"
-                glib:nick="visual-positions"/>
+              value="1"
+              c:identifier="GTK_MOVEMENT_VISUAL_POSITIONS"
+              glib:nick="visual-positions"/>
       <member name="words"
-                value="2"
-                c:identifier="GTK_MOVEMENT_WORDS"
-                glib:nick="words"/>
+              value="2"
+              c:identifier="GTK_MOVEMENT_WORDS"
+              glib:nick="words"/>
       <member name="display-lines"
-                value="3"
-                c:identifier="GTK_MOVEMENT_DISPLAY_LINES"
-                glib:nick="display-lines"/>
+              value="3"
+              c:identifier="GTK_MOVEMENT_DISPLAY_LINES"
+              glib:nick="display-lines"/>
       <member name="display-line-ends"
-                value="4"
-                c:identifier="GTK_MOVEMENT_DISPLAY_LINE_ENDS"
-                glib:nick="display-line-ends"/>
+              value="4"
+              c:identifier="GTK_MOVEMENT_DISPLAY_LINE_ENDS"
+              glib:nick="display-line-ends"/>
       <member name="paragraphs"
-                value="5"
-                c:identifier="GTK_MOVEMENT_PARAGRAPHS"
-                glib:nick="paragraphs"/>
+              value="5"
+              c:identifier="GTK_MOVEMENT_PARAGRAPHS"
+              glib:nick="paragraphs"/>
       <member name="paragraph-ends"
-                value="6"
-                c:identifier="GTK_MOVEMENT_PARAGRAPH_ENDS"
-                glib:nick="paragraph-ends"/>
+              value="6"
+              c:identifier="GTK_MOVEMENT_PARAGRAPH_ENDS"
+              glib:nick="paragraph-ends"/>
       <member name="pages"
-                value="7"
-                c:identifier="GTK_MOVEMENT_PAGES"
-                glib:nick="pages"/>
+              value="7"
+              c:identifier="GTK_MOVEMENT_PAGES"
+              glib:nick="pages"/>
       <member name="buffer-ends"
-                value="8"
-                c:identifier="GTK_MOVEMENT_BUFFER_ENDS"
-                glib:nick="buffer-ends"/>
+              value="8"
+              c:identifier="GTK_MOVEMENT_BUFFER_ENDS"
+              glib:nick="buffer-ends"/>
       <member name="horizontal-pages"
-                value="9"
-                c:identifier="GTK_MOVEMENT_HORIZONTAL_PAGES"
-                glib:nick="horizontal-pages"/>
+              value="9"
+              c:identifier="GTK_MOVEMENT_HORIZONTAL_PAGES"
+              glib:nick="horizontal-pages"/>
     </enumeration>
     <enumeration name="ScrollStep"
                  c:type="GtkScrollStep"
                  glib:type-name="GtkScrollStep"
                  glib:get-type="gtk_scroll_step_get_type">
       <member name="steps"
-                value="0"
-                c:identifier="GTK_SCROLL_STEPS"
-                glib:nick="steps"/>
+              value="0"
+              c:identifier="GTK_SCROLL_STEPS"
+              glib:nick="steps"/>
       <member name="pages"
-                value="1"
-                c:identifier="GTK_SCROLL_PAGES"
-                glib:nick="pages"/>
+              value="1"
+              c:identifier="GTK_SCROLL_PAGES"
+              glib:nick="pages"/>
       <member name="ends"
-                value="2"
-                c:identifier="GTK_SCROLL_ENDS"
-                glib:nick="ends"/>
+              value="2"
+              c:identifier="GTK_SCROLL_ENDS"
+              glib:nick="ends"/>
       <member name="horizontal-steps"
-                value="3"
-                c:identifier="GTK_SCROLL_HORIZONTAL_STEPS"
-                glib:nick="horizontal-steps"/>
+              value="3"
+              c:identifier="GTK_SCROLL_HORIZONTAL_STEPS"
+              glib:nick="horizontal-steps"/>
       <member name="horizontal-pages"
-                value="4"
-                c:identifier="GTK_SCROLL_HORIZONTAL_PAGES"
-                glib:nick="horizontal-pages"/>
+              value="4"
+              c:identifier="GTK_SCROLL_HORIZONTAL_PAGES"
+              glib:nick="horizontal-pages"/>
       <member name="horizontal-ends"
-                value="5"
-                c:identifier="GTK_SCROLL_HORIZONTAL_ENDS"
-                glib:nick="horizontal-ends"/>
+              value="5"
+              c:identifier="GTK_SCROLL_HORIZONTAL_ENDS"
+              glib:nick="horizontal-ends"/>
     </enumeration>
     <enumeration name="Orientation"
                  c:type="GtkOrientation"
                  glib:type-name="GtkOrientation"
                  glib:get-type="gtk_orientation_get_type">
       <member name="horizontal"
-                value="0"
-                c:identifier="GTK_ORIENTATION_HORIZONTAL"
-                glib:nick="horizontal"/>
+              value="0"
+              c:identifier="GTK_ORIENTATION_HORIZONTAL"
+              glib:nick="horizontal"/>
       <member name="vertical"
-                value="1"
-                c:identifier="GTK_ORIENTATION_VERTICAL"
-                glib:nick="vertical"/>
+              value="1"
+              c:identifier="GTK_ORIENTATION_VERTICAL"
+              glib:nick="vertical"/>
     </enumeration>
     <enumeration name="CornerType"
                  c:type="GtkCornerType"
                  glib:type-name="GtkCornerType"
                  glib:get-type="gtk_corner_type_get_type">
       <member name="top-left"
-                value="0"
-                c:identifier="GTK_CORNER_TOP_LEFT"
-                glib:nick="top-left"/>
+              value="0"
+              c:identifier="GTK_CORNER_TOP_LEFT"
+              glib:nick="top-left"/>
       <member name="bottom-left"
-                value="1"
-                c:identifier="GTK_CORNER_BOTTOM_LEFT"
-                glib:nick="bottom-left"/>
+              value="1"
+              c:identifier="GTK_CORNER_BOTTOM_LEFT"
+              glib:nick="bottom-left"/>
       <member name="top-right"
-                value="2"
-                c:identifier="GTK_CORNER_TOP_RIGHT"
-                glib:nick="top-right"/>
+              value="2"
+              c:identifier="GTK_CORNER_TOP_RIGHT"
+              glib:nick="top-right"/>
       <member name="bottom-right"
-                value="3"
-                c:identifier="GTK_CORNER_BOTTOM_RIGHT"
-                glib:nick="bottom-right"/>
+              value="3"
+              c:identifier="GTK_CORNER_BOTTOM_RIGHT"
+              glib:nick="bottom-right"/>
     </enumeration>
     <enumeration name="PackType"
                  c:type="GtkPackType"
                  glib:type-name="GtkPackType"
                  glib:get-type="gtk_pack_type_get_type">
       <member name="start"
-                value="0"
-                c:identifier="GTK_PACK_START"
-                glib:nick="start"/>
+              value="0"
+              c:identifier="GTK_PACK_START"
+              glib:nick="start"/>
       <member name="end"
-                value="1"
-                c:identifier="GTK_PACK_END"
-                glib:nick="end"/>
+              value="1"
+              c:identifier="GTK_PACK_END"
+              glib:nick="end"/>
     </enumeration>
     <enumeration name="PathPriorityType"
                  c:type="GtkPathPriorityType"
                  glib:type-name="GtkPathPriorityType"
                  glib:get-type="gtk_path_priority_type_get_type">
       <member name="lowest"
-                value="0"
-                c:identifier="GTK_PATH_PRIO_LOWEST"
-                glib:nick="lowest"/>
+              value="0"
+              c:identifier="GTK_PATH_PRIO_LOWEST"
+              glib:nick="lowest"/>
       <member name="gtk"
-                value="4"
-                c:identifier="GTK_PATH_PRIO_GTK"
-                glib:nick="gtk"/>
+              value="4"
+              c:identifier="GTK_PATH_PRIO_GTK"
+              glib:nick="gtk"/>
       <member name="application"
-                value="8"
-                c:identifier="GTK_PATH_PRIO_APPLICATION"
-                glib:nick="application"/>
+              value="8"
+              c:identifier="GTK_PATH_PRIO_APPLICATION"
+              glib:nick="application"/>
       <member name="theme"
-                value="10"
-                c:identifier="GTK_PATH_PRIO_THEME"
-                glib:nick="theme"/>
+              value="10"
+              c:identifier="GTK_PATH_PRIO_THEME"
+              glib:nick="theme"/>
       <member name="rc"
-                value="12"
-                c:identifier="GTK_PATH_PRIO_RC"
-                glib:nick="rc"/>
+              value="12"
+              c:identifier="GTK_PATH_PRIO_RC"
+              glib:nick="rc"/>
       <member name="highest"
-                value="15"
-                c:identifier="GTK_PATH_PRIO_HIGHEST"
-                glib:nick="highest"/>
+              value="15"
+              c:identifier="GTK_PATH_PRIO_HIGHEST"
+              glib:nick="highest"/>
     </enumeration>
     <enumeration name="PathType"
                  c:type="GtkPathType"
                  glib:type-name="GtkPathType"
                  glib:get-type="gtk_path_type_get_type">
       <member name="widget"
-                value="0"
-                c:identifier="GTK_PATH_WIDGET"
-                glib:nick="widget"/>
+              value="0"
+              c:identifier="GTK_PATH_WIDGET"
+              glib:nick="widget"/>
       <member name="widget-class"
-                value="1"
-                c:identifier="GTK_PATH_WIDGET_CLASS"
-                glib:nick="widget-class"/>
+              value="1"
+              c:identifier="GTK_PATH_WIDGET_CLASS"
+              glib:nick="widget-class"/>
       <member name="class"
-                value="2"
-                c:identifier="GTK_PATH_CLASS"
-                glib:nick="class"/>
+              value="2"
+              c:identifier="GTK_PATH_CLASS"
+              glib:nick="class"/>
     </enumeration>
     <enumeration name="PolicyType"
                  c:type="GtkPolicyType"
                  glib:type-name="GtkPolicyType"
                  glib:get-type="gtk_policy_type_get_type">
       <member name="always"
-                value="0"
-                c:identifier="GTK_POLICY_ALWAYS"
-                glib:nick="always"/>
+              value="0"
+              c:identifier="GTK_POLICY_ALWAYS"
+              glib:nick="always"/>
       <member name="automatic"
-                value="1"
-                c:identifier="GTK_POLICY_AUTOMATIC"
-                glib:nick="automatic"/>
+              value="1"
+              c:identifier="GTK_POLICY_AUTOMATIC"
+              glib:nick="automatic"/>
       <member name="never"
-                value="2"
-                c:identifier="GTK_POLICY_NEVER"
-                glib:nick="never"/>
+              value="2"
+              c:identifier="GTK_POLICY_NEVER"
+              glib:nick="never"/>
     </enumeration>
     <enumeration name="PositionType"
                  c:type="GtkPositionType"
                  glib:type-name="GtkPositionType"
                  glib:get-type="gtk_position_type_get_type">
       <member name="left"
-                value="0"
-                c:identifier="GTK_POS_LEFT"
-                glib:nick="left"/>
+              value="0"
+              c:identifier="GTK_POS_LEFT"
+              glib:nick="left"/>
       <member name="right"
-                value="1"
-                c:identifier="GTK_POS_RIGHT"
-                glib:nick="right"/>
+              value="1"
+              c:identifier="GTK_POS_RIGHT"
+              glib:nick="right"/>
       <member name="top" value="2" c:identifier="GTK_POS_TOP" glib:nick="top"/>
       <member name="bottom"
-                value="3"
-                c:identifier="GTK_POS_BOTTOM"
-                glib:nick="bottom"/>
+              value="3"
+              c:identifier="GTK_POS_BOTTOM"
+              glib:nick="bottom"/>
     </enumeration>
     <enumeration name="PreviewType"
                  c:type="GtkPreviewType"
                  glib:type-name="GtkPreviewType"
                  glib:get-type="gtk_preview_type_get_type">
       <member name="color"
-                value="0"
-                c:identifier="GTK_PREVIEW_COLOR"
-                glib:nick="color"/>
+              value="0"
+              c:identifier="GTK_PREVIEW_COLOR"
+              glib:nick="color"/>
       <member name="grayscale"
-                value="1"
-                c:identifier="GTK_PREVIEW_GRAYSCALE"
-                glib:nick="grayscale"/>
+              value="1"
+              c:identifier="GTK_PREVIEW_GRAYSCALE"
+              glib:nick="grayscale"/>
     </enumeration>
     <enumeration name="ReliefStyle"
                  c:type="GtkReliefStyle"
                  glib:type-name="GtkReliefStyle"
                  glib:get-type="gtk_relief_style_get_type">
       <member name="normal"
-                value="0"
-                c:identifier="GTK_RELIEF_NORMAL"
-                glib:nick="normal"/>
+              value="0"
+              c:identifier="GTK_RELIEF_NORMAL"
+              glib:nick="normal"/>
       <member name="half"
-                value="1"
-                c:identifier="GTK_RELIEF_HALF"
-                glib:nick="half"/>
+              value="1"
+              c:identifier="GTK_RELIEF_HALF"
+              glib:nick="half"/>
       <member name="none"
-                value="2"
-                c:identifier="GTK_RELIEF_NONE"
-                glib:nick="none"/>
+              value="2"
+              c:identifier="GTK_RELIEF_NONE"
+              glib:nick="none"/>
     </enumeration>
     <enumeration name="ResizeMode"
                  c:type="GtkResizeMode"
                  glib:type-name="GtkResizeMode"
                  glib:get-type="gtk_resize_mode_get_type">
       <member name="parent"
-                value="0"
-                c:identifier="GTK_RESIZE_PARENT"
-                glib:nick="parent"/>
+              value="0"
+              c:identifier="GTK_RESIZE_PARENT"
+              glib:nick="parent"/>
       <member name="queue"
-                value="1"
-                c:identifier="GTK_RESIZE_QUEUE"
-                glib:nick="queue"/>
+              value="1"
+              c:identifier="GTK_RESIZE_QUEUE"
+              glib:nick="queue"/>
       <member name="immediate"
-                value="2"
-                c:identifier="GTK_RESIZE_IMMEDIATE"
-                glib:nick="immediate"/>
+              value="2"
+              c:identifier="GTK_RESIZE_IMMEDIATE"
+              glib:nick="immediate"/>
     </enumeration>
     <bitfield name="SignalRunType"
               c:type="GtkSignalRunType"
               glib:type-name="GtkSignalRunType"
               glib:get-type="gtk_signal_run_type_get_type">
       <member name="first"
-                value="1"
-                c:identifier="GTK_RUN_FIRST"
-                glib:nick="first"/>
+              value="1"
+              c:identifier="GTK_RUN_FIRST"
+              glib:nick="first"/>
       <member name="last"
-                value="2"
-                c:identifier="GTK_RUN_LAST"
-                glib:nick="last"/>
+              value="2"
+              c:identifier="GTK_RUN_LAST"
+              glib:nick="last"/>
       <member name="both"
-                value="3"
-                c:identifier="GTK_RUN_BOTH"
-                glib:nick="both"/>
+              value="3"
+              c:identifier="GTK_RUN_BOTH"
+              glib:nick="both"/>
       <member name="no-recurse"
-                value="8"
-                c:identifier="GTK_RUN_NO_RECURSE"
-                glib:nick="no-recurse"/>
+              value="8"
+              c:identifier="GTK_RUN_NO_RECURSE"
+              glib:nick="no-recurse"/>
       <member name="action"
-                value="32"
-                c:identifier="GTK_RUN_ACTION"
-                glib:nick="action"/>
+              value="32"
+              c:identifier="GTK_RUN_ACTION"
+              glib:nick="action"/>
       <member name="no-hooks"
-                value="64"
-                c:identifier="GTK_RUN_NO_HOOKS"
-                glib:nick="no-hooks"/>
+              value="64"
+              c:identifier="GTK_RUN_NO_HOOKS"
+              glib:nick="no-hooks"/>
     </bitfield>
     <enumeration name="ScrollType"
                  c:type="GtkScrollType"
                  glib:type-name="GtkScrollType"
                  glib:get-type="gtk_scroll_type_get_type">
       <member name="none"
-                value="0"
-                c:identifier="GTK_SCROLL_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="GTK_SCROLL_NONE"
+              glib:nick="none"/>
       <member name="jump"
-                value="1"
-                c:identifier="GTK_SCROLL_JUMP"
-                glib:nick="jump"/>
+              value="1"
+              c:identifier="GTK_SCROLL_JUMP"
+              glib:nick="jump"/>
       <member name="step-backward"
-                value="2"
-                c:identifier="GTK_SCROLL_STEP_BACKWARD"
-                glib:nick="step-backward"/>
+              value="2"
+              c:identifier="GTK_SCROLL_STEP_BACKWARD"
+              glib:nick="step-backward"/>
       <member name="step-forward"
-                value="3"
-                c:identifier="GTK_SCROLL_STEP_FORWARD"
-                glib:nick="step-forward"/>
+              value="3"
+              c:identifier="GTK_SCROLL_STEP_FORWARD"
+              glib:nick="step-forward"/>
       <member name="page-backward"
-                value="4"
-                c:identifier="GTK_SCROLL_PAGE_BACKWARD"
-                glib:nick="page-backward"/>
+              value="4"
+              c:identifier="GTK_SCROLL_PAGE_BACKWARD"
+              glib:nick="page-backward"/>
       <member name="page-forward"
-                value="5"
-                c:identifier="GTK_SCROLL_PAGE_FORWARD"
-                glib:nick="page-forward"/>
+              value="5"
+              c:identifier="GTK_SCROLL_PAGE_FORWARD"
+              glib:nick="page-forward"/>
       <member name="step-up"
-                value="6"
-                c:identifier="GTK_SCROLL_STEP_UP"
-                glib:nick="step-up"/>
+              value="6"
+              c:identifier="GTK_SCROLL_STEP_UP"
+              glib:nick="step-up"/>
       <member name="step-down"
-                value="7"
-                c:identifier="GTK_SCROLL_STEP_DOWN"
-                glib:nick="step-down"/>
+              value="7"
+              c:identifier="GTK_SCROLL_STEP_DOWN"
+              glib:nick="step-down"/>
       <member name="page-up"
-                value="8"
-                c:identifier="GTK_SCROLL_PAGE_UP"
-                glib:nick="page-up"/>
+              value="8"
+              c:identifier="GTK_SCROLL_PAGE_UP"
+              glib:nick="page-up"/>
       <member name="page-down"
-                value="9"
-                c:identifier="GTK_SCROLL_PAGE_DOWN"
-                glib:nick="page-down"/>
+              value="9"
+              c:identifier="GTK_SCROLL_PAGE_DOWN"
+              glib:nick="page-down"/>
       <member name="step-left"
-                value="10"
-                c:identifier="GTK_SCROLL_STEP_LEFT"
-                glib:nick="step-left"/>
+              value="10"
+              c:identifier="GTK_SCROLL_STEP_LEFT"
+              glib:nick="step-left"/>
       <member name="step-right"
-                value="11"
-                c:identifier="GTK_SCROLL_STEP_RIGHT"
-                glib:nick="step-right"/>
+              value="11"
+              c:identifier="GTK_SCROLL_STEP_RIGHT"
+              glib:nick="step-right"/>
       <member name="page-left"
-                value="12"
-                c:identifier="GTK_SCROLL_PAGE_LEFT"
-                glib:nick="page-left"/>
+              value="12"
+              c:identifier="GTK_SCROLL_PAGE_LEFT"
+              glib:nick="page-left"/>
       <member name="page-right"
-                value="13"
-                c:identifier="GTK_SCROLL_PAGE_RIGHT"
-                glib:nick="page-right"/>
+              value="13"
+              c:identifier="GTK_SCROLL_PAGE_RIGHT"
+              glib:nick="page-right"/>
       <member name="start"
-                value="14"
-                c:identifier="GTK_SCROLL_START"
-                glib:nick="start"/>
+              value="14"
+              c:identifier="GTK_SCROLL_START"
+              glib:nick="start"/>
       <member name="end"
-                value="15"
-                c:identifier="GTK_SCROLL_END"
-                glib:nick="end"/>
+              value="15"
+              c:identifier="GTK_SCROLL_END"
+              glib:nick="end"/>
     </enumeration>
     <enumeration name="SelectionMode"
                  c:type="GtkSelectionMode"
                  glib:type-name="GtkSelectionMode"
                  glib:get-type="gtk_selection_mode_get_type">
       <member name="none"
-                value="0"
-                c:identifier="GTK_SELECTION_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="GTK_SELECTION_NONE"
+              glib:nick="none"/>
       <member name="single"
-                value="1"
-                c:identifier="GTK_SELECTION_SINGLE"
-                glib:nick="single"/>
+              value="1"
+              c:identifier="GTK_SELECTION_SINGLE"
+              glib:nick="single"/>
       <member name="browse"
-                value="2"
-                c:identifier="GTK_SELECTION_BROWSE"
-                glib:nick="browse"/>
+              value="2"
+              c:identifier="GTK_SELECTION_BROWSE"
+              glib:nick="browse"/>
       <member name="multiple"
-                value="3"
-                c:identifier="GTK_SELECTION_MULTIPLE"
-                glib:nick="multiple"/>
+              value="3"
+              c:identifier="GTK_SELECTION_MULTIPLE"
+              glib:nick="multiple"/>
       <member name="extended"
-                value="3"
-                c:identifier="GTK_SELECTION_EXTENDED"
-                glib:nick="extended"/>
+              value="3"
+              c:identifier="GTK_SELECTION_EXTENDED"
+              glib:nick="extended"/>
     </enumeration>
     <enumeration name="ShadowType"
                  c:type="GtkShadowType"
                  glib:type-name="GtkShadowType"
                  glib:get-type="gtk_shadow_type_get_type">
       <member name="none"
-                value="0"
-                c:identifier="GTK_SHADOW_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="GTK_SHADOW_NONE"
+              glib:nick="none"/>
       <member name="in" value="1" c:identifier="GTK_SHADOW_IN" glib:nick="in"/>
       <member name="out"
-                value="2"
-                c:identifier="GTK_SHADOW_OUT"
-                glib:nick="out"/>
+              value="2"
+              c:identifier="GTK_SHADOW_OUT"
+              glib:nick="out"/>
       <member name="etched-in"
-                value="3"
-                c:identifier="GTK_SHADOW_ETCHED_IN"
-                glib:nick="etched-in"/>
+              value="3"
+              c:identifier="GTK_SHADOW_ETCHED_IN"
+              glib:nick="etched-in"/>
       <member name="etched-out"
-                value="4"
-                c:identifier="GTK_SHADOW_ETCHED_OUT"
-                glib:nick="etched-out"/>
+              value="4"
+              c:identifier="GTK_SHADOW_ETCHED_OUT"
+              glib:nick="etched-out"/>
     </enumeration>
     <enumeration name="StateType"
                  c:type="GtkStateType"
                  glib:type-name="GtkStateType"
                  glib:get-type="gtk_state_type_get_type">
       <member name="normal"
-                value="0"
-                c:identifier="GTK_STATE_NORMAL"
-                glib:nick="normal"/>
+              value="0"
+              c:identifier="GTK_STATE_NORMAL"
+              glib:nick="normal"/>
       <member name="active"
-                value="1"
-                c:identifier="GTK_STATE_ACTIVE"
-                glib:nick="active"/>
+              value="1"
+              c:identifier="GTK_STATE_ACTIVE"
+              glib:nick="active"/>
       <member name="prelight"
-                value="2"
-                c:identifier="GTK_STATE_PRELIGHT"
-                glib:nick="prelight"/>
+              value="2"
+              c:identifier="GTK_STATE_PRELIGHT"
+              glib:nick="prelight"/>
       <member name="selected"
-                value="3"
-                c:identifier="GTK_STATE_SELECTED"
-                glib:nick="selected"/>
+              value="3"
+              c:identifier="GTK_STATE_SELECTED"
+              glib:nick="selected"/>
       <member name="insensitive"
-                value="4"
-                c:identifier="GTK_STATE_INSENSITIVE"
-                glib:nick="insensitive"/>
+              value="4"
+              c:identifier="GTK_STATE_INSENSITIVE"
+              glib:nick="insensitive"/>
     </enumeration>
     <enumeration name="SubmenuDirection"
                  c:type="GtkSubmenuDirection"
                  glib:type-name="GtkSubmenuDirection"
                  glib:get-type="gtk_submenu_direction_get_type">
       <member name="left"
-                value="0"
-                c:identifier="GTK_DIRECTION_LEFT"
-                glib:nick="left"/>
+              value="0"
+              c:identifier="GTK_DIRECTION_LEFT"
+              glib:nick="left"/>
       <member name="right"
-                value="1"
-                c:identifier="GTK_DIRECTION_RIGHT"
-                glib:nick="right"/>
+              value="1"
+              c:identifier="GTK_DIRECTION_RIGHT"
+              glib:nick="right"/>
     </enumeration>
     <enumeration name="SubmenuPlacement"
                  c:type="GtkSubmenuPlacement"
                  glib:type-name="GtkSubmenuPlacement"
                  glib:get-type="gtk_submenu_placement_get_type">
       <member name="top-bottom"
-                value="0"
-                c:identifier="GTK_TOP_BOTTOM"
-                glib:nick="top-bottom"/>
+              value="0"
+              c:identifier="GTK_TOP_BOTTOM"
+              glib:nick="top-bottom"/>
       <member name="left-right"
-                value="1"
-                c:identifier="GTK_LEFT_RIGHT"
-                glib:nick="left-right"/>
+              value="1"
+              c:identifier="GTK_LEFT_RIGHT"
+              glib:nick="left-right"/>
     </enumeration>
     <enumeration name="ToolbarStyle"
                  c:type="GtkToolbarStyle"
                  glib:type-name="GtkToolbarStyle"
                  glib:get-type="gtk_toolbar_style_get_type">
       <member name="icons"
-                value="0"
-                c:identifier="GTK_TOOLBAR_ICONS"
-                glib:nick="icons"/>
+              value="0"
+              c:identifier="GTK_TOOLBAR_ICONS"
+              glib:nick="icons"/>
       <member name="text"
-                value="1"
-                c:identifier="GTK_TOOLBAR_TEXT"
-                glib:nick="text"/>
+              value="1"
+              c:identifier="GTK_TOOLBAR_TEXT"
+              glib:nick="text"/>
       <member name="both"
-                value="2"
-                c:identifier="GTK_TOOLBAR_BOTH"
-                glib:nick="both"/>
+              value="2"
+              c:identifier="GTK_TOOLBAR_BOTH"
+              glib:nick="both"/>
       <member name="both-horiz"
-                value="3"
-                c:identifier="GTK_TOOLBAR_BOTH_HORIZ"
-                glib:nick="both-horiz"/>
+              value="3"
+              c:identifier="GTK_TOOLBAR_BOTH_HORIZ"
+              glib:nick="both-horiz"/>
     </enumeration>
     <enumeration name="UpdateType"
                  c:type="GtkUpdateType"
                  glib:type-name="GtkUpdateType"
                  glib:get-type="gtk_update_type_get_type">
       <member name="continuous"
-                value="0"
-                c:identifier="GTK_UPDATE_CONTINUOUS"
-                glib:nick="continuous"/>
+              value="0"
+              c:identifier="GTK_UPDATE_CONTINUOUS"
+              glib:nick="continuous"/>
       <member name="discontinuous"
-                value="1"
-                c:identifier="GTK_UPDATE_DISCONTINUOUS"
-                glib:nick="discontinuous"/>
+              value="1"
+              c:identifier="GTK_UPDATE_DISCONTINUOUS"
+              glib:nick="discontinuous"/>
       <member name="delayed"
-                value="2"
-                c:identifier="GTK_UPDATE_DELAYED"
-                glib:nick="delayed"/>
+              value="2"
+              c:identifier="GTK_UPDATE_DELAYED"
+              glib:nick="delayed"/>
     </enumeration>
     <enumeration name="Visibility"
                  c:type="GtkVisibility"
                  glib:type-name="GtkVisibility"
                  glib:get-type="gtk_visibility_get_type">
       <member name="none"
-                value="0"
-                c:identifier="GTK_VISIBILITY_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="GTK_VISIBILITY_NONE"
+              glib:nick="none"/>
       <member name="partial"
-                value="1"
-                c:identifier="GTK_VISIBILITY_PARTIAL"
-                glib:nick="partial"/>
+              value="1"
+              c:identifier="GTK_VISIBILITY_PARTIAL"
+              glib:nick="partial"/>
       <member name="full"
-                value="2"
-                c:identifier="GTK_VISIBILITY_FULL"
-                glib:nick="full"/>
+              value="2"
+              c:identifier="GTK_VISIBILITY_FULL"
+              glib:nick="full"/>
     </enumeration>
     <enumeration name="WindowPosition"
                  c:type="GtkWindowPosition"
                  glib:type-name="GtkWindowPosition"
                  glib:get-type="gtk_window_position_get_type">
       <member name="none"
-                value="0"
-                c:identifier="GTK_WIN_POS_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="GTK_WIN_POS_NONE"
+              glib:nick="none"/>
       <member name="center"
-                value="1"
-                c:identifier="GTK_WIN_POS_CENTER"
-                glib:nick="center"/>
+              value="1"
+              c:identifier="GTK_WIN_POS_CENTER"
+              glib:nick="center"/>
       <member name="mouse"
-                value="2"
-                c:identifier="GTK_WIN_POS_MOUSE"
-                glib:nick="mouse"/>
+              value="2"
+              c:identifier="GTK_WIN_POS_MOUSE"
+              glib:nick="mouse"/>
       <member name="center-always"
-                value="3"
-                c:identifier="GTK_WIN_POS_CENTER_ALWAYS"
-                glib:nick="center-always"/>
+              value="3"
+              c:identifier="GTK_WIN_POS_CENTER_ALWAYS"
+              glib:nick="center-always"/>
       <member name="center-on-parent"
-                value="4"
-                c:identifier="GTK_WIN_POS_CENTER_ON_PARENT"
-                glib:nick="center-on-parent"/>
+              value="4"
+              c:identifier="GTK_WIN_POS_CENTER_ON_PARENT"
+              glib:nick="center-on-parent"/>
     </enumeration>
     <enumeration name="WindowType"
                  c:type="GtkWindowType"
                  glib:type-name="GtkWindowType"
                  glib:get-type="gtk_window_type_get_type">
       <member name="toplevel"
-                value="0"
-                c:identifier="GTK_WINDOW_TOPLEVEL"
-                glib:nick="toplevel"/>
+              value="0"
+              c:identifier="GTK_WINDOW_TOPLEVEL"
+              glib:nick="toplevel"/>
       <member name="popup"
-                value="1"
-                c:identifier="GTK_WINDOW_POPUP"
-                glib:nick="popup"/>
+              value="1"
+              c:identifier="GTK_WINDOW_POPUP"
+              glib:nick="popup"/>
     </enumeration>
     <enumeration name="WrapMode"
                  c:type="GtkWrapMode"
                  glib:type-name="GtkWrapMode"
                  glib:get-type="gtk_wrap_mode_get_type">
       <member name="none"
-                value="0"
-                c:identifier="GTK_WRAP_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="GTK_WRAP_NONE"
+              glib:nick="none"/>
       <member name="char"
-                value="1"
-                c:identifier="GTK_WRAP_CHAR"
-                glib:nick="char"/>
+              value="1"
+              c:identifier="GTK_WRAP_CHAR"
+              glib:nick="char"/>
       <member name="word"
-                value="2"
-                c:identifier="GTK_WRAP_WORD"
-                glib:nick="word"/>
+              value="2"
+              c:identifier="GTK_WRAP_WORD"
+              glib:nick="word"/>
       <member name="word-char"
-                value="3"
-                c:identifier="GTK_WRAP_WORD_CHAR"
-                glib:nick="word-char"/>
+              value="3"
+              c:identifier="GTK_WRAP_WORD_CHAR"
+              glib:nick="word-char"/>
     </enumeration>
     <enumeration name="SortType"
                  c:type="GtkSortType"
                  glib:type-name="GtkSortType"
                  glib:get-type="gtk_sort_type_get_type">
       <member name="ascending"
-                value="0"
-                c:identifier="GTK_SORT_ASCENDING"
-                glib:nick="ascending"/>
+              value="0"
+              c:identifier="GTK_SORT_ASCENDING"
+              glib:nick="ascending"/>
       <member name="descending"
-                value="1"
-                c:identifier="GTK_SORT_DESCENDING"
-                glib:nick="descending"/>
+              value="1"
+              c:identifier="GTK_SORT_DESCENDING"
+              glib:nick="descending"/>
     </enumeration>
     <enumeration name="IMPreeditStyle"
                  c:type="GtkIMPreeditStyle"
                  glib:type-name="GtkIMPreeditStyle"
                  glib:get-type="gtk_im_preedit_style_get_type">
       <member name="nothing"
-                value="0"
-                c:identifier="GTK_IM_PREEDIT_NOTHING"
-                glib:nick="nothing"/>
+              value="0"
+              c:identifier="GTK_IM_PREEDIT_NOTHING"
+              glib:nick="nothing"/>
       <member name="callback"
-                value="1"
-                c:identifier="GTK_IM_PREEDIT_CALLBACK"
-                glib:nick="callback"/>
+              value="1"
+              c:identifier="GTK_IM_PREEDIT_CALLBACK"
+              glib:nick="callback"/>
       <member name="none"
-                value="2"
-                c:identifier="GTK_IM_PREEDIT_NONE"
-                glib:nick="none"/>
+              value="2"
+              c:identifier="GTK_IM_PREEDIT_NONE"
+              glib:nick="none"/>
     </enumeration>
     <enumeration name="IMStatusStyle"
                  c:type="GtkIMStatusStyle"
                  glib:type-name="GtkIMStatusStyle"
                  glib:get-type="gtk_im_status_style_get_type">
       <member name="nothing"
-                value="0"
-                c:identifier="GTK_IM_STATUS_NOTHING"
-                glib:nick="nothing"/>
+              value="0"
+              c:identifier="GTK_IM_STATUS_NOTHING"
+              glib:nick="nothing"/>
       <member name="callback"
-                value="1"
-                c:identifier="GTK_IM_STATUS_CALLBACK"
-                glib:nick="callback"/>
+              value="1"
+              c:identifier="GTK_IM_STATUS_CALLBACK"
+              glib:nick="callback"/>
       <member name="none"
-                value="2"
-                c:identifier="GTK_IM_STATUS_NONE"
-                glib:nick="none"/>
+              value="2"
+              c:identifier="GTK_IM_STATUS_NONE"
+              glib:nick="none"/>
     </enumeration>
     <enumeration name="PackDirection"
                  c:type="GtkPackDirection"
                  glib:type-name="GtkPackDirection"
                  glib:get-type="gtk_pack_direction_get_type">
       <member name="ltr"
-                value="0"
-                c:identifier="GTK_PACK_DIRECTION_LTR"
-                glib:nick="ltr"/>
+              value="0"
+              c:identifier="GTK_PACK_DIRECTION_LTR"
+              glib:nick="ltr"/>
       <member name="rtl"
-                value="1"
-                c:identifier="GTK_PACK_DIRECTION_RTL"
-                glib:nick="rtl"/>
+              value="1"
+              c:identifier="GTK_PACK_DIRECTION_RTL"
+              glib:nick="rtl"/>
       <member name="ttb"
-                value="2"
-                c:identifier="GTK_PACK_DIRECTION_TTB"
-                glib:nick="ttb"/>
+              value="2"
+              c:identifier="GTK_PACK_DIRECTION_TTB"
+              glib:nick="ttb"/>
       <member name="btt"
-                value="3"
-                c:identifier="GTK_PACK_DIRECTION_BTT"
-                glib:nick="btt"/>
+              value="3"
+              c:identifier="GTK_PACK_DIRECTION_BTT"
+              glib:nick="btt"/>
     </enumeration>
     <enumeration name="PrintPages"
                  c:type="GtkPrintPages"
                  glib:type-name="GtkPrintPages"
                  glib:get-type="gtk_print_pages_get_type">
       <member name="all"
-                value="0"
-                c:identifier="GTK_PRINT_PAGES_ALL"
-                glib:nick="all"/>
+              value="0"
+              c:identifier="GTK_PRINT_PAGES_ALL"
+              glib:nick="all"/>
       <member name="current"
-                value="1"
-                c:identifier="GTK_PRINT_PAGES_CURRENT"
-                glib:nick="current"/>
+              value="1"
+              c:identifier="GTK_PRINT_PAGES_CURRENT"
+              glib:nick="current"/>
       <member name="ranges"
-                value="2"
-                c:identifier="GTK_PRINT_PAGES_RANGES"
-                glib:nick="ranges"/>
+              value="2"
+              c:identifier="GTK_PRINT_PAGES_RANGES"
+              glib:nick="ranges"/>
     </enumeration>
     <enumeration name="PageSet"
                  c:type="GtkPageSet"
                  glib:type-name="GtkPageSet"
                  glib:get-type="gtk_page_set_get_type">
       <member name="all"
-                value="0"
-                c:identifier="GTK_PAGE_SET_ALL"
-                glib:nick="all"/>
+              value="0"
+              c:identifier="GTK_PAGE_SET_ALL"
+              glib:nick="all"/>
       <member name="even"
-                value="1"
-                c:identifier="GTK_PAGE_SET_EVEN"
-                glib:nick="even"/>
+              value="1"
+              c:identifier="GTK_PAGE_SET_EVEN"
+              glib:nick="even"/>
       <member name="odd"
-                value="2"
-                c:identifier="GTK_PAGE_SET_ODD"
-                glib:nick="odd"/>
+              value="2"
+              c:identifier="GTK_PAGE_SET_ODD"
+              glib:nick="odd"/>
     </enumeration>
     <enumeration name="PageOrientation"
                  c:type="GtkPageOrientation"
                  glib:type-name="GtkPageOrientation"
                  glib:get-type="gtk_page_orientation_get_type">
       <member name="portrait"
-                value="0"
-                c:identifier="GTK_PAGE_ORIENTATION_PORTRAIT"
-                glib:nick="portrait"/>
+              value="0"
+              c:identifier="GTK_PAGE_ORIENTATION_PORTRAIT"
+              glib:nick="portrait"/>
       <member name="landscape"
-                value="1"
-                c:identifier="GTK_PAGE_ORIENTATION_LANDSCAPE"
-                glib:nick="landscape"/>
+              value="1"
+              c:identifier="GTK_PAGE_ORIENTATION_LANDSCAPE"
+              glib:nick="landscape"/>
       <member name="reverse-portrait"
-                value="2"
-                c:identifier="GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT"
-                glib:nick="reverse-portrait"/>
+              value="2"
+              c:identifier="GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT"
+              glib:nick="reverse-portrait"/>
       <member name="reverse-landscape"
-                value="3"
-                c:identifier="GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE"
-                glib:nick="reverse-landscape"/>
+              value="3"
+              c:identifier="GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE"
+              glib:nick="reverse-landscape"/>
     </enumeration>
     <enumeration name="PrintQuality"
                  c:type="GtkPrintQuality"
                  glib:type-name="GtkPrintQuality"
                  glib:get-type="gtk_print_quality_get_type">
       <member name="low"
-                value="0"
-                c:identifier="GTK_PRINT_QUALITY_LOW"
-                glib:nick="low"/>
+              value="0"
+              c:identifier="GTK_PRINT_QUALITY_LOW"
+              glib:nick="low"/>
       <member name="normal"
-                value="1"
-                c:identifier="GTK_PRINT_QUALITY_NORMAL"
-                glib:nick="normal"/>
+              value="1"
+              c:identifier="GTK_PRINT_QUALITY_NORMAL"
+              glib:nick="normal"/>
       <member name="high"
-                value="2"
-                c:identifier="GTK_PRINT_QUALITY_HIGH"
-                glib:nick="high"/>
+              value="2"
+              c:identifier="GTK_PRINT_QUALITY_HIGH"
+              glib:nick="high"/>
       <member name="draft"
-                value="3"
-                c:identifier="GTK_PRINT_QUALITY_DRAFT"
-                glib:nick="draft"/>
+              value="3"
+              c:identifier="GTK_PRINT_QUALITY_DRAFT"
+              glib:nick="draft"/>
     </enumeration>
     <enumeration name="PrintDuplex"
                  c:type="GtkPrintDuplex"
                  glib:type-name="GtkPrintDuplex"
                  glib:get-type="gtk_print_duplex_get_type">
       <member name="simplex"
-                value="0"
-                c:identifier="GTK_PRINT_DUPLEX_SIMPLEX"
-                glib:nick="simplex"/>
+              value="0"
+              c:identifier="GTK_PRINT_DUPLEX_SIMPLEX"
+              glib:nick="simplex"/>
       <member name="horizontal"
-                value="1"
-                c:identifier="GTK_PRINT_DUPLEX_HORIZONTAL"
-                glib:nick="horizontal"/>
+              value="1"
+              c:identifier="GTK_PRINT_DUPLEX_HORIZONTAL"
+              glib:nick="horizontal"/>
       <member name="vertical"
-                value="2"
-                c:identifier="GTK_PRINT_DUPLEX_VERTICAL"
-                glib:nick="vertical"/>
+              value="2"
+              c:identifier="GTK_PRINT_DUPLEX_VERTICAL"
+              glib:nick="vertical"/>
     </enumeration>
     <enumeration name="Unit"
                  c:type="GtkUnit"
                  glib:type-name="GtkUnit"
                  glib:get-type="gtk_unit_get_type">
       <member name="pixel"
-                value="0"
-                c:identifier="GTK_UNIT_PIXEL"
-                glib:nick="pixel"/>
+              value="0"
+              c:identifier="GTK_UNIT_PIXEL"
+              glib:nick="pixel"/>
       <member name="points"
-                value="1"
-                c:identifier="GTK_UNIT_POINTS"
-                glib:nick="points"/>
+              value="1"
+              c:identifier="GTK_UNIT_POINTS"
+              glib:nick="points"/>
       <member name="inch"
-                value="2"
-                c:identifier="GTK_UNIT_INCH"
-                glib:nick="inch"/>
+              value="2"
+              c:identifier="GTK_UNIT_INCH"
+              glib:nick="inch"/>
       <member name="mm" value="3" c:identifier="GTK_UNIT_MM" glib:nick="mm"/>
     </enumeration>
     <enumeration name="TreeViewGridLines"
@@ -1137,67 +1137,67 @@
                  glib:type-name="GtkTreeViewGridLines"
                  glib:get-type="gtk_tree_view_grid_lines_get_type">
       <member name="none"
-                value="0"
-                c:identifier="GTK_TREE_VIEW_GRID_LINES_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="GTK_TREE_VIEW_GRID_LINES_NONE"
+              glib:nick="none"/>
       <member name="horizontal"
-                value="1"
-                c:identifier="GTK_TREE_VIEW_GRID_LINES_HORIZONTAL"
-                glib:nick="horizontal"/>
+              value="1"
+              c:identifier="GTK_TREE_VIEW_GRID_LINES_HORIZONTAL"
+              glib:nick="horizontal"/>
       <member name="vertical"
-                value="2"
-                c:identifier="GTK_TREE_VIEW_GRID_LINES_VERTICAL"
-                glib:nick="vertical"/>
+              value="2"
+              c:identifier="GTK_TREE_VIEW_GRID_LINES_VERTICAL"
+              glib:nick="vertical"/>
       <member name="both"
-                value="3"
-                c:identifier="GTK_TREE_VIEW_GRID_LINES_BOTH"
-                glib:nick="both"/>
+              value="3"
+              c:identifier="GTK_TREE_VIEW_GRID_LINES_BOTH"
+              glib:nick="both"/>
     </enumeration>
     <enumeration name="DragResult"
                  c:type="GtkDragResult"
                  glib:type-name="GtkDragResult"
                  glib:get-type="gtk_drag_result_get_type">
       <member name="success"
-                value="0"
-                c:identifier="GTK_DRAG_RESULT_SUCCESS"
-                glib:nick="success"/>
+              value="0"
+              c:identifier="GTK_DRAG_RESULT_SUCCESS"
+              glib:nick="success"/>
       <member name="no-target"
-                value="1"
-                c:identifier="GTK_DRAG_RESULT_NO_TARGET"
-                glib:nick="no-target"/>
+              value="1"
+              c:identifier="GTK_DRAG_RESULT_NO_TARGET"
+              glib:nick="no-target"/>
       <member name="user-cancelled"
-                value="2"
-                c:identifier="GTK_DRAG_RESULT_USER_CANCELLED"
-                glib:nick="user-cancelled"/>
+              value="2"
+              c:identifier="GTK_DRAG_RESULT_USER_CANCELLED"
+              glib:nick="user-cancelled"/>
       <member name="timeout-expired"
-                value="3"
-                c:identifier="GTK_DRAG_RESULT_TIMEOUT_EXPIRED"
-                glib:nick="timeout-expired"/>
+              value="3"
+              c:identifier="GTK_DRAG_RESULT_TIMEOUT_EXPIRED"
+              glib:nick="timeout-expired"/>
       <member name="grab-broken"
-                value="4"
-                c:identifier="GTK_DRAG_RESULT_GRAB_BROKEN"
-                glib:nick="grab-broken"/>
+              value="4"
+              c:identifier="GTK_DRAG_RESULT_GRAB_BROKEN"
+              glib:nick="grab-broken"/>
       <member name="error"
-                value="5"
-                c:identifier="GTK_DRAG_RESULT_ERROR"
-                glib:nick="error"/>
+              value="5"
+              c:identifier="GTK_DRAG_RESULT_ERROR"
+              glib:nick="error"/>
     </enumeration>
     <bitfield name="AccelFlags"
               c:type="GtkAccelFlags"
               glib:type-name="GtkAccelFlags"
               glib:get-type="gtk_accel_flags_get_type">
       <member name="visible"
-                value="1"
-                c:identifier="GTK_ACCEL_VISIBLE"
-                glib:nick="visible"/>
+              value="1"
+              c:identifier="GTK_ACCEL_VISIBLE"
+              glib:nick="visible"/>
       <member name="locked"
-                value="2"
-                c:identifier="GTK_ACCEL_LOCKED"
-                glib:nick="locked"/>
+              value="2"
+              c:identifier="GTK_ACCEL_LOCKED"
+              glib:nick="locked"/>
       <member name="mask"
-                value="7"
-                c:identifier="GTK_ACCEL_MASK"
-                glib:nick="mask"/>
+              value="7"
+              c:identifier="GTK_ACCEL_MASK"
+              glib:nick="mask"/>
     </bitfield>
     <record name="GtkAccelKey" c:type="GtkAccelKey">
       <field name="accel_key">
@@ -1223,7 +1223,7 @@
     </record>
     <callback name="GtkAccelGroupActivate">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="accel_group">
@@ -1242,7 +1242,7 @@
     </callback>
     <callback name="GtkAccelGroupFindFunc">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="key">
@@ -1252,7 +1252,7 @@
           <type name="GClosure*" c:type="GClosure*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
@@ -1279,7 +1279,7 @@
       </constructor>
       <method name="lock" c:identifier="gtk_accel_group_lock">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="accel_group">
@@ -1289,7 +1289,7 @@
       </method>
       <method name="unlock" c:identifier="gtk_accel_group_unlock">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="accel_group">
@@ -1299,7 +1299,7 @@
       </method>
       <method name="connect" c:identifier="gtk_accel_group_connect">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="accel_group">
@@ -1322,14 +1322,14 @@
       <method name="connect_by_path"
               c:identifier="gtk_accel_group_connect_by_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="accel_group">
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="accel_path">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="closure">
             <type name="GClosure" c:type="GClosure*"/>
@@ -1338,7 +1338,7 @@
       </method>
       <method name="disconnect" c:identifier="gtk_accel_group_disconnect">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="accel_group">
@@ -1352,7 +1352,7 @@
       <method name="disconnect_key"
               c:identifier="gtk_accel_group_disconnect_key">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="accel_group">
@@ -1368,7 +1368,7 @@
       </method>
       <method name="activate" c:identifier="gtk_accel_group_activate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="accel_group">
@@ -1400,7 +1400,7 @@
             <type name="GtkAccelGroupFindFunc" c:type="GtkAccelGroupFindFunc"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
@@ -1425,7 +1425,7 @@
       </method>
       <callback name="accel_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="accel_group">
@@ -1444,27 +1444,27 @@
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <glib:signal name="accel-activate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -1480,7 +1480,7 @@
       </glib:signal>
       <glib:signal name="accel-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -1497,7 +1497,7 @@
     </class>
     <function name="accel_group_attach" c:identifier="_gtk_accel_group_attach">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="accel_group">
@@ -1510,7 +1510,7 @@
     </function>
     <function name="accel_group_detach" c:identifier="_gtk_accel_group_detach">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="accel_group">
@@ -1524,7 +1524,7 @@
     <function name="accel_groups_activate"
               c:identifier="gtk_accel_groups_activate">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -1551,7 +1551,7 @@
     </function>
     <function name="accelerator_valid" c:identifier="gtk_accelerator_valid">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="keyval">
@@ -1564,11 +1564,11 @@
     </function>
     <function name="accelerator_parse" c:identifier="gtk_accelerator_parse">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="accelerator">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="accelerator_key">
           <type name="guint" c:type="guint*"/>
@@ -1580,7 +1580,7 @@
     </function>
     <function name="accelerator_name" c:identifier="gtk_accelerator_name">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="accelerator_key">
@@ -1594,7 +1594,7 @@
     <function name="accelerator_get_label"
               c:identifier="gtk_accelerator_get_label">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="accelerator_key">
@@ -1608,7 +1608,7 @@
     <function name="accelerator_set_default_mod_mask"
               c:identifier="gtk_accelerator_set_default_mod_mask">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="default_mod_mask">
@@ -1625,7 +1625,7 @@
     <function name="accel_group_reconnect"
               c:identifier="_gtk_accel_group_reconnect">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="accel_group">
@@ -1641,795 +1641,934 @@
                  glib:type-name="GtkAssistantPageType"
                  glib:get-type="gtk_assistant_page_type_get_type">
       <member name="content"
-                value="0"
-                c:identifier="GTK_ASSISTANT_PAGE_CONTENT"
-                glib:nick="content"/>
+              value="0"
+              c:identifier="GTK_ASSISTANT_PAGE_CONTENT"
+              glib:nick="content"/>
       <member name="intro"
-                value="1"
-                c:identifier="GTK_ASSISTANT_PAGE_INTRO"
-                glib:nick="intro"/>
+              value="1"
+              c:identifier="GTK_ASSISTANT_PAGE_INTRO"
+              glib:nick="intro"/>
       <member name="confirm"
-                value="2"
-                c:identifier="GTK_ASSISTANT_PAGE_CONFIRM"
-                glib:nick="confirm"/>
+              value="2"
+              c:identifier="GTK_ASSISTANT_PAGE_CONFIRM"
+              glib:nick="confirm"/>
       <member name="summary"
-                value="3"
-                c:identifier="GTK_ASSISTANT_PAGE_SUMMARY"
-                glib:nick="summary"/>
+              value="3"
+              c:identifier="GTK_ASSISTANT_PAGE_SUMMARY"
+              glib:nick="summary"/>
       <member name="progress"
-                value="4"
-                c:identifier="GTK_ASSISTANT_PAGE_PROGRESS"
-                glib:nick="progress"/>
+              value="4"
+              c:identifier="GTK_ASSISTANT_PAGE_PROGRESS"
+              glib:nick="progress"/>
     </enumeration>
     <enumeration name="BuilderError"
                  c:type="GtkBuilderError"
                  glib:type-name="GtkBuilderError"
                  glib:get-type="gtk_builder_error_get_type">
-      <member name="version-mismatch"
-                value="0"
-                c:identifier="GTK_BUILDER_ERROR_VERSION_MISMATCH"
-                glib:nick="version-mismatch"/>
       <member name="invalid-type-function"
-                value="1"
-                c:identifier="GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION"
-                glib:nick="invalid-type-function"/>
+              value="0"
+              c:identifier="GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION"
+              glib:nick="invalid-type-function"/>
       <member name="unhandled-tag"
-                value="2"
-                c:identifier="GTK_BUILDER_ERROR_UNHANDLED_TAG"
-                glib:nick="unhandled-tag"/>
+              value="1"
+              c:identifier="GTK_BUILDER_ERROR_UNHANDLED_TAG"
+              glib:nick="unhandled-tag"/>
       <member name="missing-attribute"
-                value="3"
-                c:identifier="GTK_BUILDER_ERROR_MISSING_ATTRIBUTE"
-                glib:nick="missing-attribute"/>
+              value="2"
+              c:identifier="GTK_BUILDER_ERROR_MISSING_ATTRIBUTE"
+              glib:nick="missing-attribute"/>
       <member name="invalid-attribute"
-                value="4"
-                c:identifier="GTK_BUILDER_ERROR_INVALID_ATTRIBUTE"
-                glib:nick="invalid-attribute"/>
+              value="3"
+              c:identifier="GTK_BUILDER_ERROR_INVALID_ATTRIBUTE"
+              glib:nick="invalid-attribute"/>
       <member name="invalid-tag"
-                value="5"
-                c:identifier="GTK_BUILDER_ERROR_INVALID_TAG"
-                glib:nick="invalid-tag"/>
+              value="4"
+              c:identifier="GTK_BUILDER_ERROR_INVALID_TAG"
+              glib:nick="invalid-tag"/>
       <member name="missing-property-value"
-                value="6"
-                c:identifier="GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE"
-                glib:nick="missing-property-value"/>
+              value="5"
+              c:identifier="GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE"
+              glib:nick="missing-property-value"/>
       <member name="invalid-value"
-                value="7"
-                c:identifier="GTK_BUILDER_ERROR_INVALID_VALUE"
-                glib:nick="invalid-value"/>
+              value="6"
+              c:identifier="GTK_BUILDER_ERROR_INVALID_VALUE"
+              glib:nick="invalid-value"/>
     </enumeration>
     <bitfield name="CalendarDisplayOptions"
               c:type="GtkCalendarDisplayOptions"
               glib:type-name="GtkCalendarDisplayOptions"
               glib:get-type="gtk_calendar_display_options_get_type">
       <member name="show-heading"
-                value="1"
-                c:identifier="GTK_CALENDAR_SHOW_HEADING"
-                glib:nick="show-heading"/>
+              value="1"
+              c:identifier="GTK_CALENDAR_SHOW_HEADING"
+              glib:nick="show-heading"/>
       <member name="show-day-names"
-                value="2"
-                c:identifier="GTK_CALENDAR_SHOW_DAY_NAMES"
-                glib:nick="show-day-names"/>
+              value="2"
+              c:identifier="GTK_CALENDAR_SHOW_DAY_NAMES"
+              glib:nick="show-day-names"/>
       <member name="no-month-change"
-                value="4"
-                c:identifier="GTK_CALENDAR_NO_MONTH_CHANGE"
-                glib:nick="no-month-change"/>
+              value="4"
+              c:identifier="GTK_CALENDAR_NO_MONTH_CHANGE"
+              glib:nick="no-month-change"/>
       <member name="show-week-numbers"
-                value="8"
-                c:identifier="GTK_CALENDAR_SHOW_WEEK_NUMBERS"
-                glib:nick="show-week-numbers"/>
+              value="8"
+              c:identifier="GTK_CALENDAR_SHOW_WEEK_NUMBERS"
+              glib:nick="show-week-numbers"/>
       <member name="week-start-monday"
-                value="16"
-                c:identifier="GTK_CALENDAR_WEEK_START_MONDAY"
-                glib:nick="week-start-monday"/>
-      <member name="show-details"
-                value="32"
-                c:identifier="GTK_CALENDAR_SHOW_DETAILS"
-                glib:nick="show-details"/>
+              value="16"
+              c:identifier="GTK_CALENDAR_WEEK_START_MONDAY"
+              glib:nick="week-start-monday"/>
     </bitfield>
     <bitfield name="CellRendererState"
               c:type="GtkCellRendererState"
               glib:type-name="GtkCellRendererState"
               glib:get-type="gtk_cell_renderer_state_get_type">
       <member name="selected"
-                value="1"
-                c:identifier="GTK_CELL_RENDERER_SELECTED"
-                glib:nick="selected"/>
+              value="1"
+              c:identifier="GTK_CELL_RENDERER_SELECTED"
+              glib:nick="selected"/>
       <member name="prelit"
-                value="2"
-                c:identifier="GTK_CELL_RENDERER_PRELIT"
-                glib:nick="prelit"/>
+              value="2"
+              c:identifier="GTK_CELL_RENDERER_PRELIT"
+              glib:nick="prelit"/>
       <member name="insensitive"
-                value="4"
-                c:identifier="GTK_CELL_RENDERER_INSENSITIVE"
-                glib:nick="insensitive"/>
+              value="4"
+              c:identifier="GTK_CELL_RENDERER_INSENSITIVE"
+              glib:nick="insensitive"/>
       <member name="sorted"
-                value="8"
-                c:identifier="GTK_CELL_RENDERER_SORTED"
-                glib:nick="sorted"/>
+              value="8"
+              c:identifier="GTK_CELL_RENDERER_SORTED"
+              glib:nick="sorted"/>
       <member name="focused"
-                value="16"
-                c:identifier="GTK_CELL_RENDERER_FOCUSED"
-                glib:nick="focused"/>
+              value="16"
+              c:identifier="GTK_CELL_RENDERER_FOCUSED"
+              glib:nick="focused"/>
     </bitfield>
     <enumeration name="CellRendererMode"
                  c:type="GtkCellRendererMode"
                  glib:type-name="GtkCellRendererMode"
                  glib:get-type="gtk_cell_renderer_mode_get_type">
       <member name="inert"
-                value="0"
-                c:identifier="GTK_CELL_RENDERER_MODE_INERT"
-                glib:nick="inert"/>
+              value="0"
+              c:identifier="GTK_CELL_RENDERER_MODE_INERT"
+              glib:nick="inert"/>
       <member name="activatable"
-                value="1"
-                c:identifier="GTK_CELL_RENDERER_MODE_ACTIVATABLE"
-                glib:nick="activatable"/>
+              value="1"
+              c:identifier="GTK_CELL_RENDERER_MODE_ACTIVATABLE"
+              glib:nick="activatable"/>
       <member name="editable"
-                value="2"
-                c:identifier="GTK_CELL_RENDERER_MODE_EDITABLE"
-                glib:nick="editable"/>
+              value="2"
+              c:identifier="GTK_CELL_RENDERER_MODE_EDITABLE"
+              glib:nick="editable"/>
     </enumeration>
     <enumeration name="CellRendererAccelMode"
                  c:type="GtkCellRendererAccelMode"
                  glib:type-name="GtkCellRendererAccelMode"
                  glib:get-type="gtk_cell_renderer_accel_mode_get_type">
       <member name="gtk"
-                value="0"
-                c:identifier="GTK_CELL_RENDERER_ACCEL_MODE_GTK"
-                glib:nick="gtk"/>
+              value="0"
+              c:identifier="GTK_CELL_RENDERER_ACCEL_MODE_GTK"
+              glib:nick="gtk"/>
       <member name="other"
-                value="1"
-                c:identifier="GTK_CELL_RENDERER_ACCEL_MODE_OTHER"
-                glib:nick="other"/>
+              value="1"
+              c:identifier="GTK_CELL_RENDERER_ACCEL_MODE_OTHER"
+              glib:nick="other"/>
+    </enumeration>
+    <enumeration name="CellType"
+                 c:type="GtkCellType"
+                 glib:type-name="GtkCellType"
+                 glib:get-type="gtk_cell_type_get_type">
+      <member name="empty"
+              value="0"
+              c:identifier="GTK_CELL_EMPTY"
+              glib:nick="empty"/>
+      <member name="text"
+              value="1"
+              c:identifier="GTK_CELL_TEXT"
+              glib:nick="text"/>
+      <member name="pixmap"
+              value="2"
+              c:identifier="GTK_CELL_PIXMAP"
+              glib:nick="pixmap"/>
+      <member name="pixtext"
+              value="3"
+              c:identifier="GTK_CELL_PIXTEXT"
+              glib:nick="pixtext"/>
+      <member name="widget"
+              value="4"
+              c:identifier="GTK_CELL_WIDGET"
+              glib:nick="widget"/>
+    </enumeration>
+    <enumeration name="CListDragPos"
+                 c:type="GtkCListDragPos"
+                 glib:type-name="GtkCListDragPos"
+                 glib:get-type="gtk_clist_drag_pos_get_type">
+      <member name="none"
+              value="0"
+              c:identifier="GTK_CLIST_DRAG_NONE"
+              glib:nick="none"/>
+      <member name="before"
+              value="1"
+              c:identifier="GTK_CLIST_DRAG_BEFORE"
+              glib:nick="before"/>
+      <member name="into"
+              value="2"
+              c:identifier="GTK_CLIST_DRAG_INTO"
+              glib:nick="into"/>
+      <member name="after"
+              value="3"
+              c:identifier="GTK_CLIST_DRAG_AFTER"
+              glib:nick="after"/>
+    </enumeration>
+    <bitfield name="ButtonAction"
+              c:type="GtkButtonAction"
+              glib:type-name="GtkButtonAction"
+              glib:get-type="gtk_button_action_get_type">
+      <member name="ignored"
+              value="0"
+              c:identifier="GTK_BUTTON_IGNORED"
+              glib:nick="ignored"/>
+      <member name="selects"
+              value="1"
+              c:identifier="GTK_BUTTON_SELECTS"
+              glib:nick="selects"/>
+      <member name="drags"
+              value="2"
+              c:identifier="GTK_BUTTON_DRAGS"
+              glib:nick="drags"/>
+      <member name="expands"
+              value="4"
+              c:identifier="GTK_BUTTON_EXPANDS"
+              glib:nick="expands"/>
+    </bitfield>
+    <enumeration name="CTreePos"
+                 c:type="GtkCTreePos"
+                 glib:type-name="GtkCTreePos"
+                 glib:get-type="gtk_ctree_pos_get_type">
+      <member name="before"
+              value="0"
+              c:identifier="GTK_CTREE_POS_BEFORE"
+              glib:nick="before"/>
+      <member name="as-child"
+              value="1"
+              c:identifier="GTK_CTREE_POS_AS_CHILD"
+              glib:nick="as-child"/>
+      <member name="after"
+              value="2"
+              c:identifier="GTK_CTREE_POS_AFTER"
+              glib:nick="after"/>
+    </enumeration>
+    <enumeration name="CTreeLineStyle"
+                 c:type="GtkCTreeLineStyle"
+                 glib:type-name="GtkCTreeLineStyle"
+                 glib:get-type="gtk_ctree_line_style_get_type">
+      <member name="none"
+              value="0"
+              c:identifier="GTK_CTREE_LINES_NONE"
+              glib:nick="none"/>
+      <member name="solid"
+              value="1"
+              c:identifier="GTK_CTREE_LINES_SOLID"
+              glib:nick="solid"/>
+      <member name="dotted"
+              value="2"
+              c:identifier="GTK_CTREE_LINES_DOTTED"
+              glib:nick="dotted"/>
+      <member name="tabbed"
+              value="3"
+              c:identifier="GTK_CTREE_LINES_TABBED"
+              glib:nick="tabbed"/>
+    </enumeration>
+    <enumeration name="CTreeExpanderStyle"
+                 c:type="GtkCTreeExpanderStyle"
+                 glib:type-name="GtkCTreeExpanderStyle"
+                 glib:get-type="gtk_ctree_expander_style_get_type">
+      <member name="none"
+              value="0"
+              c:identifier="GTK_CTREE_EXPANDER_NONE"
+              glib:nick="none"/>
+      <member name="square"
+              value="1"
+              c:identifier="GTK_CTREE_EXPANDER_SQUARE"
+              glib:nick="square"/>
+      <member name="triangle"
+              value="2"
+              c:identifier="GTK_CTREE_EXPANDER_TRIANGLE"
+              glib:nick="triangle"/>
+      <member name="circular"
+              value="3"
+              c:identifier="GTK_CTREE_EXPANDER_CIRCULAR"
+              glib:nick="circular"/>
+    </enumeration>
+    <enumeration name="CTreeExpansionType"
+                 c:type="GtkCTreeExpansionType"
+                 glib:type-name="GtkCTreeExpansionType"
+                 glib:get-type="gtk_ctree_expansion_type_get_type">
+      <member name="expand"
+              value="0"
+              c:identifier="GTK_CTREE_EXPANSION_EXPAND"
+              glib:nick="expand"/>
+      <member name="expand-recursive"
+              value="1"
+              c:identifier="GTK_CTREE_EXPANSION_EXPAND_RECURSIVE"
+              glib:nick="expand-recursive"/>
+      <member name="collapse"
+              value="2"
+              c:identifier="GTK_CTREE_EXPANSION_COLLAPSE"
+              glib:nick="collapse"/>
+      <member name="collapse-recursive"
+              value="3"
+              c:identifier="GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE"
+              glib:nick="collapse-recursive"/>
+      <member name="toggle"
+              value="4"
+              c:identifier="GTK_CTREE_EXPANSION_TOGGLE"
+              glib:nick="toggle"/>
+      <member name="toggle-recursive"
+              value="5"
+              c:identifier="GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE"
+              glib:nick="toggle-recursive"/>
     </enumeration>
     <bitfield name="DebugFlag"
               c:type="GtkDebugFlag"
               glib:type-name="GtkDebugFlag"
               glib:get-type="gtk_debug_flag_get_type">
       <member name="misc"
-                value="1"
-                c:identifier="GTK_DEBUG_MISC"
-                glib:nick="misc"/>
+              value="1"
+              c:identifier="GTK_DEBUG_MISC"
+              glib:nick="misc"/>
       <member name="plugsocket"
-                value="2"
-                c:identifier="GTK_DEBUG_PLUGSOCKET"
-                glib:nick="plugsocket"/>
+              value="2"
+              c:identifier="GTK_DEBUG_PLUGSOCKET"
+              glib:nick="plugsocket"/>
       <member name="text"
-                value="4"
-                c:identifier="GTK_DEBUG_TEXT"
-                glib:nick="text"/>
+              value="4"
+              c:identifier="GTK_DEBUG_TEXT"
+              glib:nick="text"/>
       <member name="tree"
-                value="8"
-                c:identifier="GTK_DEBUG_TREE"
-                glib:nick="tree"/>
+              value="8"
+              c:identifier="GTK_DEBUG_TREE"
+              glib:nick="tree"/>
       <member name="updates"
-                value="16"
-                c:identifier="GTK_DEBUG_UPDATES"
-                glib:nick="updates"/>
+              value="16"
+              c:identifier="GTK_DEBUG_UPDATES"
+              glib:nick="updates"/>
       <member name="keybindings"
-                value="32"
-                c:identifier="GTK_DEBUG_KEYBINDINGS"
-                glib:nick="keybindings"/>
+              value="32"
+              c:identifier="GTK_DEBUG_KEYBINDINGS"
+              glib:nick="keybindings"/>
       <member name="multihead"
-                value="64"
-                c:identifier="GTK_DEBUG_MULTIHEAD"
-                glib:nick="multihead"/>
+              value="64"
+              c:identifier="GTK_DEBUG_MULTIHEAD"
+              glib:nick="multihead"/>
       <member name="modules"
-                value="128"
-                c:identifier="GTK_DEBUG_MODULES"
-                glib:nick="modules"/>
+              value="128"
+              c:identifier="GTK_DEBUG_MODULES"
+              glib:nick="modules"/>
       <member name="geometry"
-                value="256"
-                c:identifier="GTK_DEBUG_GEOMETRY"
-                glib:nick="geometry"/>
+              value="256"
+              c:identifier="GTK_DEBUG_GEOMETRY"
+              glib:nick="geometry"/>
       <member name="icontheme"
-                value="512"
-                c:identifier="GTK_DEBUG_ICONTHEME"
-                glib:nick="icontheme"/>
+              value="512"
+              c:identifier="GTK_DEBUG_ICONTHEME"
+              glib:nick="icontheme"/>
       <member name="printing"
-                value="1024"
-                c:identifier="GTK_DEBUG_PRINTING"
-                glib:nick="printing"/>
+              value="1024"
+              c:identifier="GTK_DEBUG_PRINTING"
+              glib:nick="printing"/>
       <member name="builder"
-                value="2048"
-                c:identifier="GTK_DEBUG_BUILDER"
-                glib:nick="builder"/>
+              value="2048"
+              c:identifier="GTK_DEBUG_BUILDER"
+              glib:nick="builder"/>
     </bitfield>
     <bitfield name="DialogFlags"
               c:type="GtkDialogFlags"
               glib:type-name="GtkDialogFlags"
               glib:get-type="gtk_dialog_flags_get_type">
       <member name="modal"
-                value="1"
-                c:identifier="GTK_DIALOG_MODAL"
-                glib:nick="modal"/>
+              value="1"
+              c:identifier="GTK_DIALOG_MODAL"
+              glib:nick="modal"/>
       <member name="destroy-with-parent"
-                value="2"
-                c:identifier="GTK_DIALOG_DESTROY_WITH_PARENT"
-                glib:nick="destroy-with-parent"/>
+              value="2"
+              c:identifier="GTK_DIALOG_DESTROY_WITH_PARENT"
+              glib:nick="destroy-with-parent"/>
       <member name="no-separator"
-                value="4"
-                c:identifier="GTK_DIALOG_NO_SEPARATOR"
-                glib:nick="no-separator"/>
+              value="4"
+              c:identifier="GTK_DIALOG_NO_SEPARATOR"
+              glib:nick="no-separator"/>
     </bitfield>
     <enumeration name="ResponseType"
                  c:type="GtkResponseType"
                  glib:type-name="GtkResponseType"
                  glib:get-type="gtk_response_type_get_type">
       <member name="none"
-                value="-1"
-                c:identifier="GTK_RESPONSE_NONE"
-                glib:nick="none"/>
+              value="-1"
+              c:identifier="GTK_RESPONSE_NONE"
+              glib:nick="none"/>
       <member name="reject"
-                value="-2"
-                c:identifier="GTK_RESPONSE_REJECT"
-                glib:nick="reject"/>
+              value="-2"
+              c:identifier="GTK_RESPONSE_REJECT"
+              glib:nick="reject"/>
       <member name="accept"
-                value="-3"
-                c:identifier="GTK_RESPONSE_ACCEPT"
-                glib:nick="accept"/>
+              value="-3"
+              c:identifier="GTK_RESPONSE_ACCEPT"
+              glib:nick="accept"/>
       <member name="delete-event"
-                value="-4"
-                c:identifier="GTK_RESPONSE_DELETE_EVENT"
-                glib:nick="delete-event"/>
+              value="-4"
+              c:identifier="GTK_RESPONSE_DELETE_EVENT"
+              glib:nick="delete-event"/>
       <member name="ok"
-                value="-5"
-                c:identifier="GTK_RESPONSE_OK"
-                glib:nick="ok"/>
+              value="-5"
+              c:identifier="GTK_RESPONSE_OK"
+              glib:nick="ok"/>
       <member name="cancel"
-                value="-6"
-                c:identifier="GTK_RESPONSE_CANCEL"
-                glib:nick="cancel"/>
+              value="-6"
+              c:identifier="GTK_RESPONSE_CANCEL"
+              glib:nick="cancel"/>
       <member name="close"
-                value="-7"
-                c:identifier="GTK_RESPONSE_CLOSE"
-                glib:nick="close"/>
+              value="-7"
+              c:identifier="GTK_RESPONSE_CLOSE"
+              glib:nick="close"/>
       <member name="yes"
-                value="-8"
-                c:identifier="GTK_RESPONSE_YES"
-                glib:nick="yes"/>
+              value="-8"
+              c:identifier="GTK_RESPONSE_YES"
+              glib:nick="yes"/>
       <member name="no"
-                value="-9"
-                c:identifier="GTK_RESPONSE_NO"
-                glib:nick="no"/>
+              value="-9"
+              c:identifier="GTK_RESPONSE_NO"
+              glib:nick="no"/>
       <member name="apply"
-                value="-10"
-                c:identifier="GTK_RESPONSE_APPLY"
-                glib:nick="apply"/>
+              value="-10"
+              c:identifier="GTK_RESPONSE_APPLY"
+              glib:nick="apply"/>
       <member name="help"
-                value="-11"
-                c:identifier="GTK_RESPONSE_HELP"
-                glib:nick="help"/>
+              value="-11"
+              c:identifier="GTK_RESPONSE_HELP"
+              glib:nick="help"/>
     </enumeration>
     <bitfield name="DestDefaults"
               c:type="GtkDestDefaults"
               glib:type-name="GtkDestDefaults"
               glib:get-type="gtk_dest_defaults_get_type">
       <member name="motion"
-                value="1"
-                c:identifier="GTK_DEST_DEFAULT_MOTION"
-                glib:nick="motion"/>
+              value="1"
+              c:identifier="GTK_DEST_DEFAULT_MOTION"
+              glib:nick="motion"/>
       <member name="highlight"
-                value="2"
-                c:identifier="GTK_DEST_DEFAULT_HIGHLIGHT"
-                glib:nick="highlight"/>
+              value="2"
+              c:identifier="GTK_DEST_DEFAULT_HIGHLIGHT"
+              glib:nick="highlight"/>
       <member name="drop"
-                value="4"
-                c:identifier="GTK_DEST_DEFAULT_DROP"
-                glib:nick="drop"/>
+              value="4"
+              c:identifier="GTK_DEST_DEFAULT_DROP"
+              glib:nick="drop"/>
       <member name="all"
-                value="7"
-                c:identifier="GTK_DEST_DEFAULT_ALL"
-                glib:nick="all"/>
+              value="7"
+              c:identifier="GTK_DEST_DEFAULT_ALL"
+              glib:nick="all"/>
     </bitfield>
     <bitfield name="TargetFlags"
               c:type="GtkTargetFlags"
               glib:type-name="GtkTargetFlags"
               glib:get-type="gtk_target_flags_get_type">
       <member name="same-app"
-                value="1"
-                c:identifier="GTK_TARGET_SAME_APP"
-                glib:nick="same-app"/>
+              value="1"
+              c:identifier="GTK_TARGET_SAME_APP"
+              glib:nick="same-app"/>
       <member name="same-widget"
-                value="2"
-                c:identifier="GTK_TARGET_SAME_WIDGET"
-                glib:nick="same-widget"/>
+              value="2"
+              c:identifier="GTK_TARGET_SAME_WIDGET"
+              glib:nick="same-widget"/>
       <member name="other-app"
-                value="4"
-                c:identifier="GTK_TARGET_OTHER_APP"
-                glib:nick="other-app"/>
+              value="4"
+              c:identifier="GTK_TARGET_OTHER_APP"
+              glib:nick="other-app"/>
       <member name="other-widget"
-                value="8"
-                c:identifier="GTK_TARGET_OTHER_WIDGET"
-                glib:nick="other-widget"/>
+              value="8"
+              c:identifier="GTK_TARGET_OTHER_WIDGET"
+              glib:nick="other-widget"/>
     </bitfield>
     <enumeration name="FileChooserAction"
                  c:type="GtkFileChooserAction"
                  glib:type-name="GtkFileChooserAction"
                  glib:get-type="gtk_file_chooser_action_get_type">
       <member name="open"
-                value="0"
-                c:identifier="GTK_FILE_CHOOSER_ACTION_OPEN"
-                glib:nick="open"/>
+              value="0"
+              c:identifier="GTK_FILE_CHOOSER_ACTION_OPEN"
+              glib:nick="open"/>
       <member name="save"
-                value="1"
-                c:identifier="GTK_FILE_CHOOSER_ACTION_SAVE"
-                glib:nick="save"/>
+              value="1"
+              c:identifier="GTK_FILE_CHOOSER_ACTION_SAVE"
+              glib:nick="save"/>
       <member name="select-folder"
-                value="2"
-                c:identifier="GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER"
-                glib:nick="select-folder"/>
+              value="2"
+              c:identifier="GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER"
+              glib:nick="select-folder"/>
       <member name="create-folder"
-                value="3"
-                c:identifier="GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER"
-                glib:nick="create-folder"/>
+              value="3"
+              c:identifier="GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER"
+              glib:nick="create-folder"/>
     </enumeration>
     <enumeration name="FileChooserConfirmation"
                  c:type="GtkFileChooserConfirmation"
                  glib:type-name="GtkFileChooserConfirmation"
                  glib:get-type="gtk_file_chooser_confirmation_get_type">
       <member name="confirm"
-                value="0"
-                c:identifier="GTK_FILE_CHOOSER_CONFIRMATION_CONFIRM"
-                glib:nick="confirm"/>
+              value="0"
+              c:identifier="GTK_FILE_CHOOSER_CONFIRMATION_CONFIRM"
+              glib:nick="confirm"/>
       <member name="accept-filename"
-                value="1"
-                c:identifier="GTK_FILE_CHOOSER_CONFIRMATION_ACCEPT_FILENAME"
-                glib:nick="accept-filename"/>
+              value="1"
+              c:identifier="GTK_FILE_CHOOSER_CONFIRMATION_ACCEPT_FILENAME"
+              glib:nick="accept-filename"/>
       <member name="select-again"
-                value="2"
-                c:identifier="GTK_FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN"
-                glib:nick="select-again"/>
+              value="2"
+              c:identifier="GTK_FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN"
+              glib:nick="select-again"/>
     </enumeration>
     <enumeration name="FileChooserError"
                  c:type="GtkFileChooserError"
                  glib:type-name="GtkFileChooserError"
                  glib:get-type="gtk_file_chooser_error_get_type">
       <member name="nonexistent"
-                value="0"
-                c:identifier="GTK_FILE_CHOOSER_ERROR_NONEXISTENT"
-                glib:nick="nonexistent"/>
+              value="0"
+              c:identifier="GTK_FILE_CHOOSER_ERROR_NONEXISTENT"
+              glib:nick="nonexistent"/>
       <member name="bad-filename"
-                value="1"
-                c:identifier="GTK_FILE_CHOOSER_ERROR_BAD_FILENAME"
-                glib:nick="bad-filename"/>
+              value="1"
+              c:identifier="GTK_FILE_CHOOSER_ERROR_BAD_FILENAME"
+              glib:nick="bad-filename"/>
       <member name="already-exists"
-                value="2"
-                c:identifier="GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS"
-                glib:nick="already-exists"/>
+              value="2"
+              c:identifier="GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS"
+              glib:nick="already-exists"/>
     </enumeration>
     <bitfield name="FileFilterFlags"
               c:type="GtkFileFilterFlags"
               glib:type-name="GtkFileFilterFlags"
               glib:get-type="gtk_file_filter_flags_get_type">
       <member name="filename"
-                value="1"
-                c:identifier="GTK_FILE_FILTER_FILENAME"
-                glib:nick="filename"/>
+              value="1"
+              c:identifier="GTK_FILE_FILTER_FILENAME"
+              glib:nick="filename"/>
       <member name="uri"
-                value="2"
-                c:identifier="GTK_FILE_FILTER_URI"
-                glib:nick="uri"/>
+              value="2"
+              c:identifier="GTK_FILE_FILTER_URI"
+              glib:nick="uri"/>
       <member name="display-name"
-                value="4"
-                c:identifier="GTK_FILE_FILTER_DISPLAY_NAME"
-                glib:nick="display-name"/>
+              value="4"
+              c:identifier="GTK_FILE_FILTER_DISPLAY_NAME"
+              glib:nick="display-name"/>
       <member name="mime-type"
-                value="8"
-                c:identifier="GTK_FILE_FILTER_MIME_TYPE"
-                glib:nick="mime-type"/>
+              value="8"
+              c:identifier="GTK_FILE_FILTER_MIME_TYPE"
+              glib:nick="mime-type"/>
     </bitfield>
     <bitfield name="IconLookupFlags"
               c:type="GtkIconLookupFlags"
               glib:type-name="GtkIconLookupFlags"
               glib:get-type="gtk_icon_lookup_flags_get_type">
       <member name="no-svg"
-                value="1"
-                c:identifier="GTK_ICON_LOOKUP_NO_SVG"
-                glib:nick="no-svg"/>
+              value="1"
+              c:identifier="GTK_ICON_LOOKUP_NO_SVG"
+              glib:nick="no-svg"/>
       <member name="force-svg"
-                value="2"
-                c:identifier="GTK_ICON_LOOKUP_FORCE_SVG"
-                glib:nick="force-svg"/>
+              value="2"
+              c:identifier="GTK_ICON_LOOKUP_FORCE_SVG"
+              glib:nick="force-svg"/>
       <member name="use-builtin"
-                value="4"
-                c:identifier="GTK_ICON_LOOKUP_USE_BUILTIN"
-                glib:nick="use-builtin"/>
+              value="4"
+              c:identifier="GTK_ICON_LOOKUP_USE_BUILTIN"
+              glib:nick="use-builtin"/>
       <member name="generic-fallback"
-                value="8"
-                c:identifier="GTK_ICON_LOOKUP_GENERIC_FALLBACK"
-                glib:nick="generic-fallback"/>
-      <member name="force-size"
-                value="16"
-                c:identifier="GTK_ICON_LOOKUP_FORCE_SIZE"
-                glib:nick="force-size"/>
+              value="8"
+              c:identifier="GTK_ICON_LOOKUP_GENERIC_FALLBACK"
+              glib:nick="generic-fallback"/>
     </bitfield>
     <enumeration name="IconThemeError"
                  c:type="GtkIconThemeError"
                  glib:type-name="GtkIconThemeError"
                  glib:get-type="gtk_icon_theme_error_get_type">
       <member name="not-found"
-                value="0"
-                c:identifier="GTK_ICON_THEME_NOT_FOUND"
-                glib:nick="not-found"/>
+              value="0"
+              c:identifier="GTK_ICON_THEME_NOT_FOUND"
+              glib:nick="not-found"/>
       <member name="failed"
-                value="1"
-                c:identifier="GTK_ICON_THEME_FAILED"
-                glib:nick="failed"/>
+              value="1"
+              c:identifier="GTK_ICON_THEME_FAILED"
+              glib:nick="failed"/>
     </enumeration>
     <enumeration name="IconViewDropPosition"
                  c:type="GtkIconViewDropPosition"
                  glib:type-name="GtkIconViewDropPosition"
                  glib:get-type="gtk_icon_view_drop_position_get_type">
       <member name="no-drop"
-                value="0"
-                c:identifier="GTK_ICON_VIEW_NO_DROP"
-                glib:nick="no-drop"/>
+              value="0"
+              c:identifier="GTK_ICON_VIEW_NO_DROP"
+              glib:nick="no-drop"/>
       <member name="drop-into"
-                value="1"
-                c:identifier="GTK_ICON_VIEW_DROP_INTO"
-                glib:nick="drop-into"/>
+              value="1"
+              c:identifier="GTK_ICON_VIEW_DROP_INTO"
+              glib:nick="drop-into"/>
       <member name="drop-left"
-                value="2"
-                c:identifier="GTK_ICON_VIEW_DROP_LEFT"
-                glib:nick="drop-left"/>
+              value="2"
+              c:identifier="GTK_ICON_VIEW_DROP_LEFT"
+              glib:nick="drop-left"/>
       <member name="drop-right"
-                value="3"
-                c:identifier="GTK_ICON_VIEW_DROP_RIGHT"
-                glib:nick="drop-right"/>
+              value="3"
+              c:identifier="GTK_ICON_VIEW_DROP_RIGHT"
+              glib:nick="drop-right"/>
       <member name="drop-above"
-                value="4"
-                c:identifier="GTK_ICON_VIEW_DROP_ABOVE"
-                glib:nick="drop-above"/>
+              value="4"
+              c:identifier="GTK_ICON_VIEW_DROP_ABOVE"
+              glib:nick="drop-above"/>
       <member name="drop-below"
-                value="5"
-                c:identifier="GTK_ICON_VIEW_DROP_BELOW"
-                glib:nick="drop-below"/>
+              value="5"
+              c:identifier="GTK_ICON_VIEW_DROP_BELOW"
+              glib:nick="drop-below"/>
     </enumeration>
     <enumeration name="ImageType"
                  c:type="GtkImageType"
                  glib:type-name="GtkImageType"
                  glib:get-type="gtk_image_type_get_type">
       <member name="empty"
-                value="0"
-                c:identifier="GTK_IMAGE_EMPTY"
-                glib:nick="empty"/>
+              value="0"
+              c:identifier="GTK_IMAGE_EMPTY"
+              glib:nick="empty"/>
       <member name="pixmap"
-                value="1"
-                c:identifier="GTK_IMAGE_PIXMAP"
-                glib:nick="pixmap"/>
+              value="1"
+              c:identifier="GTK_IMAGE_PIXMAP"
+              glib:nick="pixmap"/>
       <member name="image"
-                value="2"
-                c:identifier="GTK_IMAGE_IMAGE"
-                glib:nick="image"/>
+              value="2"
+              c:identifier="GTK_IMAGE_IMAGE"
+              glib:nick="image"/>
       <member name="pixbuf"
-                value="3"
-                c:identifier="GTK_IMAGE_PIXBUF"
-                glib:nick="pixbuf"/>
+              value="3"
+              c:identifier="GTK_IMAGE_PIXBUF"
+              glib:nick="pixbuf"/>
       <member name="stock"
-                value="4"
-                c:identifier="GTK_IMAGE_STOCK"
-                glib:nick="stock"/>
+              value="4"
+              c:identifier="GTK_IMAGE_STOCK"
+              glib:nick="stock"/>
       <member name="icon-set"
-                value="5"
-                c:identifier="GTK_IMAGE_ICON_SET"
-                glib:nick="icon-set"/>
+              value="5"
+              c:identifier="GTK_IMAGE_ICON_SET"
+              glib:nick="icon-set"/>
       <member name="animation"
-                value="6"
-                c:identifier="GTK_IMAGE_ANIMATION"
-                glib:nick="animation"/>
+              value="6"
+              c:identifier="GTK_IMAGE_ANIMATION"
+              glib:nick="animation"/>
       <member name="icon-name"
-                value="7"
-                c:identifier="GTK_IMAGE_ICON_NAME"
-                glib:nick="icon-name"/>
-      <member name="gicon"
-                value="8"
-                c:identifier="GTK_IMAGE_GICON"
-                glib:nick="gicon"/>
+              value="7"
+              c:identifier="GTK_IMAGE_ICON_NAME"
+              glib:nick="icon-name"/>
     </enumeration>
     <enumeration name="MessageType"
                  c:type="GtkMessageType"
                  glib:type-name="GtkMessageType"
                  glib:get-type="gtk_message_type_get_type">
       <member name="info"
-                value="0"
-                c:identifier="GTK_MESSAGE_INFO"
-                glib:nick="info"/>
+              value="0"
+              c:identifier="GTK_MESSAGE_INFO"
+              glib:nick="info"/>
       <member name="warning"
-                value="1"
-                c:identifier="GTK_MESSAGE_WARNING"
-                glib:nick="warning"/>
+              value="1"
+              c:identifier="GTK_MESSAGE_WARNING"
+              glib:nick="warning"/>
       <member name="question"
-                value="2"
-                c:identifier="GTK_MESSAGE_QUESTION"
-                glib:nick="question"/>
+              value="2"
+              c:identifier="GTK_MESSAGE_QUESTION"
+              glib:nick="question"/>
       <member name="error"
-                value="3"
-                c:identifier="GTK_MESSAGE_ERROR"
-                glib:nick="error"/>
+              value="3"
+              c:identifier="GTK_MESSAGE_ERROR"
+              glib:nick="error"/>
       <member name="other"
-                value="4"
-                c:identifier="GTK_MESSAGE_OTHER"
-                glib:nick="other"/>
+              value="4"
+              c:identifier="GTK_MESSAGE_OTHER"
+              glib:nick="other"/>
     </enumeration>
     <enumeration name="ButtonsType"
                  c:type="GtkButtonsType"
                  glib:type-name="GtkButtonsType"
                  glib:get-type="gtk_buttons_type_get_type">
       <member name="none"
-                value="0"
-                c:identifier="GTK_BUTTONS_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="GTK_BUTTONS_NONE"
+              glib:nick="none"/>
       <member name="ok"
-                value="1"
-                c:identifier="GTK_BUTTONS_OK"
-                glib:nick="ok"/>
+              value="1"
+              c:identifier="GTK_BUTTONS_OK"
+              glib:nick="ok"/>
       <member name="close"
-                value="2"
-                c:identifier="GTK_BUTTONS_CLOSE"
-                glib:nick="close"/>
+              value="2"
+              c:identifier="GTK_BUTTONS_CLOSE"
+              glib:nick="close"/>
       <member name="cancel"
-                value="3"
-                c:identifier="GTK_BUTTONS_CANCEL"
-                glib:nick="cancel"/>
+              value="3"
+              c:identifier="GTK_BUTTONS_CANCEL"
+              glib:nick="cancel"/>
       <member name="yes-no"
-                value="4"
-                c:identifier="GTK_BUTTONS_YES_NO"
-                glib:nick="yes-no"/>
+              value="4"
+              c:identifier="GTK_BUTTONS_YES_NO"
+              glib:nick="yes-no"/>
       <member name="ok-cancel"
-                value="5"
-                c:identifier="GTK_BUTTONS_OK_CANCEL"
-                glib:nick="ok-cancel"/>
+              value="5"
+              c:identifier="GTK_BUTTONS_OK_CANCEL"
+              glib:nick="ok-cancel"/>
     </enumeration>
     <enumeration name="NotebookTab"
                  c:type="GtkNotebookTab"
                  glib:type-name="GtkNotebookTab"
                  glib:get-type="gtk_notebook_tab_get_type">
       <member name="first"
-                value="0"
-                c:identifier="GTK_NOTEBOOK_TAB_FIRST"
-                glib:nick="first"/>
+              value="0"
+              c:identifier="GTK_NOTEBOOK_TAB_FIRST"
+              glib:nick="first"/>
       <member name="last"
-                value="1"
-                c:identifier="GTK_NOTEBOOK_TAB_LAST"
-                glib:nick="last"/>
+              value="1"
+              c:identifier="GTK_NOTEBOOK_TAB_LAST"
+              glib:nick="last"/>
     </enumeration>
     <bitfield name="ObjectFlags"
               c:type="GtkObjectFlags"
               glib:type-name="GtkObjectFlags"
               glib:get-type="gtk_object_flags_get_type">
       <member name="in-destruction"
-                value="1"
-                c:identifier="GTK_IN_DESTRUCTION"
-                glib:nick="in-destruction"/>
+              value="1"
+              c:identifier="GTK_IN_DESTRUCTION"
+              glib:nick="in-destruction"/>
       <member name="floating"
-                value="2"
-                c:identifier="GTK_FLOATING"
-                glib:nick="floating"/>
+              value="2"
+              c:identifier="GTK_FLOATING"
+              glib:nick="floating"/>
       <member name="reserved-1"
-                value="4"
-                c:identifier="GTK_RESERVED_1"
-                glib:nick="reserved-1"/>
+              value="4"
+              c:identifier="GTK_RESERVED_1"
+              glib:nick="reserved-1"/>
       <member name="reserved-2"
-                value="8"
-                c:identifier="GTK_RESERVED_2"
-                glib:nick="reserved-2"/>
+              value="8"
+              c:identifier="GTK_RESERVED_2"
+              glib:nick="reserved-2"/>
     </bitfield>
     <bitfield name="ArgFlags"
               c:type="GtkArgFlags"
               glib:type-name="GtkArgFlags"
               glib:get-type="gtk_arg_flags_get_type">
       <member name="readable"
-                value="1"
-                c:identifier="GTK_ARG_READABLE"
-                glib:nick="readable"/>
+              value="1"
+              c:identifier="GTK_ARG_READABLE"
+              glib:nick="readable"/>
       <member name="writable"
-                value="2"
-                c:identifier="GTK_ARG_WRITABLE"
-                glib:nick="writable"/>
+              value="2"
+              c:identifier="GTK_ARG_WRITABLE"
+              glib:nick="writable"/>
       <member name="construct"
-                value="4"
-                c:identifier="GTK_ARG_CONSTRUCT"
-                glib:nick="construct"/>
+              value="4"
+              c:identifier="GTK_ARG_CONSTRUCT"
+              glib:nick="construct"/>
       <member name="construct-only"
-                value="8"
-                c:identifier="GTK_ARG_CONSTRUCT_ONLY"
-                glib:nick="construct-only"/>
+              value="8"
+              c:identifier="GTK_ARG_CONSTRUCT_ONLY"
+              glib:nick="construct-only"/>
       <member name="child-arg"
-                value="16"
-                c:identifier="GTK_ARG_CHILD_ARG"
-                glib:nick="child-arg"/>
+              value="16"
+              c:identifier="GTK_ARG_CHILD_ARG"
+              glib:nick="child-arg"/>
     </bitfield>
     <enumeration name="PrintStatus"
                  c:type="GtkPrintStatus"
                  glib:type-name="GtkPrintStatus"
                  glib:get-type="gtk_print_status_get_type">
       <member name="initial"
-                value="0"
-                c:identifier="GTK_PRINT_STATUS_INITIAL"
-                glib:nick="initial"/>
+              value="0"
+              c:identifier="GTK_PRINT_STATUS_INITIAL"
+              glib:nick="initial"/>
       <member name="preparing"
-                value="1"
-                c:identifier="GTK_PRINT_STATUS_PREPARING"
-                glib:nick="preparing"/>
+              value="1"
+              c:identifier="GTK_PRINT_STATUS_PREPARING"
+              glib:nick="preparing"/>
       <member name="generating-data"
-                value="2"
-                c:identifier="GTK_PRINT_STATUS_GENERATING_DATA"
-                glib:nick="generating-data"/>
+              value="2"
+              c:identifier="GTK_PRINT_STATUS_GENERATING_DATA"
+              glib:nick="generating-data"/>
       <member name="sending-data"
-                value="3"
-                c:identifier="GTK_PRINT_STATUS_SENDING_DATA"
-                glib:nick="sending-data"/>
+              value="3"
+              c:identifier="GTK_PRINT_STATUS_SENDING_DATA"
+              glib:nick="sending-data"/>
       <member name="pending"
-                value="4"
-                c:identifier="GTK_PRINT_STATUS_PENDING"
-                glib:nick="pending"/>
+              value="4"
+              c:identifier="GTK_PRINT_STATUS_PENDING"
+              glib:nick="pending"/>
       <member name="pending-issue"
-                value="5"
-                c:identifier="GTK_PRINT_STATUS_PENDING_ISSUE"
-                glib:nick="pending-issue"/>
+              value="5"
+              c:identifier="GTK_PRINT_STATUS_PENDING_ISSUE"
+              glib:nick="pending-issue"/>
       <member name="printing"
-                value="6"
-                c:identifier="GTK_PRINT_STATUS_PRINTING"
-                glib:nick="printing"/>
+              value="6"
+              c:identifier="GTK_PRINT_STATUS_PRINTING"
+              glib:nick="printing"/>
       <member name="finished"
-                value="7"
-                c:identifier="GTK_PRINT_STATUS_FINISHED"
-                glib:nick="finished"/>
+              value="7"
+              c:identifier="GTK_PRINT_STATUS_FINISHED"
+              glib:nick="finished"/>
       <member name="finished-aborted"
-                value="8"
-                c:identifier="GTK_PRINT_STATUS_FINISHED_ABORTED"
-                glib:nick="finished-aborted"/>
+              value="8"
+              c:identifier="GTK_PRINT_STATUS_FINISHED_ABORTED"
+              glib:nick="finished-aborted"/>
     </enumeration>
     <enumeration name="PrintOperationResult"
                  c:type="GtkPrintOperationResult"
                  glib:type-name="GtkPrintOperationResult"
                  glib:get-type="gtk_print_operation_result_get_type">
       <member name="error"
-                value="0"
-                c:identifier="GTK_PRINT_OPERATION_RESULT_ERROR"
-                glib:nick="error"/>
+              value="0"
+              c:identifier="GTK_PRINT_OPERATION_RESULT_ERROR"
+              glib:nick="error"/>
       <member name="apply"
-                value="1"
-                c:identifier="GTK_PRINT_OPERATION_RESULT_APPLY"
-                glib:nick="apply"/>
+              value="1"
+              c:identifier="GTK_PRINT_OPERATION_RESULT_APPLY"
+              glib:nick="apply"/>
       <member name="cancel"
-                value="2"
-                c:identifier="GTK_PRINT_OPERATION_RESULT_CANCEL"
-                glib:nick="cancel"/>
+              value="2"
+              c:identifier="GTK_PRINT_OPERATION_RESULT_CANCEL"
+              glib:nick="cancel"/>
       <member name="in-progress"
-                value="3"
-                c:identifier="GTK_PRINT_OPERATION_RESULT_IN_PROGRESS"
-                glib:nick="in-progress"/>
+              value="3"
+              c:identifier="GTK_PRINT_OPERATION_RESULT_IN_PROGRESS"
+              glib:nick="in-progress"/>
     </enumeration>
     <enumeration name="PrintOperationAction"
                  c:type="GtkPrintOperationAction"
                  glib:type-name="GtkPrintOperationAction"
                  glib:get-type="gtk_print_operation_action_get_type">
       <member name="print-dialog"
-                value="0"
-                c:identifier="GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG"
-                glib:nick="print-dialog"/>
+              value="0"
+              c:identifier="GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG"
+              glib:nick="print-dialog"/>
       <member name="print"
-                value="1"
-                c:identifier="GTK_PRINT_OPERATION_ACTION_PRINT"
-                glib:nick="print"/>
+              value="1"
+              c:identifier="GTK_PRINT_OPERATION_ACTION_PRINT"
+              glib:nick="print"/>
       <member name="preview"
-                value="2"
-                c:identifier="GTK_PRINT_OPERATION_ACTION_PREVIEW"
-                glib:nick="preview"/>
+              value="2"
+              c:identifier="GTK_PRINT_OPERATION_ACTION_PREVIEW"
+              glib:nick="preview"/>
       <member name="export"
-                value="3"
-                c:identifier="GTK_PRINT_OPERATION_ACTION_EXPORT"
-                glib:nick="export"/>
+              value="3"
+              c:identifier="GTK_PRINT_OPERATION_ACTION_EXPORT"
+              glib:nick="export"/>
     </enumeration>
     <enumeration name="PrintError"
                  c:type="GtkPrintError"
                  glib:type-name="GtkPrintError"
                  glib:get-type="gtk_print_error_get_type">
       <member name="general"
-                value="0"
-                c:identifier="GTK_PRINT_ERROR_GENERAL"
-                glib:nick="general"/>
+              value="0"
+              c:identifier="GTK_PRINT_ERROR_GENERAL"
+              glib:nick="general"/>
       <member name="internal-error"
-                value="1"
-                c:identifier="GTK_PRINT_ERROR_INTERNAL_ERROR"
-                glib:nick="internal-error"/>
+              value="1"
+              c:identifier="GTK_PRINT_ERROR_INTERNAL_ERROR"
+              glib:nick="internal-error"/>
       <member name="nomem"
-                value="2"
-                c:identifier="GTK_PRINT_ERROR_NOMEM"
-                glib:nick="nomem"/>
+              value="2"
+              c:identifier="GTK_PRINT_ERROR_NOMEM"
+              glib:nick="nomem"/>
       <member name="invalid-file"
-                value="3"
-                c:identifier="GTK_PRINT_ERROR_INVALID_FILE"
-                glib:nick="invalid-file"/>
+              value="3"
+              c:identifier="GTK_PRINT_ERROR_INVALID_FILE"
+              glib:nick="invalid-file"/>
     </enumeration>
     <bitfield name="PrivateFlags"
               c:type="GtkPrivateFlags"
               glib:type-name="GtkPrivateFlags"
               glib:get-type="gtk_private_flags_get_type">
       <member name="user-style"
-                value="1"
-                c:identifier="PRIVATE_GTK_USER_STYLE"
-                glib:nick="user-style"/>
+              value="1"
+              c:identifier="PRIVATE_GTK_USER_STYLE"
+              glib:nick="user-style"/>
       <member name="resize-pending"
-                value="4"
-                c:identifier="PRIVATE_GTK_RESIZE_PENDING"
-                glib:nick="resize-pending"/>
+              value="4"
+              c:identifier="PRIVATE_GTK_RESIZE_PENDING"
+              glib:nick="resize-pending"/>
       <member name="leave-pending"
-                value="16"
-                c:identifier="PRIVATE_GTK_LEAVE_PENDING"
-                glib:nick="leave-pending"/>
+              value="16"
+              c:identifier="PRIVATE_GTK_LEAVE_PENDING"
+              glib:nick="leave-pending"/>
       <member name="has-shape-mask"
-                value="32"
-                c:identifier="PRIVATE_GTK_HAS_SHAPE_MASK"
-                glib:nick="has-shape-mask"/>
+              value="32"
+              c:identifier="PRIVATE_GTK_HAS_SHAPE_MASK"
+              glib:nick="has-shape-mask"/>
       <member name="in-reparent"
-                value="64"
-                c:identifier="PRIVATE_GTK_IN_REPARENT"
-                glib:nick="in-reparent"/>
+              value="64"
+              c:identifier="PRIVATE_GTK_IN_REPARENT"
+              glib:nick="in-reparent"/>
       <member name="direction-set"
-                value="128"
-                c:identifier="PRIVATE_GTK_DIRECTION_SET"
-                glib:nick="direction-set"/>
+              value="128"
+              c:identifier="PRIVATE_GTK_DIRECTION_SET"
+              glib:nick="direction-set"/>
       <member name="direction-ltr"
-                value="256"
-                c:identifier="PRIVATE_GTK_DIRECTION_LTR"
-                glib:nick="direction-ltr"/>
+              value="256"
+              c:identifier="PRIVATE_GTK_DIRECTION_LTR"
+              glib:nick="direction-ltr"/>
       <member name="anchored"
-                value="512"
-                c:identifier="PRIVATE_GTK_ANCHORED"
-                glib:nick="anchored"/>
+              value="512"
+              c:identifier="PRIVATE_GTK_ANCHORED"
+              glib:nick="anchored"/>
       <member name="child-visible"
-                value="1024"
-                c:identifier="PRIVATE_GTK_CHILD_VISIBLE"
-                glib:nick="child-visible"/>
+              value="1024"
+              c:identifier="PRIVATE_GTK_CHILD_VISIBLE"
+              glib:nick="child-visible"/>
       <member name="redraw-on-alloc"
-                value="2048"
-                c:identifier="PRIVATE_GTK_REDRAW_ON_ALLOC"
-                glib:nick="redraw-on-alloc"/>
+              value="2048"
+              c:identifier="PRIVATE_GTK_REDRAW_ON_ALLOC"
+              glib:nick="redraw-on-alloc"/>
       <member name="alloc-needed"
-                value="4096"
-                c:identifier="PRIVATE_GTK_ALLOC_NEEDED"
-                glib:nick="alloc-needed"/>
+              value="4096"
+              c:identifier="PRIVATE_GTK_ALLOC_NEEDED"
+              glib:nick="alloc-needed"/>
       <member name="request-needed"
-                value="8192"
-                c:identifier="PRIVATE_GTK_REQUEST_NEEDED"
-                glib:nick="request-needed"/>
+              value="8192"
+              c:identifier="PRIVATE_GTK_REQUEST_NEEDED"
+              glib:nick="request-needed"/>
     </bitfield>
     <enumeration name="ProgressBarStyle"
                  c:type="GtkProgressBarStyle"
                  glib:type-name="GtkProgressBarStyle"
                  glib:get-type="gtk_progress_bar_style_get_type">
       <member name="continuous"
-                value="0"
-                c:identifier="GTK_PROGRESS_CONTINUOUS"
-                glib:nick="continuous"/>
+              value="0"
+              c:identifier="GTK_PROGRESS_CONTINUOUS"
+              glib:nick="continuous"/>
       <member name="discrete"
-                value="1"
-                c:identifier="GTK_PROGRESS_DISCRETE"
-                glib:nick="discrete"/>
+              value="1"
+              c:identifier="GTK_PROGRESS_DISCRETE"
+              glib:nick="discrete"/>
     </enumeration>
     <enumeration name="ProgressBarOrientation"
                  c:type="GtkProgressBarOrientation"
                  glib:type-name="GtkProgressBarOrientation"
                  glib:get-type="gtk_progress_bar_orientation_get_type">
       <member name="left-to-right"
-                value="0"
-                c:identifier="GTK_PROGRESS_LEFT_TO_RIGHT"
-                glib:nick="left-to-right"/>
+              value="0"
+              c:identifier="GTK_PROGRESS_LEFT_TO_RIGHT"
+              glib:nick="left-to-right"/>
       <member name="right-to-left"
-                value="1"
-                c:identifier="GTK_PROGRESS_RIGHT_TO_LEFT"
-                glib:nick="right-to-left"/>
+              value="1"
+              c:identifier="GTK_PROGRESS_RIGHT_TO_LEFT"
+              glib:nick="right-to-left"/>
       <member name="bottom-to-top"
-                value="2"
-                c:identifier="GTK_PROGRESS_BOTTOM_TO_TOP"
-                glib:nick="bottom-to-top"/>
+              value="2"
+              c:identifier="GTK_PROGRESS_BOTTOM_TO_TOP"
+              glib:nick="bottom-to-top"/>
       <member name="top-to-bottom"
-                value="3"
-                c:identifier="GTK_PROGRESS_TOP_TO_BOTTOM"
-                glib:nick="top-to-bottom"/>
+              value="3"
+              c:identifier="GTK_PROGRESS_TOP_TO_BOTTOM"
+              glib:nick="top-to-bottom"/>
     </enumeration>
     <bitfield name="RcFlags"
               c:type="GtkRcFlags"
@@ -2438,807 +2577,652 @@
       <member name="fg" value="1" c:identifier="GTK_RC_FG" glib:nick="fg"/>
       <member name="bg" value="2" c:identifier="GTK_RC_BG" glib:nick="bg"/>
       <member name="text"
-                value="4"
-                c:identifier="GTK_RC_TEXT"
-                glib:nick="text"/>
+              value="4"
+              c:identifier="GTK_RC_TEXT"
+              glib:nick="text"/>
       <member name="base"
-                value="8"
-                c:identifier="GTK_RC_BASE"
-                glib:nick="base"/>
+              value="8"
+              c:identifier="GTK_RC_BASE"
+              glib:nick="base"/>
     </bitfield>
     <enumeration name="RcTokenType"
                  c:type="GtkRcTokenType"
                  glib:type-name="GtkRcTokenType"
                  glib:get-type="gtk_rc_token_type_get_type">
       <member name="invalid"
-                value="270"
-                c:identifier="GTK_RC_TOKEN_INVALID"
-                glib:nick="invalid"/>
+              value="270"
+              c:identifier="GTK_RC_TOKEN_INVALID"
+              glib:nick="invalid"/>
       <member name="include"
-                value="271"
-                c:identifier="GTK_RC_TOKEN_INCLUDE"
-                glib:nick="include"/>
+              value="271"
+              c:identifier="GTK_RC_TOKEN_INCLUDE"
+              glib:nick="include"/>
       <member name="normal"
-                value="272"
-                c:identifier="GTK_RC_TOKEN_NORMAL"
-                glib:nick="normal"/>
+              value="272"
+              c:identifier="GTK_RC_TOKEN_NORMAL"
+              glib:nick="normal"/>
       <member name="active"
-                value="273"
-                c:identifier="GTK_RC_TOKEN_ACTIVE"
-                glib:nick="active"/>
+              value="273"
+              c:identifier="GTK_RC_TOKEN_ACTIVE"
+              glib:nick="active"/>
       <member name="prelight"
-                value="274"
-                c:identifier="GTK_RC_TOKEN_PRELIGHT"
-                glib:nick="prelight"/>
+              value="274"
+              c:identifier="GTK_RC_TOKEN_PRELIGHT"
+              glib:nick="prelight"/>
       <member name="selected"
-                value="275"
-                c:identifier="GTK_RC_TOKEN_SELECTED"
-                glib:nick="selected"/>
+              value="275"
+              c:identifier="GTK_RC_TOKEN_SELECTED"
+              glib:nick="selected"/>
       <member name="insensitive"
-                value="276"
-                c:identifier="GTK_RC_TOKEN_INSENSITIVE"
-                glib:nick="insensitive"/>
+              value="276"
+              c:identifier="GTK_RC_TOKEN_INSENSITIVE"
+              glib:nick="insensitive"/>
       <member name="fg"
-                value="277"
-                c:identifier="GTK_RC_TOKEN_FG"
-                glib:nick="fg"/>
+              value="277"
+              c:identifier="GTK_RC_TOKEN_FG"
+              glib:nick="fg"/>
       <member name="bg"
-                value="278"
-                c:identifier="GTK_RC_TOKEN_BG"
-                glib:nick="bg"/>
+              value="278"
+              c:identifier="GTK_RC_TOKEN_BG"
+              glib:nick="bg"/>
       <member name="text"
-                value="279"
-                c:identifier="GTK_RC_TOKEN_TEXT"
-                glib:nick="text"/>
+              value="279"
+              c:identifier="GTK_RC_TOKEN_TEXT"
+              glib:nick="text"/>
       <member name="base"
-                value="280"
-                c:identifier="GTK_RC_TOKEN_BASE"
-                glib:nick="base"/>
+              value="280"
+              c:identifier="GTK_RC_TOKEN_BASE"
+              glib:nick="base"/>
       <member name="xthickness"
-                value="281"
-                c:identifier="GTK_RC_TOKEN_XTHICKNESS"
-                glib:nick="xthickness"/>
+              value="281"
+              c:identifier="GTK_RC_TOKEN_XTHICKNESS"
+              glib:nick="xthickness"/>
       <member name="ythickness"
-                value="282"
-                c:identifier="GTK_RC_TOKEN_YTHICKNESS"
-                glib:nick="ythickness"/>
+              value="282"
+              c:identifier="GTK_RC_TOKEN_YTHICKNESS"
+              glib:nick="ythickness"/>
       <member name="font"
-                value="283"
-                c:identifier="GTK_RC_TOKEN_FONT"
-                glib:nick="font"/>
+              value="283"
+              c:identifier="GTK_RC_TOKEN_FONT"
+              glib:nick="font"/>
       <member name="fontset"
-                value="284"
-                c:identifier="GTK_RC_TOKEN_FONTSET"
-                glib:nick="fontset"/>
+              value="284"
+              c:identifier="GTK_RC_TOKEN_FONTSET"
+              glib:nick="fontset"/>
       <member name="font-name"
-                value="285"
-                c:identifier="GTK_RC_TOKEN_FONT_NAME"
-                glib:nick="font-name"/>
+              value="285"
+              c:identifier="GTK_RC_TOKEN_FONT_NAME"
+              glib:nick="font-name"/>
       <member name="bg-pixmap"
-                value="286"
-                c:identifier="GTK_RC_TOKEN_BG_PIXMAP"
-                glib:nick="bg-pixmap"/>
+              value="286"
+              c:identifier="GTK_RC_TOKEN_BG_PIXMAP"
+              glib:nick="bg-pixmap"/>
       <member name="pixmap-path"
-                value="287"
-                c:identifier="GTK_RC_TOKEN_PIXMAP_PATH"
-                glib:nick="pixmap-path"/>
+              value="287"
+              c:identifier="GTK_RC_TOKEN_PIXMAP_PATH"
+              glib:nick="pixmap-path"/>
       <member name="style"
-                value="288"
-                c:identifier="GTK_RC_TOKEN_STYLE"
-                glib:nick="style"/>
+              value="288"
+              c:identifier="GTK_RC_TOKEN_STYLE"
+              glib:nick="style"/>
       <member name="binding"
-                value="289"
-                c:identifier="GTK_RC_TOKEN_BINDING"
-                glib:nick="binding"/>
+              value="289"
+              c:identifier="GTK_RC_TOKEN_BINDING"
+              glib:nick="binding"/>
       <member name="bind"
-                value="290"
-                c:identifier="GTK_RC_TOKEN_BIND"
-                glib:nick="bind"/>
+              value="290"
+              c:identifier="GTK_RC_TOKEN_BIND"
+              glib:nick="bind"/>
       <member name="widget"
-                value="291"
-                c:identifier="GTK_RC_TOKEN_WIDGET"
-                glib:nick="widget"/>
+              value="291"
+              c:identifier="GTK_RC_TOKEN_WIDGET"
+              glib:nick="widget"/>
       <member name="widget-class"
-                value="292"
-                c:identifier="GTK_RC_TOKEN_WIDGET_CLASS"
-                glib:nick="widget-class"/>
+              value="292"
+              c:identifier="GTK_RC_TOKEN_WIDGET_CLASS"
+              glib:nick="widget-class"/>
       <member name="class"
-                value="293"
-                c:identifier="GTK_RC_TOKEN_CLASS"
-                glib:nick="class"/>
+              value="293"
+              c:identifier="GTK_RC_TOKEN_CLASS"
+              glib:nick="class"/>
       <member name="lowest"
-                value="294"
-                c:identifier="GTK_RC_TOKEN_LOWEST"
-                glib:nick="lowest"/>
+              value="294"
+              c:identifier="GTK_RC_TOKEN_LOWEST"
+              glib:nick="lowest"/>
       <member name="gtk"
-                value="295"
-                c:identifier="GTK_RC_TOKEN_GTK"
-                glib:nick="gtk"/>
+              value="295"
+              c:identifier="GTK_RC_TOKEN_GTK"
+              glib:nick="gtk"/>
       <member name="application"
-                value="296"
-                c:identifier="GTK_RC_TOKEN_APPLICATION"
-                glib:nick="application"/>
+              value="296"
+              c:identifier="GTK_RC_TOKEN_APPLICATION"
+              glib:nick="application"/>
       <member name="theme"
-                value="297"
-                c:identifier="GTK_RC_TOKEN_THEME"
-                glib:nick="theme"/>
+              value="297"
+              c:identifier="GTK_RC_TOKEN_THEME"
+              glib:nick="theme"/>
       <member name="rc"
-                value="298"
-                c:identifier="GTK_RC_TOKEN_RC"
-                glib:nick="rc"/>
+              value="298"
+              c:identifier="GTK_RC_TOKEN_RC"
+              glib:nick="rc"/>
       <member name="highest"
-                value="299"
-                c:identifier="GTK_RC_TOKEN_HIGHEST"
-                glib:nick="highest"/>
+              value="299"
+              c:identifier="GTK_RC_TOKEN_HIGHEST"
+              glib:nick="highest"/>
       <member name="engine"
-                value="300"
-                c:identifier="GTK_RC_TOKEN_ENGINE"
-                glib:nick="engine"/>
+              value="300"
+              c:identifier="GTK_RC_TOKEN_ENGINE"
+              glib:nick="engine"/>
       <member name="module-path"
-                value="301"
-                c:identifier="GTK_RC_TOKEN_MODULE_PATH"
-                glib:nick="module-path"/>
+              value="301"
+              c:identifier="GTK_RC_TOKEN_MODULE_PATH"
+              glib:nick="module-path"/>
       <member name="im-module-path"
-                value="302"
-                c:identifier="GTK_RC_TOKEN_IM_MODULE_PATH"
-                glib:nick="im-module-path"/>
+              value="302"
+              c:identifier="GTK_RC_TOKEN_IM_MODULE_PATH"
+              glib:nick="im-module-path"/>
       <member name="im-module-file"
-                value="303"
-                c:identifier="GTK_RC_TOKEN_IM_MODULE_FILE"
-                glib:nick="im-module-file"/>
+              value="303"
+              c:identifier="GTK_RC_TOKEN_IM_MODULE_FILE"
+              glib:nick="im-module-file"/>
       <member name="stock"
-                value="304"
-                c:identifier="GTK_RC_TOKEN_STOCK"
-                glib:nick="stock"/>
+              value="304"
+              c:identifier="GTK_RC_TOKEN_STOCK"
+              glib:nick="stock"/>
       <member name="ltr"
-                value="305"
-                c:identifier="GTK_RC_TOKEN_LTR"
-                glib:nick="ltr"/>
+              value="305"
+              c:identifier="GTK_RC_TOKEN_LTR"
+              glib:nick="ltr"/>
       <member name="rtl"
-                value="306"
-                c:identifier="GTK_RC_TOKEN_RTL"
-                glib:nick="rtl"/>
+              value="306"
+              c:identifier="GTK_RC_TOKEN_RTL"
+              glib:nick="rtl"/>
       <member name="color"
-                value="307"
-                c:identifier="GTK_RC_TOKEN_COLOR"
-                glib:nick="color"/>
+              value="307"
+              c:identifier="GTK_RC_TOKEN_COLOR"
+              glib:nick="color"/>
       <member name="unbind"
-                value="308"
-                c:identifier="GTK_RC_TOKEN_UNBIND"
-                glib:nick="unbind"/>
+              value="308"
+              c:identifier="GTK_RC_TOKEN_UNBIND"
+              glib:nick="unbind"/>
       <member name="last"
-                value="309"
-                c:identifier="GTK_RC_TOKEN_LAST"
-                glib:nick="last"/>
+              value="309"
+              c:identifier="GTK_RC_TOKEN_LAST"
+              glib:nick="last"/>
     </enumeration>
     <enumeration name="RecentSortType"
                  c:type="GtkRecentSortType"
                  glib:type-name="GtkRecentSortType"
                  glib:get-type="gtk_recent_sort_type_get_type">
       <member name="none"
-                value="0"
-                c:identifier="GTK_RECENT_SORT_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="GTK_RECENT_SORT_NONE"
+              glib:nick="none"/>
       <member name="mru"
-                value="1"
-                c:identifier="GTK_RECENT_SORT_MRU"
-                glib:nick="mru"/>
+              value="1"
+              c:identifier="GTK_RECENT_SORT_MRU"
+              glib:nick="mru"/>
       <member name="lru"
-                value="2"
-                c:identifier="GTK_RECENT_SORT_LRU"
-                glib:nick="lru"/>
+              value="2"
+              c:identifier="GTK_RECENT_SORT_LRU"
+              glib:nick="lru"/>
       <member name="custom"
-                value="3"
-                c:identifier="GTK_RECENT_SORT_CUSTOM"
-                glib:nick="custom"/>
+              value="3"
+              c:identifier="GTK_RECENT_SORT_CUSTOM"
+              glib:nick="custom"/>
     </enumeration>
     <enumeration name="RecentChooserError"
                  c:type="GtkRecentChooserError"
                  glib:type-name="GtkRecentChooserError"
                  glib:get-type="gtk_recent_chooser_error_get_type">
       <member name="not-found"
-                value="0"
-                c:identifier="GTK_RECENT_CHOOSER_ERROR_NOT_FOUND"
-                glib:nick="not-found"/>
+              value="0"
+              c:identifier="GTK_RECENT_CHOOSER_ERROR_NOT_FOUND"
+              glib:nick="not-found"/>
       <member name="invalid-uri"
-                value="1"
-                c:identifier="GTK_RECENT_CHOOSER_ERROR_INVALID_URI"
-                glib:nick="invalid-uri"/>
+              value="1"
+              c:identifier="GTK_RECENT_CHOOSER_ERROR_INVALID_URI"
+              glib:nick="invalid-uri"/>
     </enumeration>
     <bitfield name="RecentFilterFlags"
               c:type="GtkRecentFilterFlags"
               glib:type-name="GtkRecentFilterFlags"
               glib:get-type="gtk_recent_filter_flags_get_type">
       <member name="uri"
-                value="1"
-                c:identifier="GTK_RECENT_FILTER_URI"
-                glib:nick="uri"/>
+              value="1"
+              c:identifier="GTK_RECENT_FILTER_URI"
+              glib:nick="uri"/>
       <member name="display-name"
-                value="2"
-                c:identifier="GTK_RECENT_FILTER_DISPLAY_NAME"
-                glib:nick="display-name"/>
+              value="2"
+              c:identifier="GTK_RECENT_FILTER_DISPLAY_NAME"
+              glib:nick="display-name"/>
       <member name="mime-type"
-                value="4"
-                c:identifier="GTK_RECENT_FILTER_MIME_TYPE"
-                glib:nick="mime-type"/>
+              value="4"
+              c:identifier="GTK_RECENT_FILTER_MIME_TYPE"
+              glib:nick="mime-type"/>
       <member name="application"
-                value="8"
-                c:identifier="GTK_RECENT_FILTER_APPLICATION"
-                glib:nick="application"/>
+              value="8"
+              c:identifier="GTK_RECENT_FILTER_APPLICATION"
+              glib:nick="application"/>
       <member name="group"
-                value="16"
-                c:identifier="GTK_RECENT_FILTER_GROUP"
-                glib:nick="group"/>
+              value="16"
+              c:identifier="GTK_RECENT_FILTER_GROUP"
+              glib:nick="group"/>
       <member name="age"
-                value="32"
-                c:identifier="GTK_RECENT_FILTER_AGE"
-                glib:nick="age"/>
+              value="32"
+              c:identifier="GTK_RECENT_FILTER_AGE"
+              glib:nick="age"/>
     </bitfield>
     <enumeration name="RecentManagerError"
                  c:type="GtkRecentManagerError"
                  glib:type-name="GtkRecentManagerError"
                  glib:get-type="gtk_recent_manager_error_get_type">
       <member name="not-found"
-                value="0"
-                c:identifier="GTK_RECENT_MANAGER_ERROR_NOT_FOUND"
-                glib:nick="not-found"/>
+              value="0"
+              c:identifier="GTK_RECENT_MANAGER_ERROR_NOT_FOUND"
+              glib:nick="not-found"/>
       <member name="invalid-uri"
-                value="1"
-                c:identifier="GTK_RECENT_MANAGER_ERROR_INVALID_URI"
-                glib:nick="invalid-uri"/>
+              value="1"
+              c:identifier="GTK_RECENT_MANAGER_ERROR_INVALID_URI"
+              glib:nick="invalid-uri"/>
       <member name="invalid-encoding"
-                value="2"
-                c:identifier="GTK_RECENT_MANAGER_ERROR_INVALID_ENCODING"
-                glib:nick="invalid-encoding"/>
+              value="2"
+              c:identifier="GTK_RECENT_MANAGER_ERROR_INVALID_ENCODING"
+              glib:nick="invalid-encoding"/>
       <member name="not-registered"
-                value="3"
-                c:identifier="GTK_RECENT_MANAGER_ERROR_NOT_REGISTERED"
-                glib:nick="not-registered"/>
+              value="3"
+              c:identifier="GTK_RECENT_MANAGER_ERROR_NOT_REGISTERED"
+              glib:nick="not-registered"/>
       <member name="read"
-                value="4"
-                c:identifier="GTK_RECENT_MANAGER_ERROR_READ"
-                glib:nick="read"/>
+              value="4"
+              c:identifier="GTK_RECENT_MANAGER_ERROR_READ"
+              glib:nick="read"/>
       <member name="write"
-                value="5"
-                c:identifier="GTK_RECENT_MANAGER_ERROR_WRITE"
-                glib:nick="write"/>
+              value="5"
+              c:identifier="GTK_RECENT_MANAGER_ERROR_WRITE"
+              glib:nick="write"/>
       <member name="unknown"
-                value="6"
-                c:identifier="GTK_RECENT_MANAGER_ERROR_UNKNOWN"
-                glib:nick="unknown"/>
+              value="6"
+              c:identifier="GTK_RECENT_MANAGER_ERROR_UNKNOWN"
+              glib:nick="unknown"/>
     </enumeration>
     <enumeration name="SizeGroupMode"
                  c:type="GtkSizeGroupMode"
                  glib:type-name="GtkSizeGroupMode"
                  glib:get-type="gtk_size_group_mode_get_type">
       <member name="none"
-                value="0"
-                c:identifier="GTK_SIZE_GROUP_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="GTK_SIZE_GROUP_NONE"
+              glib:nick="none"/>
       <member name="horizontal"
-                value="1"
-                c:identifier="GTK_SIZE_GROUP_HORIZONTAL"
-                glib:nick="horizontal"/>
+              value="1"
+              c:identifier="GTK_SIZE_GROUP_HORIZONTAL"
+              glib:nick="horizontal"/>
       <member name="vertical"
-                value="2"
-                c:identifier="GTK_SIZE_GROUP_VERTICAL"
-                glib:nick="vertical"/>
+              value="2"
+              c:identifier="GTK_SIZE_GROUP_VERTICAL"
+              glib:nick="vertical"/>
       <member name="both"
-                value="3"
-                c:identifier="GTK_SIZE_GROUP_BOTH"
-                glib:nick="both"/>
+              value="3"
+              c:identifier="GTK_SIZE_GROUP_BOTH"
+              glib:nick="both"/>
     </enumeration>
     <enumeration name="SpinButtonUpdatePolicy"
                  c:type="GtkSpinButtonUpdatePolicy"
                  glib:type-name="GtkSpinButtonUpdatePolicy"
                  glib:get-type="gtk_spin_button_update_policy_get_type">
       <member name="always"
-                value="0"
-                c:identifier="GTK_UPDATE_ALWAYS"
-                glib:nick="always"/>
+              value="0"
+              c:identifier="GTK_UPDATE_ALWAYS"
+              glib:nick="always"/>
       <member name="if-valid"
-                value="1"
-                c:identifier="GTK_UPDATE_IF_VALID"
-                glib:nick="if-valid"/>
+              value="1"
+              c:identifier="GTK_UPDATE_IF_VALID"
+              glib:nick="if-valid"/>
     </enumeration>
     <enumeration name="SpinType"
                  c:type="GtkSpinType"
                  glib:type-name="GtkSpinType"
                  glib:get-type="gtk_spin_type_get_type">
       <member name="step-forward"
-                value="0"
-                c:identifier="GTK_SPIN_STEP_FORWARD"
-                glib:nick="step-forward"/>
+              value="0"
+              c:identifier="GTK_SPIN_STEP_FORWARD"
+              glib:nick="step-forward"/>
       <member name="step-backward"
-                value="1"
-                c:identifier="GTK_SPIN_STEP_BACKWARD"
-                glib:nick="step-backward"/>
+              value="1"
+              c:identifier="GTK_SPIN_STEP_BACKWARD"
+              glib:nick="step-backward"/>
       <member name="page-forward"
-                value="2"
-                c:identifier="GTK_SPIN_PAGE_FORWARD"
-                glib:nick="page-forward"/>
+              value="2"
+              c:identifier="GTK_SPIN_PAGE_FORWARD"
+              glib:nick="page-forward"/>
       <member name="page-backward"
-                value="3"
-                c:identifier="GTK_SPIN_PAGE_BACKWARD"
-                glib:nick="page-backward"/>
+              value="3"
+              c:identifier="GTK_SPIN_PAGE_BACKWARD"
+              glib:nick="page-backward"/>
       <member name="home"
-                value="4"
-                c:identifier="GTK_SPIN_HOME"
-                glib:nick="home"/>
+              value="4"
+              c:identifier="GTK_SPIN_HOME"
+              glib:nick="home"/>
       <member name="end"
-                value="5"
-                c:identifier="GTK_SPIN_END"
-                glib:nick="end"/>
+              value="5"
+              c:identifier="GTK_SPIN_END"
+              glib:nick="end"/>
       <member name="user-defined"
-                value="6"
-                c:identifier="GTK_SPIN_USER_DEFINED"
-                glib:nick="user-defined"/>
+              value="6"
+              c:identifier="GTK_SPIN_USER_DEFINED"
+              glib:nick="user-defined"/>
     </enumeration>
     <enumeration name="TextBufferTargetInfo"
                  c:type="GtkTextBufferTargetInfo"
                  glib:type-name="GtkTextBufferTargetInfo"
                  glib:get-type="gtk_text_buffer_target_info_get_type">
       <member name="buffer-contents"
-                value="-1"
-                c:identifier="GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS"
-                glib:nick="buffer-contents"/>
+              value="-1"
+              c:identifier="GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS"
+              glib:nick="buffer-contents"/>
       <member name="rich-text"
-                value="-2"
-                c:identifier="GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT"
-                glib:nick="rich-text"/>
+              value="-2"
+              c:identifier="GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT"
+              glib:nick="rich-text"/>
       <member name="text"
-                value="-3"
-                c:identifier="GTK_TEXT_BUFFER_TARGET_INFO_TEXT"
-                glib:nick="text"/>
+              value="-3"
+              c:identifier="GTK_TEXT_BUFFER_TARGET_INFO_TEXT"
+              glib:nick="text"/>
     </enumeration>
     <bitfield name="TextSearchFlags"
               c:type="GtkTextSearchFlags"
               glib:type-name="GtkTextSearchFlags"
               glib:get-type="gtk_text_search_flags_get_type">
       <member name="visible-only"
-                value="1"
-                c:identifier="GTK_TEXT_SEARCH_VISIBLE_ONLY"
-                glib:nick="visible-only"/>
+              value="1"
+              c:identifier="GTK_TEXT_SEARCH_VISIBLE_ONLY"
+              glib:nick="visible-only"/>
       <member name="text-only"
-                value="2"
-                c:identifier="GTK_TEXT_SEARCH_TEXT_ONLY"
-                glib:nick="text-only"/>
+              value="2"
+              c:identifier="GTK_TEXT_SEARCH_TEXT_ONLY"
+              glib:nick="text-only"/>
     </bitfield>
     <enumeration name="TextWindowType"
                  c:type="GtkTextWindowType"
                  glib:type-name="GtkTextWindowType"
                  glib:get-type="gtk_text_window_type_get_type">
       <member name="private"
-                value="0"
-                c:identifier="GTK_TEXT_WINDOW_PRIVATE"
-                glib:nick="private"/>
+              value="0"
+              c:identifier="GTK_TEXT_WINDOW_PRIVATE"
+              glib:nick="private"/>
       <member name="widget"
-                value="1"
-                c:identifier="GTK_TEXT_WINDOW_WIDGET"
-                glib:nick="widget"/>
+              value="1"
+              c:identifier="GTK_TEXT_WINDOW_WIDGET"
+              glib:nick="widget"/>
       <member name="text"
-                value="2"
-                c:identifier="GTK_TEXT_WINDOW_TEXT"
-                glib:nick="text"/>
+              value="2"
+              c:identifier="GTK_TEXT_WINDOW_TEXT"
+              glib:nick="text"/>
       <member name="left"
-                value="3"
-                c:identifier="GTK_TEXT_WINDOW_LEFT"
-                glib:nick="left"/>
+              value="3"
+              c:identifier="GTK_TEXT_WINDOW_LEFT"
+              glib:nick="left"/>
       <member name="right"
-                value="4"
-                c:identifier="GTK_TEXT_WINDOW_RIGHT"
-                glib:nick="right"/>
+              value="4"
+              c:identifier="GTK_TEXT_WINDOW_RIGHT"
+              glib:nick="right"/>
       <member name="top"
-                value="5"
-                c:identifier="GTK_TEXT_WINDOW_TOP"
-                glib:nick="top"/>
+              value="5"
+              c:identifier="GTK_TEXT_WINDOW_TOP"
+              glib:nick="top"/>
       <member name="bottom"
-                value="6"
-                c:identifier="GTK_TEXT_WINDOW_BOTTOM"
-                glib:nick="bottom"/>
+              value="6"
+              c:identifier="GTK_TEXT_WINDOW_BOTTOM"
+              glib:nick="bottom"/>
     </enumeration>
     <enumeration name="ToolbarChildType"
                  c:type="GtkToolbarChildType"
                  glib:type-name="GtkToolbarChildType"
                  glib:get-type="gtk_toolbar_child_type_get_type">
       <member name="space"
-                value="0"
-                c:identifier="GTK_TOOLBAR_CHILD_SPACE"
-                glib:nick="space"/>
+              value="0"
+              c:identifier="GTK_TOOLBAR_CHILD_SPACE"
+              glib:nick="space"/>
       <member name="button"
-                value="1"
-                c:identifier="GTK_TOOLBAR_CHILD_BUTTON"
-                glib:nick="button"/>
+              value="1"
+              c:identifier="GTK_TOOLBAR_CHILD_BUTTON"
+              glib:nick="button"/>
       <member name="togglebutton"
-                value="2"
-                c:identifier="GTK_TOOLBAR_CHILD_TOGGLEBUTTON"
-                glib:nick="togglebutton"/>
+              value="2"
+              c:identifier="GTK_TOOLBAR_CHILD_TOGGLEBUTTON"
+              glib:nick="togglebutton"/>
       <member name="radiobutton"
-                value="3"
-                c:identifier="GTK_TOOLBAR_CHILD_RADIOBUTTON"
-                glib:nick="radiobutton"/>
+              value="3"
+              c:identifier="GTK_TOOLBAR_CHILD_RADIOBUTTON"
+              glib:nick="radiobutton"/>
       <member name="widget"
-                value="4"
-                c:identifier="GTK_TOOLBAR_CHILD_WIDGET"
-                glib:nick="widget"/>
+              value="4"
+              c:identifier="GTK_TOOLBAR_CHILD_WIDGET"
+              glib:nick="widget"/>
     </enumeration>
     <enumeration name="ToolbarSpaceStyle"
                  c:type="GtkToolbarSpaceStyle"
                  glib:type-name="GtkToolbarSpaceStyle"
                  glib:get-type="gtk_toolbar_space_style_get_type">
       <member name="empty"
-                value="0"
-                c:identifier="GTK_TOOLBAR_SPACE_EMPTY"
-                glib:nick="empty"/>
+              value="0"
+              c:identifier="GTK_TOOLBAR_SPACE_EMPTY"
+              glib:nick="empty"/>
       <member name="line"
-                value="1"
-                c:identifier="GTK_TOOLBAR_SPACE_LINE"
-                glib:nick="line"/>
+              value="1"
+              c:identifier="GTK_TOOLBAR_SPACE_LINE"
+              glib:nick="line"/>
+    </enumeration>
+    <enumeration name="TreeViewMode"
+                 c:type="GtkTreeViewMode"
+                 glib:type-name="GtkTreeViewMode"
+                 glib:get-type="gtk_tree_view_mode_get_type">
+      <member name="line"
+              value="0"
+              c:identifier="GTK_TREE_VIEW_LINE"
+              glib:nick="line"/>
+      <member name="item"
+              value="1"
+              c:identifier="GTK_TREE_VIEW_ITEM"
+              glib:nick="item"/>
     </enumeration>
     <bitfield name="TreeModelFlags"
               c:type="GtkTreeModelFlags"
               glib:type-name="GtkTreeModelFlags"
               glib:get-type="gtk_tree_model_flags_get_type">
       <member name="iters-persist"
-                value="1"
-                c:identifier="GTK_TREE_MODEL_ITERS_PERSIST"
-                glib:nick="iters-persist"/>
+              value="1"
+              c:identifier="GTK_TREE_MODEL_ITERS_PERSIST"
+              glib:nick="iters-persist"/>
       <member name="list-only"
-                value="2"
-                c:identifier="GTK_TREE_MODEL_LIST_ONLY"
-                glib:nick="list-only"/>
+              value="2"
+              c:identifier="GTK_TREE_MODEL_LIST_ONLY"
+              glib:nick="list-only"/>
     </bitfield>
     <enumeration name="TreeViewDropPosition"
                  c:type="GtkTreeViewDropPosition"
                  glib:type-name="GtkTreeViewDropPosition"
                  glib:get-type="gtk_tree_view_drop_position_get_type">
       <member name="before"
-                value="0"
-                c:identifier="GTK_TREE_VIEW_DROP_BEFORE"
-                glib:nick="before"/>
+              value="0"
+              c:identifier="GTK_TREE_VIEW_DROP_BEFORE"
+              glib:nick="before"/>
       <member name="after"
-                value="1"
-                c:identifier="GTK_TREE_VIEW_DROP_AFTER"
-                glib:nick="after"/>
+              value="1"
+              c:identifier="GTK_TREE_VIEW_DROP_AFTER"
+              glib:nick="after"/>
       <member name="into-or-before"
-                value="2"
-                c:identifier="GTK_TREE_VIEW_DROP_INTO_OR_BEFORE"
-                glib:nick="into-or-before"/>
+              value="2"
+              c:identifier="GTK_TREE_VIEW_DROP_INTO_OR_BEFORE"
+              glib:nick="into-or-before"/>
       <member name="into-or-after"
-                value="3"
-                c:identifier="GTK_TREE_VIEW_DROP_INTO_OR_AFTER"
-                glib:nick="into-or-after"/>
+              value="3"
+              c:identifier="GTK_TREE_VIEW_DROP_INTO_OR_AFTER"
+              glib:nick="into-or-after"/>
     </enumeration>
     <enumeration name="TreeViewColumnSizing"
                  c:type="GtkTreeViewColumnSizing"
                  glib:type-name="GtkTreeViewColumnSizing"
                  glib:get-type="gtk_tree_view_column_sizing_get_type">
       <member name="grow-only"
-                value="0"
-                c:identifier="GTK_TREE_VIEW_COLUMN_GROW_ONLY"
-                glib:nick="grow-only"/>
+              value="0"
+              c:identifier="GTK_TREE_VIEW_COLUMN_GROW_ONLY"
+              glib:nick="grow-only"/>
       <member name="autosize"
-                value="1"
-                c:identifier="GTK_TREE_VIEW_COLUMN_AUTOSIZE"
-                glib:nick="autosize"/>
+              value="1"
+              c:identifier="GTK_TREE_VIEW_COLUMN_AUTOSIZE"
+              glib:nick="autosize"/>
       <member name="fixed"
-                value="2"
-                c:identifier="GTK_TREE_VIEW_COLUMN_FIXED"
-                glib:nick="fixed"/>
+              value="2"
+              c:identifier="GTK_TREE_VIEW_COLUMN_FIXED"
+              glib:nick="fixed"/>
     </enumeration>
     <bitfield name="UIManagerItemType"
               c:type="GtkUIManagerItemType"
               glib:type-name="GtkUIManagerItemType"
               glib:get-type="gtk_ui_manager_item_type_get_type">
       <member name="auto"
-                value="0"
-                c:identifier="GTK_UI_MANAGER_AUTO"
-                glib:nick="auto"/>
+              value="0"
+              c:identifier="GTK_UI_MANAGER_AUTO"
+              glib:nick="auto"/>
       <member name="menubar"
-                value="1"
-                c:identifier="GTK_UI_MANAGER_MENUBAR"
-                glib:nick="menubar"/>
+              value="1"
+              c:identifier="GTK_UI_MANAGER_MENUBAR"
+              glib:nick="menubar"/>
       <member name="menu"
-                value="2"
-                c:identifier="GTK_UI_MANAGER_MENU"
-                glib:nick="menu"/>
+              value="2"
+              c:identifier="GTK_UI_MANAGER_MENU"
+              glib:nick="menu"/>
       <member name="toolbar"
-                value="4"
-                c:identifier="GTK_UI_MANAGER_TOOLBAR"
-                glib:nick="toolbar"/>
+              value="4"
+              c:identifier="GTK_UI_MANAGER_TOOLBAR"
+              glib:nick="toolbar"/>
       <member name="placeholder"
-                value="8"
-                c:identifier="GTK_UI_MANAGER_PLACEHOLDER"
-                glib:nick="placeholder"/>
+              value="8"
+              c:identifier="GTK_UI_MANAGER_PLACEHOLDER"
+              glib:nick="placeholder"/>
       <member name="popup"
-                value="16"
-                c:identifier="GTK_UI_MANAGER_POPUP"
-                glib:nick="popup"/>
+              value="16"
+              c:identifier="GTK_UI_MANAGER_POPUP"
+              glib:nick="popup"/>
       <member name="menuitem"
-                value="32"
-                c:identifier="GTK_UI_MANAGER_MENUITEM"
-                glib:nick="menuitem"/>
+              value="32"
+              c:identifier="GTK_UI_MANAGER_MENUITEM"
+              glib:nick="menuitem"/>
       <member name="toolitem"
-                value="64"
-                c:identifier="GTK_UI_MANAGER_TOOLITEM"
-                glib:nick="toolitem"/>
+              value="64"
+              c:identifier="GTK_UI_MANAGER_TOOLITEM"
+              glib:nick="toolitem"/>
       <member name="separator"
-                value="128"
-                c:identifier="GTK_UI_MANAGER_SEPARATOR"
-                glib:nick="separator"/>
+              value="128"
+              c:identifier="GTK_UI_MANAGER_SEPARATOR"
+              glib:nick="separator"/>
       <member name="accelerator"
-                value="256"
-                c:identifier="GTK_UI_MANAGER_ACCELERATOR"
-                glib:nick="accelerator"/>
+              value="256"
+              c:identifier="GTK_UI_MANAGER_ACCELERATOR"
+              glib:nick="accelerator"/>
     </bitfield>
     <bitfield name="WidgetFlags"
               c:type="GtkWidgetFlags"
               glib:type-name="GtkWidgetFlags"
               glib:get-type="gtk_widget_flags_get_type">
       <member name="toplevel"
-                value="16"
-                c:identifier="GTK_TOPLEVEL"
-                glib:nick="toplevel"/>
+              value="16"
+              c:identifier="GTK_TOPLEVEL"
+              glib:nick="toplevel"/>
       <member name="no-window"
-                value="32"
-                c:identifier="GTK_NO_WINDOW"
-                glib:nick="no-window"/>
+              value="32"
+              c:identifier="GTK_NO_WINDOW"
+              glib:nick="no-window"/>
       <member name="realized"
-                value="64"
-                c:identifier="GTK_REALIZED"
-                glib:nick="realized"/>
+              value="64"
+              c:identifier="GTK_REALIZED"
+              glib:nick="realized"/>
       <member name="mapped"
-                value="128"
-                c:identifier="GTK_MAPPED"
-                glib:nick="mapped"/>
+              value="128"
+              c:identifier="GTK_MAPPED"
+              glib:nick="mapped"/>
       <member name="visible"
-                value="256"
-                c:identifier="GTK_VISIBLE"
-                glib:nick="visible"/>
+              value="256"
+              c:identifier="GTK_VISIBLE"
+              glib:nick="visible"/>
       <member name="sensitive"
-                value="512"
-                c:identifier="GTK_SENSITIVE"
-                glib:nick="sensitive"/>
+              value="512"
+              c:identifier="GTK_SENSITIVE"
+              glib:nick="sensitive"/>
       <member name="parent-sensitive"
-                value="1024"
-                c:identifier="GTK_PARENT_SENSITIVE"
-                glib:nick="parent-sensitive"/>
+              value="1024"
+              c:identifier="GTK_PARENT_SENSITIVE"
+              glib:nick="parent-sensitive"/>
       <member name="can-focus"
-                value="2048"
-                c:identifier="GTK_CAN_FOCUS"
-                glib:nick="can-focus"/>
+              value="2048"
+              c:identifier="GTK_CAN_FOCUS"
+              glib:nick="can-focus"/>
       <member name="has-focus"
-                value="4096"
-                c:identifier="GTK_HAS_FOCUS"
-                glib:nick="has-focus"/>
+              value="4096"
+              c:identifier="GTK_HAS_FOCUS"
+              glib:nick="has-focus"/>
       <member name="can-default"
-                value="8192"
-                c:identifier="GTK_CAN_DEFAULT"
-                glib:nick="can-default"/>
+              value="8192"
+              c:identifier="GTK_CAN_DEFAULT"
+              glib:nick="can-default"/>
       <member name="has-default"
-                value="16384"
-                c:identifier="GTK_HAS_DEFAULT"
-                glib:nick="has-default"/>
+              value="16384"
+              c:identifier="GTK_HAS_DEFAULT"
+              glib:nick="has-default"/>
       <member name="has-grab"
-                value="32768"
-                c:identifier="GTK_HAS_GRAB"
-                glib:nick="has-grab"/>
+              value="32768"
+              c:identifier="GTK_HAS_GRAB"
+              glib:nick="has-grab"/>
       <member name="rc-style"
-                value="65536"
-                c:identifier="GTK_RC_STYLE"
-                glib:nick="rc-style"/>
+              value="65536"
+              c:identifier="GTK_RC_STYLE"
+              glib:nick="rc-style"/>
       <member name="composite-child"
-                value="131072"
-                c:identifier="GTK_COMPOSITE_CHILD"
-                glib:nick="composite-child"/>
+              value="131072"
+              c:identifier="GTK_COMPOSITE_CHILD"
+              glib:nick="composite-child"/>
       <member name="no-reparent"
-                value="262144"
-                c:identifier="GTK_NO_REPARENT"
-                glib:nick="no-reparent"/>
+              value="262144"
+              c:identifier="GTK_NO_REPARENT"
+              glib:nick="no-reparent"/>
       <member name="app-paintable"
-                value="524288"
-                c:identifier="GTK_APP_PAINTABLE"
-                glib:nick="app-paintable"/>
+              value="524288"
+              c:identifier="GTK_APP_PAINTABLE"
+              glib:nick="app-paintable"/>
       <member name="receives-default"
-                value="1048576"
-                c:identifier="GTK_RECEIVES_DEFAULT"
-                glib:nick="receives-default"/>
+              value="1048576"
+              c:identifier="GTK_RECEIVES_DEFAULT"
+              glib:nick="receives-default"/>
       <member name="double-buffered"
-                value="2097152"
-                c:identifier="GTK_DOUBLE_BUFFERED"
-                glib:nick="double-buffered"/>
+              value="2097152"
+              c:identifier="GTK_DOUBLE_BUFFERED"
+              glib:nick="double-buffered"/>
       <member name="no-show-all"
-                value="4194304"
-                c:identifier="GTK_NO_SHOW_ALL"
-                glib:nick="no-show-all"/>
+              value="4194304"
+              c:identifier="GTK_NO_SHOW_ALL"
+              glib:nick="no-show-all"/>
     </bitfield>
     <enumeration name="WidgetHelpType"
                  c:type="GtkWidgetHelpType"
                  glib:type-name="GtkWidgetHelpType"
                  glib:get-type="gtk_widget_help_type_get_type">
       <member name="tooltip"
-                value="0"
-                c:identifier="GTK_WIDGET_HELP_TOOLTIP"
-                glib:nick="tooltip"/>
+              value="0"
+              c:identifier="GTK_WIDGET_HELP_TOOLTIP"
+              glib:nick="tooltip"/>
       <member name="whats-this"
-                value="1"
-                c:identifier="GTK_WIDGET_HELP_WHATS_THIS"
-                glib:nick="whats-this"/>
-    </enumeration>
-    <enumeration name="TreeViewMode"
-                 c:type="GtkTreeViewMode"
-                 glib:type-name="GtkTreeViewMode"
-                 glib:get-type="gtk_tree_view_mode_get_type">
-      <member name="line"
-                value="0"
-                c:identifier="GTK_TREE_VIEW_LINE"
-                glib:nick="line"/>
-      <member name="item"
-                value="1"
-                c:identifier="GTK_TREE_VIEW_ITEM"
-                glib:nick="item"/>
-    </enumeration>
-    <enumeration name="CellType"
-                 c:type="GtkCellType"
-                 glib:type-name="GtkCellType"
-                 glib:get-type="gtk_cell_type_get_type">
-      <member name="empty"
-                value="0"
-                c:identifier="GTK_CELL_EMPTY"
-                glib:nick="empty"/>
-      <member name="text"
-                value="1"
-                c:identifier="GTK_CELL_TEXT"
-                glib:nick="text"/>
-      <member name="pixmap"
-                value="2"
-                c:identifier="GTK_CELL_PIXMAP"
-                glib:nick="pixmap"/>
-      <member name="pixtext"
-                value="3"
-                c:identifier="GTK_CELL_PIXTEXT"
-                glib:nick="pixtext"/>
-      <member name="widget"
-                value="4"
-                c:identifier="GTK_CELL_WIDGET"
-                glib:nick="widget"/>
-    </enumeration>
-    <enumeration name="CListDragPos"
-                 c:type="GtkCListDragPos"
-                 glib:type-name="GtkCListDragPos"
-                 glib:get-type="gtk_clist_drag_pos_get_type">
-      <member name="none"
-                value="0"
-                c:identifier="GTK_CLIST_DRAG_NONE"
-                glib:nick="none"/>
-      <member name="before"
-                value="1"
-                c:identifier="GTK_CLIST_DRAG_BEFORE"
-                glib:nick="before"/>
-      <member name="into"
-                value="2"
-                c:identifier="GTK_CLIST_DRAG_INTO"
-                glib:nick="into"/>
-      <member name="after"
-                value="3"
-                c:identifier="GTK_CLIST_DRAG_AFTER"
-                glib:nick="after"/>
-    </enumeration>
-    <bitfield name="ButtonAction"
-              c:type="GtkButtonAction"
-              glib:type-name="GtkButtonAction"
-              glib:get-type="gtk_button_action_get_type">
-      <member name="ignored"
-                value="0"
-                c:identifier="GTK_BUTTON_IGNORED"
-                glib:nick="ignored"/>
-      <member name="selects"
-                value="1"
-                c:identifier="GTK_BUTTON_SELECTS"
-                glib:nick="selects"/>
-      <member name="drags"
-                value="2"
-                c:identifier="GTK_BUTTON_DRAGS"
-                glib:nick="drags"/>
-      <member name="expands"
-                value="4"
-                c:identifier="GTK_BUTTON_EXPANDS"
-                glib:nick="expands"/>
-    </bitfield>
-    <enumeration name="CTreePos"
-                 c:type="GtkCTreePos"
-                 glib:type-name="GtkCTreePos"
-                 glib:get-type="gtk_ctree_pos_get_type">
-      <member name="before"
-                value="0"
-                c:identifier="GTK_CTREE_POS_BEFORE"
-                glib:nick="before"/>
-      <member name="as-child"
-                value="1"
-                c:identifier="GTK_CTREE_POS_AS_CHILD"
-                glib:nick="as-child"/>
-      <member name="after"
-                value="2"
-                c:identifier="GTK_CTREE_POS_AFTER"
-                glib:nick="after"/>
-    </enumeration>
-    <enumeration name="CTreeLineStyle"
-                 c:type="GtkCTreeLineStyle"
-                 glib:type-name="GtkCTreeLineStyle"
-                 glib:get-type="gtk_ctree_line_style_get_type">
-      <member name="none"
-                value="0"
-                c:identifier="GTK_CTREE_LINES_NONE"
-                glib:nick="none"/>
-      <member name="solid"
-                value="1"
-                c:identifier="GTK_CTREE_LINES_SOLID"
-                glib:nick="solid"/>
-      <member name="dotted"
-                value="2"
-                c:identifier="GTK_CTREE_LINES_DOTTED"
-                glib:nick="dotted"/>
-      <member name="tabbed"
-                value="3"
-                c:identifier="GTK_CTREE_LINES_TABBED"
-                glib:nick="tabbed"/>
-    </enumeration>
-    <enumeration name="CTreeExpanderStyle"
-                 c:type="GtkCTreeExpanderStyle"
-                 glib:type-name="GtkCTreeExpanderStyle"
-                 glib:get-type="gtk_ctree_expander_style_get_type">
-      <member name="none"
-                value="0"
-                c:identifier="GTK_CTREE_EXPANDER_NONE"
-                glib:nick="none"/>
-      <member name="square"
-                value="1"
-                c:identifier="GTK_CTREE_EXPANDER_SQUARE"
-                glib:nick="square"/>
-      <member name="triangle"
-                value="2"
-                c:identifier="GTK_CTREE_EXPANDER_TRIANGLE"
-                glib:nick="triangle"/>
-      <member name="circular"
-                value="3"
-                c:identifier="GTK_CTREE_EXPANDER_CIRCULAR"
-                glib:nick="circular"/>
-    </enumeration>
-    <enumeration name="CTreeExpansionType"
-                 c:type="GtkCTreeExpansionType"
-                 glib:type-name="GtkCTreeExpansionType"
-                 glib:get-type="gtk_ctree_expansion_type_get_type">
-      <member name="expand"
-                value="0"
-                c:identifier="GTK_CTREE_EXPANSION_EXPAND"
-                glib:nick="expand"/>
-      <member name="expand-recursive"
-                value="1"
-                c:identifier="GTK_CTREE_EXPANSION_EXPAND_RECURSIVE"
-                glib:nick="expand-recursive"/>
-      <member name="collapse"
-                value="2"
-                c:identifier="GTK_CTREE_EXPANSION_COLLAPSE"
-                glib:nick="collapse"/>
-      <member name="collapse-recursive"
-                value="3"
-                c:identifier="GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE"
-                glib:nick="collapse-recursive"/>
-      <member name="toggle"
-                value="4"
-                c:identifier="GTK_CTREE_EXPANSION_TOGGLE"
-                glib:nick="toggle"/>
-      <member name="toggle-recursive"
-                value="5"
-                c:identifier="GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE"
-                glib:nick="toggle-recursive"/>
+              value="1"
+              c:identifier="GTK_WIDGET_HELP_WHATS_THIS"
+              glib:nick="whats-this"/>
     </enumeration>
     <record name="GtkArg" c:type="GtkArg">
       <field name="type">
         <type name="GtkType" c:type="GtkType"/>
       </field>
       <field name="name">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="d">
         <type name="???" c:type="???"/>
@@ -3249,11 +3233,11 @@
         <type name="GInitiallyUnowned" c:type="GInitiallyUnowned"/>
       </field>
       <field name="flags">
-        <type name="guint32" c:type="guint32"/>
+        <type name="uint32" c:type="guint32"/>
       </field>
       <callback name="set_arg">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -3269,7 +3253,7 @@
       </callback>
       <callback name="get_arg">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -3285,7 +3269,7 @@
       </callback>
       <callback name="destroy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -3296,34 +3280,34 @@
     </record>
     <callback name="GtkFunction">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
     <callback name="GtkDestroyNotify">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
     <callback name="GtkCallbackMarshal">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
           <type name="GtkObject*" c:type="GtkObject*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="n_args">
           <type name="guint" c:type="guint"/>
@@ -3335,25 +3319,12 @@
     </callback>
     <callback name="GtkSignalFunc">
       <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-    </callback>
-    <callback name="GtkTranslateFunc">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
-      <parameters>
-        <parameter name="path">
-          <type name="gchar*" c:type="gchar*"/>
-        </parameter>
-        <parameter name="func_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
     </callback>
     <record name="GtkTypeInfo" c:type="GtkTypeInfo">
       <field name="type_name">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="object_size">
         <type name="guint" c:type="guint"/>
@@ -3368,10 +3339,10 @@
         <type name="GtkObjectInitFunc" c:type="GtkObjectInitFunc"/>
       </field>
       <field name="reserved_1">
-        <type name="gpointer" c:type="gpointer"/>
+        <type name="any" c:type="gpointer"/>
       </field>
       <field name="reserved_2">
-        <type name="gpointer" c:type="gpointer"/>
+        <type name="any" c:type="gpointer"/>
       </field>
       <field name="base_class_init_func">
         <type name="GtkClassInitFunc" c:type="GtkClassInitFunc"/>
@@ -3379,7 +3350,7 @@
     </record>
     <function name="type_class" c:identifier="gtk_type_class">
       <return-value>
-        <type name="gpointer" c:type="gpointer"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
         <parameter name="type">
@@ -3402,7 +3373,7 @@
     </function>
     <function name="type_new" c:identifier="gtk_type_new">
       <return-value>
-        <type name="gpointer" c:type="gpointer"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
         <parameter name="type">
@@ -3442,7 +3413,7 @@
           <type name="GtkType" c:type="GtkType"/>
         </parameter>
         <parameter name="value_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -3456,13 +3427,13 @@
           <type name="GtkType" c:type="GtkType"/>
         </parameter>
         <parameter name="value_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="type_init" c:identifier="gtk_type_init">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="debug_flags">
@@ -3477,7 +3448,7 @@
     </function>
     <function name="object_sink" c:identifier="gtk_object_sink">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -3487,7 +3458,7 @@
     </function>
     <function name="object_destroy" c:identifier="gtk_object_destroy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -3504,7 +3475,7 @@
           <type name="GtkType" c:type="GtkType"/>
         </parameter>
         <parameter name="first_property_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -3520,7 +3491,7 @@
     </function>
     <function name="object_unref" c:identifier="gtk_object_unref">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -3530,7 +3501,7 @@
     </function>
     <function name="object_weakref" c:identifier="gtk_object_weakref">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -3540,13 +3511,13 @@
           <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
     <function name="object_weakunref" c:identifier="gtk_object_weakunref">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -3556,40 +3527,40 @@
           <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
     <function name="object_set_data" c:identifier="gtk_object_set_data">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="key">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
     <function name="object_set_data_full"
               c:identifier="gtk_object_set_data_full">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="key">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy">
           <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
@@ -3598,62 +3569,62 @@
     </function>
     <function name="object_remove_data" c:identifier="gtk_object_remove_data">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="key">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="object_get_data" c:identifier="gtk_object_get_data">
       <return-value>
-        <type name="gpointer" c:type="gpointer"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
         <parameter name="object">
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="key">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="object_remove_no_notify"
               c:identifier="gtk_object_remove_no_notify">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="key">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="object_set_user_data"
               c:identifier="gtk_object_set_user_data">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
     <function name="object_get_user_data"
               c:identifier="gtk_object_get_user_data">
       <return-value>
-        <type name="gpointer" c:type="gpointer"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -3664,7 +3635,7 @@
     <function name="object_set_data_by_id"
               c:identifier="gtk_object_set_data_by_id">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -3674,14 +3645,14 @@
           <type name="GQuark" c:type="GQuark"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
     <function name="object_set_data_by_id_full"
               c:identifier="gtk_object_set_data_by_id_full">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -3691,7 +3662,7 @@
           <type name="GQuark" c:type="GQuark"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy">
           <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
@@ -3701,7 +3672,7 @@
     <function name="object_get_data_by_id"
               c:identifier="gtk_object_get_data_by_id">
       <return-value>
-        <type name="gpointer" c:type="gpointer"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -3715,7 +3686,7 @@
     <function name="object_remove_data_by_id"
               c:identifier="gtk_object_remove_data_by_id">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -3729,7 +3700,7 @@
     <function name="object_remove_no_notify_by_id"
               c:identifier="gtk_object_remove_no_notify_by_id">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -3742,37 +3713,38 @@
     </function>
     <function name="object_get" c:identifier="gtk_object_get">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="first_property_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="object_set" c:identifier="gtk_object_set">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="first_property_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="object_add_arg_type" c:identifier="gtk_object_add_arg_type">
+    <function name="object_add_arg_type"
+              c:identifier="gtk_object_add_arg_type">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="arg_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="arg_type">
           <type name="GtkType" c:type="GtkType"/>
@@ -3792,7 +3764,7 @@
            glib:get-type="gtk_adjustment_get_type">
       <method name="changed" c:identifier="gtk_adjustment_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="adjustment">
@@ -3802,7 +3774,7 @@
       </method>
       <method name="value_changed" c:identifier="gtk_adjustment_value_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="adjustment">
@@ -3812,23 +3784,23 @@
       </method>
       <method name="clamp_page" c:identifier="gtk_adjustment_clamp_page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="adjustment">
             <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
           <parameter name="lower">
-            <type name="gdouble" c:type="gdouble"/>
+            <type name="double" c:type="gdouble"/>
           </parameter>
           <parameter name="upper">
-            <type name="gdouble" c:type="gdouble"/>
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_value" c:identifier="gtk_adjustment_get_value">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
           <parameter name="adjustment">
@@ -3838,38 +3810,38 @@
       </method>
       <method name="set_value" c:identifier="gtk_adjustment_set_value">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="adjustment">
             <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
           <parameter name="value">
-            <type name="gdouble" c:type="gdouble"/>
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
       <property name="value">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </property>
       <property name="lower">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </property>
       <property name="upper">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </property>
       <property name="step-increment">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </property>
       <property name="page-increment">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </property>
       <property name="page-size">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </property>
       <callback name="changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="adjustment">
@@ -3879,7 +3851,7 @@
       </callback>
       <callback name="value_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="adjustment">
@@ -3889,32 +3861,32 @@
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <glib:signal name="changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="value-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
     </class>
@@ -3924,22 +3896,22 @@
       </return-value>
       <parameters>
         <parameter name="value">
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="double" c:type="gdouble"/>
         </parameter>
         <parameter name="lower">
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="double" c:type="gdouble"/>
         </parameter>
         <parameter name="upper">
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="double" c:type="gdouble"/>
         </parameter>
         <parameter name="step_increment">
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="double" c:type="gdouble"/>
         </parameter>
         <parameter name="page_increment">
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="double" c:type="gdouble"/>
         </parameter>
         <parameter name="page_size">
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="double" c:type="gdouble"/>
         </parameter>
       </parameters>
     </function>
@@ -3952,7 +3924,7 @@
         <type name="GQuark" c:type="GQuark"/>
       </field>
       <field name="origin">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="value">
         <type name="GValue" c:type="GValue"/>
@@ -3960,7 +3932,7 @@
     </record>
     <callback name="GtkRcPropertyParser">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="pspec">
@@ -4019,7 +3991,7 @@
       </constructor>
       <method name="detach" c:identifier="gtk_style_detach">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4029,7 +4001,7 @@
       </method>
       <method name="unref" c:identifier="gtk_style_unref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4049,7 +4021,7 @@
       </method>
       <method name="set_font" c:identifier="gtk_style_set_font">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4062,7 +4034,7 @@
       </method>
       <method name="set_background" c:identifier="gtk_style_set_background">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4079,7 +4051,7 @@
       <method name="apply_default_background"
               c:identifier="gtk_style_apply_default_background">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4089,25 +4061,25 @@
             <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="set_bg">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="state_type">
             <type name="StateType" c:type="GtkStateType"/>
           </parameter>
-          <parameter name="area">
+          <parameter name="area" allow-none="1">
             <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -4120,20 +4092,20 @@
             <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="stock_id">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="lookup_color" c:identifier="gtk_style_lookup_color">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="style">
             <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="color_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="color">
             <type name="GdkColor" c:type="GdkColor*"/>
@@ -4160,17 +4132,17 @@
           <parameter name="size">
             <type name="IconSize" c:type="GtkIconSize"/>
           </parameter>
-          <parameter name="widget">
+          <parameter name="widget" allow-none="1">
             <type name="GtkWidget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="detail">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="detail" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <callback name="realize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4180,7 +4152,7 @@
       </callback>
       <callback name="unrealize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4190,7 +4162,7 @@
       </callback>
       <callback name="copy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4213,7 +4185,7 @@
       </callback>
       <callback name="init_from_rc">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4226,7 +4198,7 @@
       </callback>
       <callback name="set_background">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4264,13 +4236,13 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_hline">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4289,22 +4261,22 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x1">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="x2">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_vline">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4323,22 +4295,22 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="y1_">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y2_">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_shadow">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4360,25 +4332,25 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_polygon">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4400,22 +4372,22 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="point">
             <type name="GdkPoint*" c:type="GdkPoint*"/>
           </parameter>
           <parameter name="npoints">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="fill">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_arrow">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4437,31 +4409,31 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="arrow_type">
             <type name="GtkArrowType" c:type="GtkArrowType"/>
           </parameter>
           <parameter name="fill">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_diamond">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4483,25 +4455,25 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_string">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4520,22 +4492,22 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="string">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_box">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4557,25 +4529,25 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_flat_box">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4597,25 +4569,25 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_check">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4637,25 +4609,25 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_option">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4677,25 +4649,25 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_tab">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4717,25 +4689,25 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_shadow_gap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4757,34 +4729,34 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="gap_side">
             <type name="GtkPositionType" c:type="GtkPositionType"/>
           </parameter>
           <parameter name="gap_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="gap_width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_box_gap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4806,34 +4778,34 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="gap_side">
             <type name="GtkPositionType" c:type="GtkPositionType"/>
           </parameter>
           <parameter name="gap_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="gap_width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_extension">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4855,19 +4827,19 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="gap_side">
             <type name="GtkPositionType" c:type="GtkPositionType"/>
@@ -4876,7 +4848,7 @@
       </callback>
       <callback name="draw_focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4895,25 +4867,25 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_slider">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4935,19 +4907,19 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="orientation">
             <type name="GtkOrientation" c:type="GtkOrientation"/>
@@ -4956,7 +4928,7 @@
       </callback>
       <callback name="draw_handle">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4978,19 +4950,19 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="orientation">
             <type name="GtkOrientation" c:type="GtkOrientation"/>
@@ -4999,7 +4971,7 @@
       </callback>
       <callback name="draw_expander">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -5018,13 +4990,13 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="expander_style">
             <type name="GtkExpanderStyle" c:type="GtkExpanderStyle"/>
@@ -5033,7 +5005,7 @@
       </callback>
       <callback name="draw_layout">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -5046,7 +5018,7 @@
             <type name="GtkStateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="use_text">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="area">
             <type name="GdkRectangle*" c:type="GdkRectangle*"/>
@@ -5055,13 +5027,13 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="layout">
             <type name="PangoLayout*" c:type="PangoLayout*"/>
@@ -5070,7 +5042,7 @@
       </callback>
       <callback name="draw_resize_grip">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -5089,99 +5061,99 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="edge">
             <type name="GdkWindowEdge" c:type="GdkWindowEdge"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved5">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved6">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved7">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved8">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved9">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved10">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved11">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved12">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <glib:signal name="realize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="unrealize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
     </class>
     <function name="draw_hline" c:identifier="gtk_draw_hline">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5194,19 +5166,19 @@
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
         <parameter name="x1">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="x2">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_vline" c:identifier="gtk_draw_vline">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5219,19 +5191,19 @@
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
         <parameter name="y1_">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y2_">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_shadow" c:identifier="gtk_draw_shadow">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5247,22 +5219,22 @@
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_polygon" c:identifier="gtk_draw_polygon">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5281,16 +5253,16 @@
           <type name="GdkPoint" c:type="GdkPoint*"/>
         </parameter>
         <parameter name="npoints">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="fill">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_arrow" c:identifier="gtk_draw_arrow">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5309,25 +5281,25 @@
           <type name="ArrowType" c:type="GtkArrowType"/>
         </parameter>
         <parameter name="fill">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_diamond" c:identifier="gtk_draw_diamond">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5343,22 +5315,22 @@
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_box" c:identifier="gtk_draw_box">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5374,22 +5346,22 @@
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_flat_box" c:identifier="gtk_draw_flat_box">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5405,22 +5377,22 @@
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_check" c:identifier="gtk_draw_check">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5436,22 +5408,22 @@
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_option" c:identifier="gtk_draw_option">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5467,22 +5439,22 @@
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_tab" c:identifier="gtk_draw_tab">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5498,22 +5470,22 @@
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_shadow_gap" c:identifier="gtk_draw_shadow_gap">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5529,31 +5501,31 @@
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="gap_side">
           <type name="PositionType" c:type="GtkPositionType"/>
         </parameter>
         <parameter name="gap_x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="gap_width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_box_gap" c:identifier="gtk_draw_box_gap">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5569,31 +5541,31 @@
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="gap_side">
           <type name="PositionType" c:type="GtkPositionType"/>
         </parameter>
         <parameter name="gap_x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="gap_width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_extension" c:identifier="gtk_draw_extension">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5609,16 +5581,16 @@
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="gap_side">
           <type name="PositionType" c:type="GtkPositionType"/>
@@ -5627,7 +5599,7 @@
     </function>
     <function name="draw_focus" c:identifier="gtk_draw_focus">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5637,22 +5609,22 @@
           <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_slider" c:identifier="gtk_draw_slider">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5668,16 +5640,16 @@
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="orientation">
           <type name="Orientation" c:type="GtkOrientation"/>
@@ -5686,7 +5658,7 @@
     </function>
     <function name="draw_handle" c:identifier="gtk_draw_handle">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5702,16 +5674,16 @@
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="orientation">
           <type name="Orientation" c:type="GtkOrientation"/>
@@ -5720,7 +5692,7 @@
     </function>
     <function name="draw_expander" c:identifier="gtk_draw_expander">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5733,10 +5705,10 @@
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="expander_style">
           <type name="ExpanderStyle" c:type="GtkExpanderStyle"/>
@@ -5745,7 +5717,7 @@
     </function>
     <function name="draw_layout" c:identifier="gtk_draw_layout">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5758,13 +5730,13 @@
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
         <parameter name="use_text">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="layout">
           <type name="Pango.Layout" c:type="PangoLayout*"/>
@@ -5773,7 +5745,7 @@
     </function>
     <function name="draw_resize_grip" c:identifier="gtk_draw_resize_grip">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5789,22 +5761,22 @@
           <type name="GdkWindowEdge" c:type="GdkWindowEdge"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_hline" c:identifier="gtk_paint_hline">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5816,29 +5788,29 @@
         <parameter name="state_type">
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x1">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="x2">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_vline" c:identifier="gtk_paint_vline">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5850,29 +5822,29 @@
         <parameter name="state_type">
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="y1_">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y2_">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_shadow" c:identifier="gtk_paint_shadow">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5887,32 +5859,32 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_polygon" c:identifier="gtk_paint_polygon">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5927,29 +5899,29 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="points">
           <type name="GdkPoint" c:type="GdkPoint*"/>
         </parameter>
-        <parameter name="n_points">
-          <type name="gint" c:type="gint"/>
+        <parameter name="npoints">
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="fill">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_arrow" c:identifier="gtk_paint_arrow">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -5964,38 +5936,38 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="arrow_type">
           <type name="ArrowType" c:type="GtkArrowType"/>
         </parameter>
         <parameter name="fill">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_diamond" c:identifier="gtk_paint_diamond">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6010,32 +5982,32 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_box" c:identifier="gtk_paint_box">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6050,32 +6022,32 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_flat_box" c:identifier="gtk_paint_flat_box">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6090,32 +6062,32 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_check" c:identifier="gtk_paint_check">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6130,32 +6102,32 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_option" c:identifier="gtk_paint_option">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6170,32 +6142,32 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_tab" c:identifier="gtk_paint_tab">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6210,32 +6182,32 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_shadow_gap" c:identifier="gtk_paint_shadow_gap">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6250,41 +6222,41 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="gap_side">
           <type name="PositionType" c:type="GtkPositionType"/>
         </parameter>
         <parameter name="gap_x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="gap_width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_box_gap" c:identifier="gtk_paint_box_gap">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6299,41 +6271,41 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="gap_side">
           <type name="PositionType" c:type="GtkPositionType"/>
         </parameter>
         <parameter name="gap_x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="gap_width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_extension" c:identifier="gtk_paint_extension">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6348,26 +6320,26 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="gap_side">
           <type name="PositionType" c:type="GtkPositionType"/>
@@ -6376,7 +6348,7 @@
     </function>
     <function name="paint_focus" c:identifier="gtk_paint_focus">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6388,32 +6360,32 @@
         <parameter name="state_type">
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_slider" c:identifier="gtk_paint_slider">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6428,26 +6400,26 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="orientation">
           <type name="Orientation" c:type="GtkOrientation"/>
@@ -6456,7 +6428,7 @@
     </function>
     <function name="paint_handle" c:identifier="gtk_paint_handle">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6471,26 +6443,26 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="orientation">
           <type name="Orientation" c:type="GtkOrientation"/>
@@ -6499,7 +6471,7 @@
     </function>
     <function name="paint_expander" c:identifier="gtk_paint_expander">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6511,20 +6483,20 @@
         <parameter name="state_type">
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="expander_style">
           <type name="ExpanderStyle" c:type="GtkExpanderStyle"/>
@@ -6533,7 +6505,7 @@
     </function>
     <function name="paint_layout" c:identifier="gtk_paint_layout">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6546,22 +6518,22 @@
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
         <parameter name="use_text">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="layout">
           <type name="Pango.Layout" c:type="PangoLayout*"/>
@@ -6570,7 +6542,7 @@
     </function>
     <function name="paint_resize_grip" c:identifier="gtk_paint_resize_grip">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6582,29 +6554,29 @@
         <parameter name="state_type">
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="edge">
           <type name="GdkWindowEdge" c:type="GdkWindowEdge"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -6612,11 +6584,6 @@
                 glib:name="Border"
                 glib:type-name="GtkBorder"
                 glib:get-type="gtk_border_get_type">
-      <constructor name="new" c:identifier="gtk_border_new">
-        <return-value>
-          <type name="Border" c:type="GtkBorder*"/>
-        </return-value>
-      </constructor>
       <constructor name="copy" c:identifier="gtk_border_copy">
         <return-value>
           <type name="Border" c:type="GtkBorder*"/>
@@ -6629,7 +6596,7 @@
       </constructor>
       <method name="free" c:identifier="gtk_border_free">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="border_">
@@ -6661,7 +6628,7 @@
     <function name="style_init_for_settings"
               c:identifier="_gtk_style_init_for_settings">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6674,7 +6641,7 @@
     </function>
     <function name="style_shade" c:identifier="_gtk_style_shade">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="a">
@@ -6684,13 +6651,13 @@
           <type name="GdkColor" c:type="GdkColor*"/>
         </parameter>
         <parameter name="k">
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="double" c:type="gdouble"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_string" c:identifier="gtk_draw_string">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6703,19 +6670,19 @@
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="string">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="paint_string" c:identifier="gtk_paint_string">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="style">
@@ -6727,30 +6694,30 @@
         <parameter name="state_type">
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="widget" allow-none="1">
           <type name="GtkWidget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="detail">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="string">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="draw_insertion_cursor"
               c:identifier="gtk_draw_insertion_cursor">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="widget">
@@ -6759,20 +6726,20 @@
         <parameter name="drawable">
           <type name="Gdk.Drawable" c:type="GdkDrawable*"/>
         </parameter>
-        <parameter name="area">
+        <parameter name="area" allow-none="1">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="location">
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="is_primary">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="direction">
           <type name="TextDirection" c:type="GtkTextDirection"/>
         </parameter>
         <parameter name="draw_arrow">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
@@ -6790,7 +6757,7 @@
     <function name="widget_get_cursor_color"
               c:identifier="_gtk_widget_get_cursor_color">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="widget">
@@ -6804,7 +6771,7 @@
     <record name="GtkRcContext" c:type="GtkRcContext"/>
     <function name="rc_init" c:identifier="_gtk_rc_init">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="rc_parse_widget_class_path"
@@ -6814,14 +6781,14 @@
       </return-value>
       <parameters>
         <parameter name="pattern">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="rc_free_widget_class_path"
               c:identifier="_gtk_rc_free_widget_class_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -6832,37 +6799,38 @@
     <function name="rc_match_widget_class"
               c:identifier="_gtk_rc_match_widget_class">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="list">
           <type name="GSList" c:type="GSList*"/>
         </parameter>
         <parameter name="length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="path">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="path_reversed">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="rc_add_default_file" c:identifier="gtk_rc_add_default_file">
+    <function name="rc_add_default_file"
+              c:identifier="gtk_rc_add_default_file">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="filename">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="rc_set_default_files"
               c:identifier="gtk_rc_set_default_files">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="filenames">
@@ -6895,11 +6863,11 @@
         <parameter name="settings">
           <type name="GtkSettings" c:type="GtkSettings*"/>
         </parameter>
-        <parameter name="widget_path">
-          <type name="char" c:type="char*"/>
+        <parameter name="widget_path" allow-none="1">
+          <type name="string" c:type="char*"/>
         </parameter>
-        <parameter name="class_path">
-          <type name="char" c:type="char*"/>
+        <parameter name="class_path" allow-none="1">
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="type">
           <type name="GType" c:type="GType"/>
@@ -6909,20 +6877,20 @@
     <function name="rc_reparse_all_for_settings"
               c:identifier="gtk_rc_reparse_all_for_settings">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="settings">
           <type name="GtkSettings" c:type="GtkSettings*"/>
         </parameter>
         <parameter name="force_load">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="rc_reset_styles" c:identifier="gtk_rc_reset_styles">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="settings">
@@ -6933,7 +6901,7 @@
     <function name="rc_find_pixmap_in_path"
               c:identifier="gtk_rc_find_pixmap_in_path">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="settings">
@@ -6943,73 +6911,73 @@
           <type name="GScanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="pixmap_file">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="rc_parse" c:identifier="gtk_rc_parse">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="filename">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="rc_parse_string" c:identifier="gtk_rc_parse_string">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="rc_string">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="rc_reparse_all" c:identifier="gtk_rc_reparse_all">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
     </function>
     <function name="rc_add_widget_name_style"
               c:identifier="gtk_rc_add_widget_name_style">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="rc_style">
           <type name="GtkRcStyle" c:type="GtkRcStyle*"/>
         </parameter>
         <parameter name="pattern">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="rc_add_widget_class_style"
               c:identifier="gtk_rc_add_widget_class_style">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="rc_style">
           <type name="GtkRcStyle" c:type="GtkRcStyle*"/>
         </parameter>
         <parameter name="pattern">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="rc_add_class_style" c:identifier="gtk_rc_add_class_style">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="rc_style">
           <type name="GtkRcStyle" c:type="GtkRcStyle*"/>
         </parameter>
         <parameter name="pattern">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -7035,7 +7003,7 @@
       </constructor>
       <method name="ref" c:identifier="gtk_rc_style_ref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="rc_style">
@@ -7045,7 +7013,7 @@
       </method>
       <method name="unref" c:identifier="gtk_rc_style_unref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="rc_style">
@@ -7081,7 +7049,7 @@
       </callback>
       <callback name="merge">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="dest">
@@ -7104,56 +7072,56 @@
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
     <function name="rc_find_module_in_path"
               c:identifier="gtk_rc_find_module_in_path">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="module_file">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="rc_get_theme_dir" c:identifier="gtk_rc_get_theme_dir">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
     <function name="rc_get_module_dir" c:identifier="gtk_rc_get_module_dir">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
     <function name="rc_get_im_module_path"
               c:identifier="gtk_rc_get_im_module_path">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
     <function name="rc_get_im_module_file"
               c:identifier="gtk_rc_get_im_module_file">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
     <function name="rc_scanner_new" c:identifier="gtk_rc_scanner_new">
@@ -7174,7 +7142,8 @@
         </parameter>
       </parameters>
     </function>
-    <function name="rc_parse_color_full" c:identifier="gtk_rc_parse_color_full">
+    <function name="rc_parse_color_full"
+              c:identifier="gtk_rc_parse_color_full">
       <return-value>
         <type name="guint" c:type="guint"/>
       </return-value>
@@ -7236,7 +7205,7 @@
     <function name="rc_style_set_rc_property"
               c:identifier="_gtk_rc_style_set_rc_property">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="rc_style">
@@ -7250,7 +7219,7 @@
     <function name="rc_style_unset_rc_property"
               c:identifier="_gtk_rc_style_unset_rc_property">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="rc_style">
@@ -7278,7 +7247,7 @@
     <function name="rc_context_get_default_font_name"
               c:identifier="_gtk_rc_context_get_default_font_name">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="settings">
@@ -7288,7 +7257,7 @@
     </function>
     <function name="rc_context_destroy" c:identifier="_gtk_rc_context_destroy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="settings">
@@ -7298,7 +7267,7 @@
     </function>
     <record name="GtkSettingsValue" c:type="GtkSettingsValue">
       <field name="origin">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="value">
         <type name="GValue" c:type="GValue"/>
@@ -7329,14 +7298,14 @@
       <method name="set_property_value"
               c:identifier="gtk_settings_set_property_value">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="settings">
             <type name="Settings" c:type="GtkSettings*"/>
           </parameter>
           <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="svalue">
             <type name="GtkSettingsValue" c:type="GtkSettingsValue*"/>
@@ -7346,209 +7315,206 @@
       <method name="set_string_property"
               c:identifier="gtk_settings_set_string_property">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="settings">
             <type name="Settings" c:type="GtkSettings*"/>
           </parameter>
           <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="v_string">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="origin">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_long_property"
               c:identifier="gtk_settings_set_long_property">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="settings">
             <type name="Settings" c:type="GtkSettings*"/>
           </parameter>
           <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="v_long">
-            <type name="glong" c:type="glong"/>
+            <type name="long" c:type="glong"/>
           </parameter>
           <parameter name="origin">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_double_property"
               c:identifier="gtk_settings_set_double_property">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="settings">
             <type name="Settings" c:type="GtkSettings*"/>
           </parameter>
           <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="v_double">
-            <type name="gdouble" c:type="gdouble"/>
+            <type name="double" c:type="gdouble"/>
           </parameter>
           <parameter name="origin">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <property name="gtk-double-click-time">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-double-click-distance">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-cursor-blink">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="gtk-cursor-blink-time">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-cursor-blink-timeout">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-split-cursor">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="gtk-theme-name">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="gtk-icon-theme-name">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="gtk-fallback-icon-theme">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="gtk-key-theme-name">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="gtk-menu-bar-accel">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="gtk-dnd-drag-threshold">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-font-name">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="gtk-icon-sizes">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="gtk-modules">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="gtk-xft-antialias">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-xft-hinting">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-xft-hintstyle">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="gtk-xft-rgba">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="gtk-xft-dpi">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-cursor-theme-name">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="gtk-cursor-theme-size">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-alternative-button-order">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="gtk-alternative-sort-arrows">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="gtk-show-input-method-menu">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="gtk-show-unicode-menu">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="gtk-timeout-initial">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-timeout-repeat">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-timeout-expand">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-color-scheme">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="gtk-enable-animations">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="gtk-touchscreen-mode">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="gtk-tooltip-timeout">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-tooltip-browse-timeout">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-tooltip-browse-mode-timeout">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-keynav-cursor-only">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="gtk-keynav-wrap-around">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="gtk-error-bell">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="color-hash">
         <type name="GHashTable" c:type="GHashTable"/>
       </property>
       <property name="gtk-file-chooser-backend">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="gtk-print-backends">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="gtk-print-preview-command">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="gtk-enable-mnemonics">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="gtk-enable-accels">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="gtk-recent-files-limit">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="gtk-im-module">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="gtk-recent-files-max-age">
-        <type name="gint" c:type="gint"/>
+        <type name="string" c:type="gchararray"/>
       </property>
     </class>
     <function name="settings_install_property"
               c:identifier="gtk_settings_install_property">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pspec">
@@ -7559,7 +7525,7 @@
     <function name="settings_install_property_parser"
               c:identifier="gtk_settings_install_property_parser">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pspec">
@@ -7573,7 +7539,7 @@
     <function name="rc_property_parse_color"
               c:identifier="gtk_rc_property_parse_color">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="pspec">
@@ -7590,7 +7556,7 @@
     <function name="rc_property_parse_enum"
               c:identifier="gtk_rc_property_parse_enum">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="pspec">
@@ -7607,7 +7573,7 @@
     <function name="rc_property_parse_flags"
               c:identifier="gtk_rc_property_parse_flags">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="pspec">
@@ -7624,7 +7590,7 @@
     <function name="rc_property_parse_requisition"
               c:identifier="gtk_rc_property_parse_requisition">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="pspec">
@@ -7641,7 +7607,7 @@
     <function name="rc_property_parse_border"
               c:identifier="gtk_rc_property_parse_border">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="pspec">
@@ -7658,14 +7624,14 @@
     <function name="settings_set_property_value_from_rc"
               c:identifier="_gtk_settings_set_property_value_from_rc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="settings">
           <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
         <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="svalue">
           <type name="GtkSettingsValue" c:type="GtkSettingsValue*"/>
@@ -7675,7 +7641,7 @@
     <function name="settings_reset_rc_values"
               c:identifier="_gtk_settings_reset_rc_values">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="settings">
@@ -7686,7 +7652,7 @@
     <function name="settings_handle_event"
               c:identifier="_gtk_settings_handle_event">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="event">
@@ -7708,7 +7674,7 @@
     <function name="settings_parse_convert"
               c:identifier="_gtk_settings_parse_convert">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="parser">
@@ -7727,16 +7693,16 @@
     </function>
     <record name="GtkWidgetAuxInfo" c:type="GtkWidgetAuxInfo">
       <field name="x">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="y">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="width">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="height">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="x_set">
         <type name="guint" c:type="guint"/>
@@ -7747,10 +7713,10 @@
     </record>
     <record name="GtkWidgetShapeInfo" c:type="GtkWidgetShapeInfo">
       <field name="offset_x">
-        <type name="gint16" c:type="gint16"/>
+        <type name="int16" c:type="gint16"/>
       </field>
       <field name="offset_y">
-        <type name="gint16" c:type="gint16"/>
+        <type name="int16" c:type="gint16"/>
       </field>
       <field name="shape_mask">
         <type name="GdkBitmap*" c:type="GdkBitmap*"/>
@@ -7758,14 +7724,14 @@
     </record>
     <callback name="GtkCallback">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="widget">
           <type name="GtkWidget*" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
@@ -7783,7 +7749,7 @@
             <type name="GType" c:type="GType"/>
           </parameter>
           <parameter name="first_property_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -7832,7 +7798,7 @@
       </constructor>
       <method name="destroy" c:identifier="gtk_widget_destroy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7842,7 +7808,7 @@
       </method>
       <method name="destroyed" c:identifier="gtk_widget_destroyed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7855,7 +7821,7 @@
       </method>
       <method name="unref" c:identifier="gtk_widget_unref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7865,20 +7831,20 @@
       </method>
       <method name="set" c:identifier="gtk_widget_set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="first_property_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="unparent" c:identifier="gtk_widget_unparent">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7888,7 +7854,7 @@
       </method>
       <method name="show" c:identifier="gtk_widget_show">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7898,7 +7864,7 @@
       </method>
       <method name="show_now" c:identifier="gtk_widget_show_now">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7908,7 +7874,7 @@
       </method>
       <method name="hide" c:identifier="gtk_widget_hide">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7918,7 +7884,7 @@
       </method>
       <method name="show_all" c:identifier="gtk_widget_show_all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7928,7 +7894,7 @@
       </method>
       <method name="hide_all" c:identifier="gtk_widget_hide_all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7938,20 +7904,20 @@
       </method>
       <method name="set_no_show_all" c:identifier="gtk_widget_set_no_show_all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="no_show_all">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_no_show_all" c:identifier="gtk_widget_get_no_show_all">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7961,7 +7927,7 @@
       </method>
       <method name="map" c:identifier="gtk_widget_map">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7971,7 +7937,7 @@
       </method>
       <method name="unmap" c:identifier="gtk_widget_unmap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7981,7 +7947,7 @@
       </method>
       <method name="realize" c:identifier="gtk_widget_realize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7991,7 +7957,7 @@
       </method>
       <method name="unrealize" c:identifier="gtk_widget_unrealize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8001,7 +7967,7 @@
       </method>
       <method name="queue_draw" c:identifier="gtk_widget_queue_draw">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8011,29 +7977,29 @@
       </method>
       <method name="queue_draw_area" c:identifier="gtk_widget_queue_draw_area">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="queue_clear" c:identifier="gtk_widget_queue_clear">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8044,29 +8010,29 @@
       <method name="queue_clear_area"
               c:identifier="gtk_widget_queue_clear_area">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="queue_resize" c:identifier="gtk_widget_queue_resize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8077,7 +8043,7 @@
       <method name="queue_resize_no_redraw"
               c:identifier="gtk_widget_queue_resize_no_redraw">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8087,7 +8053,7 @@
       </method>
       <method name="draw" c:identifier="gtk_widget_draw">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8100,7 +8066,7 @@
       </method>
       <method name="size_request" c:identifier="gtk_widget_size_request">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8113,7 +8079,7 @@
       </method>
       <method name="size_allocate" c:identifier="gtk_widget_size_allocate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8127,7 +8093,7 @@
       <method name="get_child_requisition"
               c:identifier="gtk_widget_get_child_requisition">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8140,14 +8106,14 @@
       </method>
       <method name="add_accelerator" c:identifier="gtk_widget_add_accelerator">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="accel_signal">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="accel_group">
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
@@ -8166,7 +8132,7 @@
       <method name="remove_accelerator"
               c:identifier="gtk_widget_remove_accelerator">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8185,16 +8151,16 @@
       </method>
       <method name="set_accel_path" c:identifier="gtk_widget_set_accel_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="accel_path">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="accel_path" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="accel_group">
+          <parameter name="accel_group" allow-none="1">
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
         </parameters>
@@ -8213,7 +8179,7 @@
       <method name="can_activate_accel"
               c:identifier="gtk_widget_can_activate_accel">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8227,20 +8193,20 @@
       <method name="mnemonic_activate"
               c:identifier="gtk_widget_mnemonic_activate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="group_cycling">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="event" c:identifier="gtk_widget_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8253,7 +8219,7 @@
       </method>
       <method name="send_expose" c:identifier="gtk_widget_send_expose">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8266,7 +8232,7 @@
       </method>
       <method name="activate" c:identifier="gtk_widget_activate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8277,23 +8243,23 @@
       <method name="set_scroll_adjustments"
               c:identifier="gtk_widget_set_scroll_adjustments">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="hadjustment">
+          <parameter name="hadjustment" allow-none="1">
             <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
-          <parameter name="vadjustment">
+          <parameter name="vadjustment" allow-none="1">
             <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
       <method name="reparent" c:identifier="gtk_widget_reparent">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8306,7 +8272,7 @@
       </method>
       <method name="intersect" c:identifier="gtk_widget_intersect">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8337,7 +8303,7 @@
       <method name="freeze_child_notify"
               c:identifier="gtk_widget_freeze_child_notify">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8347,21 +8313,21 @@
       </method>
       <method name="child_notify" c:identifier="gtk_widget_child_notify">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="child_property">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="thaw_child_notify"
               c:identifier="gtk_widget_thaw_child_notify">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8371,7 +8337,7 @@
       </method>
       <method name="is_focus" c:identifier="gtk_widget_is_focus">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8381,7 +8347,7 @@
       </method>
       <method name="grab_focus" c:identifier="gtk_widget_grab_focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8391,7 +8357,7 @@
       </method>
       <method name="grab_default" c:identifier="gtk_widget_grab_default">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8401,20 +8367,20 @@
       </method>
       <method name="set_name" c:identifier="gtk_widget_set_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_name" c:identifier="gtk_widget_get_name">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8424,7 +8390,7 @@
       </method>
       <method name="set_state" c:identifier="gtk_widget_set_state">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8437,62 +8403,62 @@
       </method>
       <method name="set_sensitive" c:identifier="gtk_widget_set_sensitive">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="sensitive">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_app_paintable"
               c:identifier="gtk_widget_set_app_paintable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="app_paintable">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_double_buffered"
               c:identifier="gtk_widget_set_double_buffered">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="double_buffered">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_redraw_on_allocate"
               c:identifier="gtk_widget_set_redraw_on_allocate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="redraw_on_allocate">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_parent" c:identifier="gtk_widget_set_parent">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8506,7 +8472,7 @@
       <method name="set_parent_window"
               c:identifier="gtk_widget_set_parent_window">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8520,21 +8486,21 @@
       <method name="set_child_visible"
               c:identifier="gtk_widget_set_child_visible">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="is_visible">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_child_visible"
               c:identifier="gtk_widget_get_child_visible">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8555,7 +8521,7 @@
       </method>
       <method name="child_focus" c:identifier="gtk_widget_child_focus">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8568,7 +8534,7 @@
       </method>
       <method name="keynav_failed" c:identifier="gtk_widget_keynav_failed">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8581,7 +8547,7 @@
       </method>
       <method name="error_bell" c:identifier="gtk_widget_error_bell">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8592,99 +8558,99 @@
       <method name="set_size_request"
               c:identifier="gtk_widget_set_size_request">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_size_request"
               c:identifier="gtk_widget_get_size_request">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="width">
+          <parameter name="width" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
-          <parameter name="height">
+          <parameter name="height" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_uposition" c:identifier="gtk_widget_set_uposition">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_usize" c:identifier="gtk_widget_set_usize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_events" c:identifier="gtk_widget_set_events">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="events">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="add_events" c:identifier="gtk_widget_add_events">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="events">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_extension_events"
               c:identifier="gtk_widget_set_extension_events">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8738,7 +8704,7 @@
       </method>
       <method name="has_screen" c:identifier="gtk_widget_has_screen">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8789,19 +8755,6 @@
           </parameter>
         </parameters>
       </method>
-      <method name="get_snapshot" c:identifier="gtk_widget_get_snapshot">
-        <return-value>
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="clip_rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-        </parameters>
-      </method>
       <method name="get_accessible" c:identifier="gtk_widget_get_accessible">
         <return-value>
           <type name="Atk.Object" c:type="AtkObject*"/>
@@ -8814,7 +8767,7 @@
       </method>
       <method name="set_colormap" c:identifier="gtk_widget_set_colormap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8827,7 +8780,7 @@
       </method>
       <method name="get_events" c:identifier="gtk_widget_get_events">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8837,7 +8790,7 @@
       </method>
       <method name="get_pointer" c:identifier="gtk_widget_get_pointer">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8853,7 +8806,7 @@
       </method>
       <method name="is_ancestor" c:identifier="gtk_widget_is_ancestor">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8867,7 +8820,7 @@
       <method name="translate_coordinates"
               c:identifier="gtk_widget_translate_coordinates">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="src_widget">
@@ -8877,22 +8830,22 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="src_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="src_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="dest_x">
+          <parameter name="dest_x" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
-          <parameter name="dest_y">
+          <parameter name="dest_y" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
       <method name="hide_on_delete" c:identifier="gtk_widget_hide_on_delete">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8902,20 +8855,20 @@
       </method>
       <method name="set_style" c:identifier="gtk_widget_set_style">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="style">
+          <parameter name="style" allow-none="1">
             <type name="Style" c:type="GtkStyle*"/>
           </parameter>
         </parameters>
       </method>
       <method name="ensure_style" c:identifier="gtk_widget_ensure_style">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8935,7 +8888,7 @@
       </method>
       <method name="modify_style" c:identifier="gtk_widget_modify_style">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8959,7 +8912,7 @@
       </method>
       <method name="modify_fg" c:identifier="gtk_widget_modify_fg">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8968,14 +8921,14 @@
           <parameter name="state">
             <type name="StateType" c:type="GtkStateType"/>
           </parameter>
-          <parameter name="color">
+          <parameter name="color" allow-none="1">
             <type name="GdkColor" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
       <method name="modify_bg" c:identifier="gtk_widget_modify_bg">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8984,14 +8937,14 @@
           <parameter name="state">
             <type name="StateType" c:type="GtkStateType"/>
           </parameter>
-          <parameter name="color">
+          <parameter name="color" allow-none="1">
             <type name="GdkColor" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
       <method name="modify_text" c:identifier="gtk_widget_modify_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9000,14 +8953,14 @@
           <parameter name="state">
             <type name="StateType" c:type="GtkStateType"/>
           </parameter>
-          <parameter name="color">
+          <parameter name="color" allow-none="1">
             <type name="GdkColor" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
       <method name="modify_base" c:identifier="gtk_widget_modify_base">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9016,14 +8969,14 @@
           <parameter name="state">
             <type name="StateType" c:type="GtkStateType"/>
           </parameter>
-          <parameter name="color">
+          <parameter name="color" allow-none="1">
             <type name="GdkColor" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
       <method name="modify_cursor" c:identifier="gtk_widget_modify_cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9039,13 +8992,13 @@
       </method>
       <method name="modify_font" c:identifier="gtk_widget_modify_font">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="font_desc">
+          <parameter name="font_desc" allow-none="1">
             <type name="PangoFontDescription" c:type="PangoFontDescription*"/>
           </parameter>
         </parameters>
@@ -9082,7 +9035,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
@@ -9095,34 +9048,34 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="stock_id">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="size">
             <type name="IconSize" c:type="GtkIconSize"/>
           </parameter>
-          <parameter name="detail">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="detail" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_composite_name"
               c:identifier="gtk_widget_set_composite_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_composite_name"
               c:identifier="gtk_widget_get_composite_name">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9132,7 +9085,7 @@
       </method>
       <method name="reset_rc_styles" c:identifier="gtk_widget_reset_rc_styles">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9143,14 +9096,14 @@
       <method name="style_get_property"
               c:identifier="gtk_widget_style_get_property">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="property_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="value">
             <type name="GValue" c:type="GValue*"/>
@@ -9160,14 +9113,14 @@
       <method name="style_get_valist"
               c:identifier="gtk_widget_style_get_valist">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="first_property_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="var_args">
             <type name="va_list" c:type="va_list"/>
@@ -9176,20 +9129,20 @@
       </method>
       <method name="style_get" c:identifier="gtk_widget_style_get">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="first_property_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_direction" c:identifier="gtk_widget_set_direction">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9212,7 +9165,7 @@
       </method>
       <method name="is_composited" c:identifier="gtk_widget_is_composited">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9223,7 +9176,7 @@
       <method name="shape_combine_mask"
               c:identifier="gtk_widget_shape_combine_mask">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9233,36 +9186,36 @@
             <type name="GdkBitmap" c:type="GdkBitmap*"/>
           </parameter>
           <parameter name="offset_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="offset_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="input_shape_combine_mask"
               c:identifier="gtk_widget_input_shape_combine_mask">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="shape_mask">
+          <parameter name="shape_mask" allow-none="1">
             <type name="GdkBitmap" c:type="GdkBitmap*"/>
           </parameter>
           <parameter name="offset_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="offset_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="reset_shapes" c:identifier="gtk_widget_reset_shapes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9272,38 +9225,38 @@
       </method>
       <method name="path" c:identifier="gtk_widget_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="path_length">
+          <parameter name="path_length" direction="out">
             <type name="guint" c:type="guint*"/>
           </parameter>
-          <parameter name="path">
+          <parameter name="path" direction="out">
             <type name="gchar" c:type="gchar**"/>
           </parameter>
-          <parameter name="path_reversed">
+          <parameter name="path_reversed" direction="out">
             <type name="gchar" c:type="gchar**"/>
           </parameter>
         </parameters>
       </method>
       <method name="class_path" c:identifier="gtk_widget_class_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="path_length">
+          <parameter name="path_length" direction="out">
             <type name="guint" c:type="guint*"/>
           </parameter>
-          <parameter name="path">
+          <parameter name="path" direction="out">
             <type name="gchar" c:type="gchar**"/>
           </parameter>
-          <parameter name="path_reversed">
+          <parameter name="path_reversed" direction="out">
             <type name="gchar" c:type="gchar**"/>
           </parameter>
         </parameters>
@@ -9322,7 +9275,7 @@
       <method name="add_mnemonic_label"
               c:identifier="gtk_widget_add_mnemonic_label">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9336,7 +9289,7 @@
       <method name="remove_mnemonic_label"
               c:identifier="gtk_widget_remove_mnemonic_label">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9350,7 +9303,7 @@
       <method name="set_tooltip_window"
               c:identifier="gtk_widget_set_tooltip_window">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9375,7 +9328,7 @@
       <method name="trigger_tooltip_query"
               c:identifier="gtk_widget_trigger_tooltip_query">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9386,21 +9339,21 @@
       <method name="set_tooltip_text"
               c:identifier="gtk_widget_set_tooltip_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_tooltip_text"
               c:identifier="gtk_widget_get_tooltip_text">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9411,21 +9364,21 @@
       <method name="set_tooltip_markup"
               c:identifier="gtk_widget_set_tooltip_markup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="markup">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_tooltip_markup"
               c:identifier="gtk_widget_get_tooltip_markup">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9435,20 +9388,20 @@
       </method>
       <method name="set_has_tooltip" c:identifier="gtk_widget_set_has_tooltip">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="has_tooltip">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_has_tooltip" c:identifier="gtk_widget_get_has_tooltip">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9467,46 +9420,46 @@
         </parameters>
       </method>
       <property name="name">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="parent">
         <type name="GtkContainer" c:type="GtkContainer"/>
       </property>
       <property name="width-request">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="height-request">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="visible">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="sensitive">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="app-paintable">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="can-focus">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="has-focus">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="is-focus">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="can-default">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="has-default">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="receives-default">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="composite-child">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="style">
         <type name="GtkStyle" c:type="GtkStyle"/>
@@ -9518,16 +9471,16 @@
         <type name="GdkExtensionMode" c:type="GdkExtensionMode"/>
       </property>
       <property name="no-show-all">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="has-tooltip">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="tooltip-markup">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="tooltip-text">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <field name="activate_signal">
         <type name="guint" c:type="guint"/>
@@ -9537,7 +9490,7 @@
       </field>
       <callback name="dispatch_child_properties_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9553,7 +9506,7 @@
       </callback>
       <callback name="show">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9563,7 +9516,7 @@
       </callback>
       <callback name="show_all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9573,7 +9526,7 @@
       </callback>
       <callback name="hide">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9583,7 +9536,7 @@
       </callback>
       <callback name="hide_all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9593,7 +9546,7 @@
       </callback>
       <callback name="map">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9603,7 +9556,7 @@
       </callback>
       <callback name="unmap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9613,7 +9566,7 @@
       </callback>
       <callback name="realize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9623,7 +9576,7 @@
       </callback>
       <callback name="unrealize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9633,7 +9586,7 @@
       </callback>
       <callback name="size_request">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9646,7 +9599,7 @@
       </callback>
       <callback name="size_allocate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9659,7 +9612,7 @@
       </callback>
       <callback name="state_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9672,7 +9625,7 @@
       </callback>
       <callback name="parent_set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9685,7 +9638,7 @@
       </callback>
       <callback name="hierarchy_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9698,7 +9651,7 @@
       </callback>
       <callback name="style_set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9711,7 +9664,7 @@
       </callback>
       <callback name="direction_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9724,20 +9677,20 @@
       </callback>
       <callback name="grab_notify">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="was_grabbed">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="child_notify">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9750,20 +9703,20 @@
       </callback>
       <callback name="mnemonic_activate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="group_cycling">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="grab_focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9773,7 +9726,7 @@
       </callback>
       <callback name="focus">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9786,7 +9739,7 @@
       </callback>
       <callback name="event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9799,7 +9752,7 @@
       </callback>
       <callback name="button_press_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9812,7 +9765,7 @@
       </callback>
       <callback name="button_release_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9825,7 +9778,7 @@
       </callback>
       <callback name="scroll_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9838,7 +9791,7 @@
       </callback>
       <callback name="motion_notify_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9851,7 +9804,7 @@
       </callback>
       <callback name="delete_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9864,7 +9817,7 @@
       </callback>
       <callback name="destroy_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9877,7 +9830,7 @@
       </callback>
       <callback name="expose_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9890,7 +9843,7 @@
       </callback>
       <callback name="key_press_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9903,7 +9856,7 @@
       </callback>
       <callback name="key_release_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9916,7 +9869,7 @@
       </callback>
       <callback name="enter_notify_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9929,7 +9882,7 @@
       </callback>
       <callback name="leave_notify_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9942,7 +9895,7 @@
       </callback>
       <callback name="configure_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9955,7 +9908,7 @@
       </callback>
       <callback name="focus_in_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9968,7 +9921,7 @@
       </callback>
       <callback name="focus_out_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9981,7 +9934,7 @@
       </callback>
       <callback name="map_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9994,7 +9947,7 @@
       </callback>
       <callback name="unmap_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10007,7 +9960,7 @@
       </callback>
       <callback name="property_notify_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10020,7 +9973,7 @@
       </callback>
       <callback name="selection_clear_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10033,7 +9986,7 @@
       </callback>
       <callback name="selection_request_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10046,7 +9999,7 @@
       </callback>
       <callback name="selection_notify_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10059,7 +10012,7 @@
       </callback>
       <callback name="proximity_in_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10072,7 +10025,7 @@
       </callback>
       <callback name="proximity_out_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10085,7 +10038,7 @@
       </callback>
       <callback name="visibility_notify_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10098,7 +10051,7 @@
       </callback>
       <callback name="client_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10111,7 +10064,7 @@
       </callback>
       <callback name="no_expose_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10124,7 +10077,7 @@
       </callback>
       <callback name="window_state_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10137,7 +10090,7 @@
       </callback>
       <callback name="selection_get">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10156,7 +10109,7 @@
       </callback>
       <callback name="selection_received">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10172,7 +10125,7 @@
       </callback>
       <callback name="drag_begin">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10185,7 +10138,7 @@
       </callback>
       <callback name="drag_end">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10198,7 +10151,7 @@
       </callback>
       <callback name="drag_data_get">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10220,7 +10173,7 @@
       </callback>
       <callback name="drag_data_delete">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10233,7 +10186,7 @@
       </callback>
       <callback name="drag_leave">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10249,7 +10202,7 @@
       </callback>
       <callback name="drag_motion">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10259,10 +10212,10 @@
             <type name="GdkDragContext*" c:type="GdkDragContext*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="time_">
             <type name="guint" c:type="guint"/>
@@ -10271,7 +10224,7 @@
       </callback>
       <callback name="drag_drop">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10281,10 +10234,10 @@
             <type name="GdkDragContext*" c:type="GdkDragContext*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="time_">
             <type name="guint" c:type="guint"/>
@@ -10293,7 +10246,7 @@
       </callback>
       <callback name="drag_data_received">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10303,10 +10256,10 @@
             <type name="GdkDragContext*" c:type="GdkDragContext*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="selection_data">
             <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
@@ -10321,7 +10274,7 @@
       </callback>
       <callback name="popup_menu">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10331,7 +10284,7 @@
       </callback>
       <callback name="show_help">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10354,7 +10307,7 @@
       </callback>
       <callback name="screen_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10367,7 +10320,7 @@
       </callback>
       <callback name="can_activate_accel">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10380,7 +10333,7 @@
       </callback>
       <callback name="grab_broken_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10393,7 +10346,7 @@
       </callback>
       <callback name="composited_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -10403,20 +10356,20 @@
       </callback>
       <callback name="query_tooltip">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="keyboard_tooltip">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="tooltip">
             <type name="GtkTooltip*" c:type="GtkTooltip*"/>
@@ -10425,52 +10378,52 @@
       </callback>
       <callback name="_gtk_reserved5">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved6">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved7">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <glib:signal name="realize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="unrealize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="show">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="hide">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="map">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="unmap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="size-request">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10480,7 +10433,7 @@
       </glib:signal>
       <glib:signal name="size-allocate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10490,7 +10443,7 @@
       </glib:signal>
       <glib:signal name="state-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10500,7 +10453,7 @@
       </glib:signal>
       <glib:signal name="parent-set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10510,7 +10463,7 @@
       </glib:signal>
       <glib:signal name="hierarchy-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10520,7 +10473,7 @@
       </glib:signal>
       <glib:signal name="style-set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10530,7 +10483,7 @@
       </glib:signal>
       <glib:signal name="direction-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10540,17 +10493,17 @@
       </glib:signal>
       <glib:signal name="grab-notify">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </glib:signal>
       <glib:signal name="child-notify">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10560,22 +10513,22 @@
       </glib:signal>
       <glib:signal name="mnemonic-activate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </glib:signal>
       <glib:signal name="grab-focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="focus">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10585,7 +10538,7 @@
       </glib:signal>
       <glib:signal name="move-focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10595,7 +10548,7 @@
       </glib:signal>
       <glib:signal name="event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10605,7 +10558,7 @@
       </glib:signal>
       <glib:signal name="event-after">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10615,7 +10568,7 @@
       </glib:signal>
       <glib:signal name="button-press-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10625,7 +10578,7 @@
       </glib:signal>
       <glib:signal name="button-release-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10635,7 +10588,7 @@
       </glib:signal>
       <glib:signal name="scroll-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10645,7 +10598,7 @@
       </glib:signal>
       <glib:signal name="motion-notify-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10655,12 +10608,12 @@
       </glib:signal>
       <glib:signal name="composited-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="keynav-failed">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10670,7 +10623,7 @@
       </glib:signal>
       <glib:signal name="delete-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10680,7 +10633,7 @@
       </glib:signal>
       <glib:signal name="destroy-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10690,7 +10643,7 @@
       </glib:signal>
       <glib:signal name="expose-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10700,7 +10653,7 @@
       </glib:signal>
       <glib:signal name="key-press-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10710,7 +10663,7 @@
       </glib:signal>
       <glib:signal name="key-release-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10720,7 +10673,7 @@
       </glib:signal>
       <glib:signal name="enter-notify-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10730,7 +10683,7 @@
       </glib:signal>
       <glib:signal name="leave-notify-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10740,7 +10693,7 @@
       </glib:signal>
       <glib:signal name="configure-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10750,7 +10703,7 @@
       </glib:signal>
       <glib:signal name="focus-in-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10760,7 +10713,7 @@
       </glib:signal>
       <glib:signal name="focus-out-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10770,7 +10723,7 @@
       </glib:signal>
       <glib:signal name="map-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10780,7 +10733,7 @@
       </glib:signal>
       <glib:signal name="unmap-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10790,7 +10743,7 @@
       </glib:signal>
       <glib:signal name="property-notify-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10800,7 +10753,7 @@
       </glib:signal>
       <glib:signal name="selection-clear-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10810,7 +10763,7 @@
       </glib:signal>
       <glib:signal name="selection-request-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10820,7 +10773,7 @@
       </glib:signal>
       <glib:signal name="selection-notify-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10830,7 +10783,7 @@
       </glib:signal>
       <glib:signal name="selection-received">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10843,7 +10796,7 @@
       </glib:signal>
       <glib:signal name="selection-get">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10859,7 +10812,7 @@
       </glib:signal>
       <glib:signal name="proximity-in-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10869,7 +10822,7 @@
       </glib:signal>
       <glib:signal name="proximity-out-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10879,7 +10832,7 @@
       </glib:signal>
       <glib:signal name="drag-leave">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10892,7 +10845,7 @@
       </glib:signal>
       <glib:signal name="drag-begin">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10902,7 +10855,7 @@
       </glib:signal>
       <glib:signal name="drag-end">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10912,7 +10865,7 @@
       </glib:signal>
       <glib:signal name="drag-data-delete">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10922,7 +10875,7 @@
       </glib:signal>
       <glib:signal name="drag-failed">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10935,17 +10888,17 @@
       </glib:signal>
       <glib:signal name="drag-motion">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
             <type name="GdkDragContext" c:type="GdkDragContext"/>
           </parameter>
           <parameter name="p0">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="p1">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="p2">
             <type name="guint" c:type="guint"/>
@@ -10954,17 +10907,17 @@
       </glib:signal>
       <glib:signal name="drag-drop">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
             <type name="GdkDragContext" c:type="GdkDragContext"/>
           </parameter>
           <parameter name="p0">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="p1">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="p2">
             <type name="guint" c:type="guint"/>
@@ -10973,7 +10926,7 @@
       </glib:signal>
       <glib:signal name="drag-data-get">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -10992,17 +10945,17 @@
       </glib:signal>
       <glib:signal name="drag-data-received">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
             <type name="GdkDragContext" c:type="GdkDragContext"/>
           </parameter>
           <parameter name="p0">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="p1">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="p2">
             <type name="GtkSelectionData" c:type="GtkSelectionData"/>
@@ -11017,7 +10970,7 @@
       </glib:signal>
       <glib:signal name="visibility-notify-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -11027,7 +10980,7 @@
       </glib:signal>
       <glib:signal name="client-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -11037,7 +10990,7 @@
       </glib:signal>
       <glib:signal name="no-expose-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -11047,17 +11000,7 @@
       </glib:signal>
       <glib:signal name="window-state-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="damage-event">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -11067,7 +11010,7 @@
       </glib:signal>
       <glib:signal name="grab-broken-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -11077,17 +11020,17 @@
       </glib:signal>
       <glib:signal name="query-tooltip">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="p0">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="p1">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="p2">
             <type name="GtkTooltip" c:type="GtkTooltip"/>
@@ -11096,12 +11039,12 @@
       </glib:signal>
       <glib:signal name="popup-menu">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
       </glib:signal>
       <glib:signal name="show-help">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -11111,12 +11054,12 @@
       </glib:signal>
       <glib:signal name="accel-closures-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="screen-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -11126,7 +11069,7 @@
       </glib:signal>
       <glib:signal name="can-activate-accel">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -11138,7 +11081,7 @@
     <function name="widget_get_accel_path"
               c:identifier="_gtk_widget_get_accel_path">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="widget">
@@ -11152,7 +11095,7 @@
     <function name="widget_push_colormap"
               c:identifier="gtk_widget_push_colormap">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cmap">
@@ -11163,24 +11106,25 @@
     <function name="widget_push_composite_child"
               c:identifier="gtk_widget_push_composite_child">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="widget_pop_composite_child"
               c:identifier="gtk_widget_pop_composite_child">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
-    <function name="widget_pop_colormap" c:identifier="gtk_widget_pop_colormap">
+    <function name="widget_pop_colormap"
+              c:identifier="gtk_widget_pop_colormap">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="widget_class_install_style_property"
               c:identifier="gtk_widget_class_install_style_property">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="klass">
@@ -11194,7 +11138,7 @@
     <function name="widget_class_install_style_property_parser"
               c:identifier="gtk_widget_class_install_style_property_parser">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="klass">
@@ -11218,7 +11162,7 @@
           <type name="GtkWidgetClass" c:type="GtkWidgetClass*"/>
         </parameter>
         <parameter name="property_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -11239,7 +11183,7 @@
     <function name="widget_set_default_colormap"
               c:identifier="gtk_widget_set_default_colormap">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="colormap">
@@ -11268,7 +11212,7 @@
     <function name="widget_set_default_direction"
               c:identifier="gtk_widget_set_default_direction">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="dir">
@@ -11298,7 +11242,7 @@
       </constructor>
       <method name="free" c:identifier="gtk_requisition_free">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="requisition">
@@ -11309,14 +11253,14 @@
     </glib:boxed>
     <function name="widget_grab_notify" c:identifier="_gtk_widget_grab_notify">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="widget">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="was_grabbed">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
@@ -11330,14 +11274,14 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="create">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="widget_propagate_hierarchy_changed"
               c:identifier="_gtk_widget_propagate_hierarchy_changed">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="widget">
@@ -11351,7 +11295,7 @@
     <function name="widget_propagate_screen_changed"
               c:identifier="_gtk_widget_propagate_screen_changed">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="widget">
@@ -11365,7 +11309,7 @@
     <function name="widget_propagate_composited_changed"
               c:identifier="_gtk_widget_propagate_composited_changed">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="widget">
@@ -11387,7 +11331,7 @@
       <method name="set_border_width"
               c:identifier="gtk_container_set_border_width">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11411,7 +11355,7 @@
       </method>
       <method name="add" c:identifier="gtk_container_add">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11424,7 +11368,7 @@
       </method>
       <method name="remove" c:identifier="gtk_container_remove">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11438,7 +11382,7 @@
       <method name="set_resize_mode"
               c:identifier="gtk_container_set_resize_mode">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11462,7 +11406,7 @@
       </method>
       <method name="check_resize" c:identifier="gtk_container_check_resize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11472,7 +11416,7 @@
       </method>
       <method name="foreach" c:identifier="gtk_container_foreach">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11482,13 +11426,13 @@
             <type name="GtkCallback" c:type="GtkCallback"/>
           </parameter>
           <parameter name="callback_data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
       <method name="foreach_full" c:identifier="gtk_container_foreach_full">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11501,7 +11445,7 @@
             <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
           </parameter>
           <parameter name="callback_data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="notify">
             <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
@@ -11521,7 +11465,7 @@
       <method name="propagate_expose"
               c:identifier="gtk_container_propagate_expose">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11538,7 +11482,7 @@
       <method name="set_focus_chain"
               c:identifier="gtk_container_set_focus_chain">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11552,7 +11496,7 @@
       <method name="get_focus_chain"
               c:identifier="gtk_container_get_focus_chain">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11566,7 +11510,7 @@
       <method name="unset_focus_chain"
               c:identifier="gtk_container_unset_focus_chain">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11577,27 +11521,27 @@
       <method name="set_reallocate_redraws"
               c:identifier="gtk_container_set_reallocate_redraws">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
             <type name="Container" c:type="GtkContainer*"/>
           </parameter>
           <parameter name="needs_redraws">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_focus_child"
               c:identifier="gtk_container_set_focus_child">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
             <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="child">
+          <parameter name="child" allow-none="1">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
@@ -11605,7 +11549,7 @@
       <method name="set_focus_vadjustment"
               c:identifier="gtk_container_set_focus_vadjustment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11630,7 +11574,7 @@
       <method name="set_focus_hadjustment"
               c:identifier="gtk_container_set_focus_hadjustment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11655,7 +11599,7 @@
       <method name="resize_children"
               c:identifier="gtk_container_resize_children">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11676,7 +11620,7 @@
       <method name="add_with_properties"
               c:identifier="gtk_container_add_with_properties">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11686,13 +11630,13 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="first_prop_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="child_set" c:identifier="gtk_container_child_set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11702,13 +11646,13 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="first_prop_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="child_get" c:identifier="gtk_container_child_get">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11718,14 +11662,14 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="first_prop_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="child_set_valist"
               c:identifier="gtk_container_child_set_valist">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11735,7 +11679,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="first_property_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="var_args">
             <type name="va_list" c:type="va_list"/>
@@ -11745,7 +11689,7 @@
       <method name="child_get_valist"
               c:identifier="gtk_container_child_get_valist">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11755,7 +11699,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="first_property_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="var_args">
             <type name="va_list" c:type="va_list"/>
@@ -11765,7 +11709,7 @@
       <method name="child_set_property"
               c:identifier="gtk_container_child_set_property">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11775,7 +11719,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="property_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="value">
             <type name="GValue" c:type="GValue*"/>
@@ -11785,7 +11729,7 @@
       <method name="child_get_property"
               c:identifier="gtk_container_child_get_property">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11795,7 +11739,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="property_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="value">
             <type name="GValue" c:type="GValue*"/>
@@ -11804,7 +11748,7 @@
       </method>
       <method name="forall" c:identifier="gtk_container_forall">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11814,7 +11758,7 @@
             <type name="GtkCallback" c:type="GtkCallback"/>
           </parameter>
           <parameter name="callback_data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
@@ -11829,7 +11773,7 @@
       </property>
       <callback name="add">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11842,7 +11786,7 @@
       </callback>
       <callback name="remove">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11855,7 +11799,7 @@
       </callback>
       <callback name="check_resize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11865,26 +11809,26 @@
       </callback>
       <callback name="forall">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
             <type name="GtkContainer*" c:type="GtkContainer*"/>
           </parameter>
           <parameter name="include_internals">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="callback">
             <type name="GtkCallback" c:type="GtkCallback"/>
           </parameter>
           <parameter name="callback_data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="set_focus_child">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11907,7 +11851,7 @@
       </callback>
       <callback name="composite_name">
         <return-value>
-          <type name="gchar*" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11920,7 +11864,7 @@
       </callback>
       <callback name="set_child_property">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11942,7 +11886,7 @@
       </callback>
       <callback name="get_child_property">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11964,27 +11908,27 @@
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <glib:signal name="add">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -11994,7 +11938,7 @@
       </glib:signal>
       <glib:signal name="remove">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -12004,12 +11948,12 @@
       </glib:signal>
       <glib:signal name="check-resize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="set-focus-child">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -12021,7 +11965,7 @@
     <function name="container_class_install_child_property"
               c:identifier="gtk_container_class_install_child_property">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cclass">
@@ -12045,7 +11989,7 @@
           <type name="GObjectClass" c:type="GObjectClass*"/>
         </parameter>
         <parameter name="property_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -12066,7 +12010,7 @@
     <function name="container_queue_resize"
               c:identifier="_gtk_container_queue_resize">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="container">
@@ -12077,7 +12021,7 @@
     <function name="container_clear_resize_widgets"
               c:identifier="_gtk_container_clear_resize_widgets">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="container">
@@ -12088,7 +12032,7 @@
     <function name="container_child_composite_name"
               c:identifier="_gtk_container_child_composite_name">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="container">
@@ -12102,7 +12046,7 @@
     <function name="container_dequeue_resize_handler"
               c:identifier="_gtk_container_dequeue_resize_handler">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="container">
@@ -12165,20 +12109,20 @@
       </constructor>
       <method name="set_title" c:identifier="gtk_window_set_title">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="title">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_title" c:identifier="gtk_window_get_title">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12188,49 +12132,49 @@
       </method>
       <method name="set_wmclass" c:identifier="gtk_window_set_wmclass">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="wmclass_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="wmclass_class">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_role" c:identifier="gtk_window_set_role">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="role">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_startup_id" c:identifier="gtk_window_set_startup_id">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="startup_id">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_role" c:identifier="gtk_window_get_role">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12240,7 +12184,7 @@
       </method>
       <method name="add_accel_group" c:identifier="gtk_window_add_accel_group">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12254,7 +12198,7 @@
       <method name="remove_accel_group"
               c:identifier="gtk_window_remove_accel_group">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12267,7 +12211,7 @@
       </method>
       <method name="set_position" c:identifier="gtk_window_set_position">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12280,7 +12224,7 @@
       </method>
       <method name="activate_focus" c:identifier="gtk_window_activate_focus">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12290,13 +12234,13 @@
       </method>
       <method name="set_focus" c:identifier="gtk_window_set_focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="focus">
+          <parameter name="focus" allow-none="1">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
@@ -12313,13 +12257,13 @@
       </method>
       <method name="set_default" c:identifier="gtk_window_set_default">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="default_widget">
+          <parameter name="default_widget" allow-none="1">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
@@ -12327,7 +12271,7 @@
       <method name="activate_default"
               c:identifier="gtk_window_activate_default">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12338,33 +12282,33 @@
       <method name="set_transient_for"
               c:identifier="gtk_window_set_transient_for">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="parent">
+          <parameter name="parent" allow-none="1">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_opacity" c:identifier="gtk_window_set_opacity">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="opacity">
-            <type name="gdouble" c:type="gdouble"/>
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_opacity" c:identifier="gtk_window_get_opacity">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12374,7 +12318,7 @@
       </method>
       <method name="set_type_hint" c:identifier="gtk_window_set_type_hint">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12398,21 +12342,21 @@
       <method name="set_skip_taskbar_hint"
               c:identifier="gtk_window_set_skip_taskbar_hint">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_skip_taskbar_hint"
               c:identifier="gtk_window_get_skip_taskbar_hint">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12423,21 +12367,21 @@
       <method name="set_skip_pager_hint"
               c:identifier="gtk_window_set_skip_pager_hint">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_skip_pager_hint"
               c:identifier="gtk_window_get_skip_pager_hint">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12448,21 +12392,21 @@
       <method name="set_urgency_hint"
               c:identifier="gtk_window_set_urgency_hint">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_urgency_hint"
               c:identifier="gtk_window_get_urgency_hint">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12473,21 +12417,21 @@
       <method name="set_accept_focus"
               c:identifier="gtk_window_set_accept_focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_accept_focus"
               c:identifier="gtk_window_get_accept_focus">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12498,21 +12442,21 @@
       <method name="set_focus_on_map"
               c:identifier="gtk_window_set_focus_on_map">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_focus_on_map"
               c:identifier="gtk_window_get_focus_on_map">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12523,21 +12467,21 @@
       <method name="set_destroy_with_parent"
               c:identifier="gtk_window_set_destroy_with_parent">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_destroy_with_parent"
               c:identifier="gtk_window_get_destroy_with_parent">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12547,20 +12491,20 @@
       </method>
       <method name="set_resizable" c:identifier="gtk_window_set_resizable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="resizable">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_resizable" c:identifier="gtk_window_get_resizable">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12570,7 +12514,7 @@
       </method>
       <method name="set_gravity" c:identifier="gtk_window_set_gravity">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12594,7 +12538,7 @@
       <method name="set_geometry_hints"
               c:identifier="gtk_window_set_geometry_hints">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12613,7 +12557,7 @@
       </method>
       <method name="set_screen" c:identifier="gtk_window_set_screen">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12636,7 +12580,7 @@
       </method>
       <method name="is_active" c:identifier="gtk_window_is_active">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12647,7 +12591,7 @@
       <method name="has_toplevel_focus"
               c:identifier="gtk_window_has_toplevel_focus">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12657,20 +12601,20 @@
       </method>
       <method name="set_has_frame" c:identifier="gtk_window_set_has_frame">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_has_frame" c:identifier="gtk_window_get_has_frame">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12681,30 +12625,30 @@
       <method name="set_frame_dimensions"
               c:identifier="gtk_window_set_frame_dimensions">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="left">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="top">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="right">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="bottom">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_frame_dimensions"
               c:identifier="gtk_window_get_frame_dimensions">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12726,20 +12670,20 @@
       </method>
       <method name="set_decorated" c:identifier="gtk_window_set_decorated">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_decorated" c:identifier="gtk_window_get_decorated">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12749,20 +12693,20 @@
       </method>
       <method name="set_deletable" c:identifier="gtk_window_set_deletable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_deletable" c:identifier="gtk_window_get_deletable">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12772,7 +12716,7 @@
       </method>
       <method name="set_icon_list" c:identifier="gtk_window_set_icon_list">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12795,41 +12739,41 @@
       </method>
       <method name="set_icon" c:identifier="gtk_window_set_icon">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="icon">
+          <parameter name="icon" allow-none="1">
             <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_icon_name" c:identifier="gtk_window_set_icon_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_icon_from_file"
               c:identifier="gtk_window_set_icon_from_file">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="filename">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="err">
             <type name="GError" c:type="GError**"/>
@@ -12848,7 +12792,7 @@
       </method>
       <method name="get_icon_name" c:identifier="gtk_window_get_icon_name">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12858,20 +12802,20 @@
       </method>
       <method name="set_modal" c:identifier="gtk_window_set_modal">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="modal">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_modal" c:identifier="gtk_window_get_modal">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12881,7 +12825,7 @@
       </method>
       <method name="add_mnemonic" c:identifier="gtk_window_add_mnemonic">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12897,7 +12841,7 @@
       </method>
       <method name="remove_mnemonic" c:identifier="gtk_window_remove_mnemonic">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12914,7 +12858,7 @@
       <method name="mnemonic_activate"
               c:identifier="gtk_window_mnemonic_activate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12931,7 +12875,7 @@
       <method name="set_mnemonic_modifier"
               c:identifier="gtk_window_set_mnemonic_modifier">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12955,7 +12899,7 @@
       </method>
       <method name="activate_key" c:identifier="gtk_window_activate_key">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12969,7 +12913,7 @@
       <method name="propagate_key_event"
               c:identifier="gtk_window_propagate_key_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12982,7 +12926,7 @@
       </method>
       <method name="present" c:identifier="gtk_window_present">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12993,20 +12937,20 @@
       <method name="present_with_time"
               c:identifier="gtk_window_present_with_time">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="timestamp">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
       <method name="iconify" c:identifier="gtk_window_iconify">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13016,7 +12960,7 @@
       </method>
       <method name="deiconify" c:identifier="gtk_window_deiconify">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13026,7 +12970,7 @@
       </method>
       <method name="stick" c:identifier="gtk_window_stick">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13036,7 +12980,7 @@
       </method>
       <method name="unstick" c:identifier="gtk_window_unstick">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13046,7 +12990,7 @@
       </method>
       <method name="maximize" c:identifier="gtk_window_maximize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13056,7 +13000,7 @@
       </method>
       <method name="unmaximize" c:identifier="gtk_window_unmaximize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13066,7 +13010,7 @@
       </method>
       <method name="fullscreen" c:identifier="gtk_window_fullscreen">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13076,7 +13020,7 @@
       </method>
       <method name="unfullscreen" c:identifier="gtk_window_unfullscreen">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13086,34 +13030,34 @@
       </method>
       <method name="set_keep_above" c:identifier="gtk_window_set_keep_above">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_keep_below" c:identifier="gtk_window_set_keep_below">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="begin_resize_drag"
               c:identifier="gtk_window_begin_resize_drag">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13123,81 +13067,81 @@
             <type name="GdkWindowEdge" c:type="GdkWindowEdge"/>
           </parameter>
           <parameter name="button">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="root_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="root_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="timestamp">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
       <method name="begin_move_drag" c:identifier="gtk_window_begin_move_drag">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="button">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="root_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="root_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="timestamp">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_policy" c:identifier="gtk_window_set_policy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="allow_shrink">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="allow_grow">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="auto_shrink">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_default_size"
               c:identifier="gtk_window_set_default_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_default_size"
               c:identifier="gtk_window_get_default_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13213,55 +13157,55 @@
       </method>
       <method name="resize" c:identifier="gtk_window_resize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_size" c:identifier="gtk_window_get_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="width">
+          <parameter name="width" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
-          <parameter name="height">
+          <parameter name="height" direction="out">
             <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
       <method name="move" c:identifier="gtk_window_move">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_position" c:identifier="gtk_window_get_position">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13277,14 +13221,14 @@
       </method>
       <method name="parse_geometry" c:identifier="gtk_window_parse_geometry">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="geometry">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
@@ -13301,7 +13245,7 @@
       <method name="reshow_with_initial_size"
               c:identifier="gtk_window_reshow_with_initial_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13312,7 +13256,7 @@
       <method name="remove_embedded_xid"
               c:identifier="gtk_window_remove_embedded_xid">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13326,7 +13270,7 @@
       <method name="add_embedded_xid"
               c:identifier="gtk_window_add_embedded_xid">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13341,43 +13285,43 @@
         <type name="GtkWindowType" c:type="GtkWindowType"/>
       </property>
       <property name="title">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="startup-id">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="role">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="allow-shrink">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="allow-grow">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="resizable">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="modal">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="window-position">
         <type name="GtkWindowPosition" c:type="GtkWindowPosition"/>
       </property>
       <property name="default-width">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="default-height">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="destroy-with-parent">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="icon">
         <type name="GdkPixbuf" c:type="GdkPixbuf"/>
       </property>
       <property name="icon-name">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="screen">
         <type name="GdkScreen" c:type="GdkScreen"/>
@@ -13386,25 +13330,25 @@
         <type name="GdkWindowTypeHint" c:type="GdkWindowTypeHint"/>
       </property>
       <property name="skip-taskbar-hint">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="skip-pager-hint">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="urgency-hint">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="accept-focus">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="focus-on-map">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="decorated">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="deletable">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="gravity">
         <type name="GdkGravity" c:type="GdkGravity"/>
@@ -13413,17 +13357,17 @@
         <type name="GtkWindow" c:type="GtkWindow"/>
       </property>
       <property name="opacity">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </property>
       <property name="is-active">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="has-toplevel-focus">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <callback name="set_focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13436,7 +13380,7 @@
       </callback>
       <callback name="frame_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13449,7 +13393,7 @@
       </callback>
       <callback name="activate_focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13459,7 +13403,7 @@
       </callback>
       <callback name="activate_default">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13469,7 +13413,7 @@
       </callback>
       <callback name="move_focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13482,7 +13426,7 @@
       </callback>
       <callback name="keys_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13492,27 +13436,27 @@
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <glib:signal name="set-focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -13522,7 +13466,7 @@
       </glib:signal>
       <glib:signal name="frame-event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -13532,17 +13476,17 @@
       </glib:signal>
       <glib:signal name="activate-focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="activate-default">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="keys-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
     </class>
@@ -13559,7 +13503,7 @@
     <function name="window_set_default_icon_list"
               c:identifier="gtk_window_set_default_icon_list">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -13576,7 +13520,7 @@
     <function name="window_set_default_icon"
               c:identifier="gtk_window_set_default_icon">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="icon">
@@ -13587,22 +13531,22 @@
     <function name="window_set_default_icon_name"
               c:identifier="gtk_window_set_default_icon_name">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="window_set_default_icon_from_file"
               c:identifier="gtk_window_set_default_icon_from_file">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="filename">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="err">
           <type name="GError" c:type="GError**"/>
@@ -13612,11 +13556,11 @@
     <function name="window_set_auto_startup_notification"
               c:identifier="gtk_window_set_auto_startup_notification">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="setting">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
@@ -13638,7 +13582,7 @@
       </constructor>
       <method name="add_window" c:identifier="gtk_window_group_add_window">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window_group">
@@ -13652,7 +13596,7 @@
       <method name="remove_window"
               c:identifier="gtk_window_group_remove_window">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="window_group">
@@ -13665,29 +13609,29 @@
       </method>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
     <function name="window_internal_set_focus"
               c:identifier="_gtk_window_internal_set_focus">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="window">
@@ -13700,34 +13644,34 @@
     </function>
     <function name="window_reposition" c:identifier="_gtk_window_reposition">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="window">
           <type name="Window" c:type="GtkWindow*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="window_constrain_size"
               c:identifier="_gtk_window_constrain_size">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="window">
           <type name="Window" c:type="GtkWindow*"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="new_width">
           <type name="gint" c:type="gint*"/>
@@ -13751,21 +13695,21 @@
     <function name="window_set_has_toplevel_focus"
               c:identifier="_gtk_window_set_has_toplevel_focus">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="window">
           <type name="Window" c:type="GtkWindow*"/>
         </parameter>
         <parameter name="has_toplevel_focus">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="window_unset_focus_and_default"
               c:identifier="_gtk_window_unset_focus_and_default">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="window">
@@ -13779,20 +13723,20 @@
     <function name="window_set_is_active"
               c:identifier="_gtk_window_set_is_active">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="window">
           <type name="Window" c:type="GtkWindow*"/>
         </parameter>
         <parameter name="is_active">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <callback name="GtkWindowKeysForeachFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="window">
@@ -13805,17 +13749,17 @@
           <type name="GdkModifierType" c:type="GdkModifierType"/>
         </parameter>
         <parameter name="is_mnemonic">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
     <function name="window_keys_foreach"
               c:identifier="_gtk_window_keys_foreach">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="window">
@@ -13823,17 +13767,17 @@
         </parameter>
         <parameter name="func">
           <type name="GtkWindowKeysForeachFunc"
-                  c:type="GtkWindowKeysForeachFunc"/>
+                c:type="GtkWindowKeysForeachFunc"/>
         </parameter>
         <parameter name="func_data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
     <function name="window_query_nonaccels"
               c:identifier="_gtk_window_query_nonaccels">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="window">
@@ -13855,7 +13799,7 @@
       <method name="add_action_widget"
               c:identifier="gtk_dialog_add_action_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="dialog">
@@ -13865,7 +13809,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="response_id">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -13878,61 +13822,61 @@
             <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
           <parameter name="button_text">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="response_id">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="add_buttons" c:identifier="gtk_dialog_add_buttons">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="dialog">
             <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
           <parameter name="first_button_text">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_response_sensitive"
               c:identifier="gtk_dialog_set_response_sensitive">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="dialog">
             <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
           <parameter name="response_id">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_default_response"
               c:identifier="gtk_dialog_set_default_response">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="dialog">
             <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
           <parameter name="response_id">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_response_for_widget"
               c:identifier="gtk_dialog_get_response_for_widget">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="dialog">
@@ -13946,21 +13890,21 @@
       <method name="set_has_separator"
               c:identifier="gtk_dialog_set_has_separator">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="dialog">
             <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_has_separator"
               c:identifier="gtk_dialog_get_has_separator">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="dialog">
@@ -13971,28 +13915,28 @@
       <method name="set_alternative_button_order"
               c:identifier="gtk_dialog_set_alternative_button_order">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="dialog">
             <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
           <parameter name="first_response_id">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_alternative_button_order_from_array"
               c:identifier="gtk_dialog_set_alternative_button_order_from_array">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="dialog">
             <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
           <parameter name="n_params">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="new_order">
             <type name="gint" c:type="gint*"/>
@@ -14001,20 +13945,20 @@
       </method>
       <method name="response" c:identifier="gtk_dialog_response">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="dialog">
             <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
           <parameter name="response_id">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="run" c:identifier="gtk_dialog_run">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="dialog">
@@ -14023,24 +13967,24 @@
         </parameters>
       </method>
       <property name="has-separator">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <callback name="response">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="dialog">
             <type name="GtkDialog*" c:type="GtkDialog*"/>
           </parameter>
           <parameter name="response_id">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="close">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="dialog">
@@ -14050,37 +13994,37 @@
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <glib:signal name="response">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
       <glib:signal name="close">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
     </class>
@@ -14095,27 +14039,27 @@
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="title">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="title" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="parent">
+        <parameter name="parent" allow-none="1">
           <type name="Window" c:type="GtkWindow*"/>
         </parameter>
         <parameter name="flags">
           <type name="DialogFlags" c:type="GtkDialogFlags"/>
         </parameter>
-        <parameter name="first_button_text">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="first_button_text" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="alternative_dialog_button_order"
               c:identifier="gtk_alternative_dialog_button_order">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="screen">
+        <parameter name="screen" allow-none="1">
           <type name="Gdk.Screen" c:type="GdkScreen*"/>
         </parameter>
       </parameters>
@@ -14123,14 +14067,14 @@
     <function name="dialog_set_ignore_separator"
               c:identifier="_gtk_dialog_set_ignore_separator">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="dialog">
           <type name="Dialog" c:type="GtkDialog*"/>
         </parameter>
         <parameter name="ignore_separator">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
@@ -14141,7 +14085,7 @@
            glib:get-type="gtk_about_dialog_get_type">
       <method name="get_name" c:identifier="gtk_about_dialog_get_name">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14151,21 +14095,21 @@
       </method>
       <method name="set_name" c:identifier="gtk_about_dialog_set_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="about">
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_program_name"
               c:identifier="gtk_about_dialog_get_program_name">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14176,20 +14120,20 @@
       <method name="set_program_name"
               c:identifier="gtk_about_dialog_set_program_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="about">
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
           <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_version" c:identifier="gtk_about_dialog_get_version">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14199,21 +14143,21 @@
       </method>
       <method name="set_version" c:identifier="gtk_about_dialog_set_version">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="about">
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="version">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="version" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_copyright"
               c:identifier="gtk_about_dialog_get_copyright">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14224,20 +14168,20 @@
       <method name="set_copyright"
               c:identifier="gtk_about_dialog_set_copyright">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="about">
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="copyright">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="copyright" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_comments" c:identifier="gtk_about_dialog_get_comments">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14247,20 +14191,20 @@
       </method>
       <method name="set_comments" c:identifier="gtk_about_dialog_set_comments">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="about">
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="comments">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="comments" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_license" c:identifier="gtk_about_dialog_get_license">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14270,21 +14214,21 @@
       </method>
       <method name="set_license" c:identifier="gtk_about_dialog_set_license">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="about">
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="license">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="license" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_wrap_license"
               c:identifier="gtk_about_dialog_get_wrap_license">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14295,20 +14239,20 @@
       <method name="set_wrap_license"
               c:identifier="gtk_about_dialog_set_wrap_license">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="about">
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
           <parameter name="wrap_license">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_website" c:identifier="gtk_about_dialog_get_website">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14318,21 +14262,21 @@
       </method>
       <method name="set_website" c:identifier="gtk_about_dialog_set_website">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="about">
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="website">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="website" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_website_label"
               c:identifier="gtk_about_dialog_get_website_label">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14343,14 +14287,14 @@
       <method name="set_website_label"
               c:identifier="gtk_about_dialog_set_website_label">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="about">
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="website_label">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="website_label" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
@@ -14366,7 +14310,7 @@
       </method>
       <method name="set_authors" c:identifier="gtk_about_dialog_set_authors">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14391,7 +14335,7 @@
       <method name="set_documenters"
               c:identifier="gtk_about_dialog_set_documenters">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14414,7 +14358,7 @@
       </method>
       <method name="set_artists" c:identifier="gtk_about_dialog_set_artists">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14428,7 +14372,7 @@
       <method name="get_translator_credits"
               c:identifier="gtk_about_dialog_get_translator_credits">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14439,14 +14383,14 @@
       <method name="set_translator_credits"
               c:identifier="gtk_about_dialog_set_translator_credits">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="about">
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="translator_credits">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="translator_credits" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
@@ -14462,13 +14406,13 @@
       </method>
       <method name="set_logo" c:identifier="gtk_about_dialog_set_logo">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="about">
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="logo">
+          <parameter name="logo" allow-none="1">
             <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
@@ -14476,7 +14420,7 @@
       <method name="get_logo_icon_name"
               c:identifier="gtk_about_dialog_get_logo_icon_name">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14487,37 +14431,37 @@
       <method name="set_logo_icon_name"
               c:identifier="gtk_about_dialog_set_logo_icon_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="about">
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="icon_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="icon_name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <property name="program-name">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="version">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="copyright">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="comments">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="website">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="website-label">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="license">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="authors">
         <type name="GStrv" c:type="GStrv"/>
@@ -14526,7 +14470,7 @@
         <type name="GStrv" c:type="GStrv"/>
       </property>
       <property name="translator-credits">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="artists">
         <type name="GStrv" c:type="GStrv"/>
@@ -14535,29 +14479,29 @@
         <type name="GdkPixbuf" c:type="GdkPixbuf"/>
       </property>
       <property name="logo-icon-name">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="wrap-license">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
@@ -14568,30 +14512,30 @@
     </function>
     <function name="show_about_dialog" c:identifier="gtk_show_about_dialog">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="parent">
           <type name="Window" c:type="GtkWindow*"/>
         </parameter>
         <parameter name="first_property_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <callback name="GtkAboutDialogActivateLinkFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="about">
           <type name="GtkAboutDialog*" c:type="GtkAboutDialog*"/>
         </parameter>
         <parameter name="link_">
-          <type name="gchar*" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
@@ -14599,15 +14543,15 @@
               c:identifier="gtk_about_dialog_set_email_hook">
       <return-value>
         <type name="GtkAboutDialogActivateLinkFunc"
-                c:type="GtkAboutDialogActivateLinkFunc"/>
+              c:type="GtkAboutDialogActivateLinkFunc"/>
       </return-value>
       <parameters>
         <parameter name="func">
           <type name="GtkAboutDialogActivateLinkFunc"
-                  c:type="GtkAboutDialogActivateLinkFunc"/>
+                c:type="GtkAboutDialogActivateLinkFunc"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy">
           <type name="GDestroyNotify" c:type="GDestroyNotify"/>
@@ -14618,15 +14562,15 @@
               c:identifier="gtk_about_dialog_set_url_hook">
       <return-value>
         <type name="GtkAboutDialogActivateLinkFunc"
-                c:type="GtkAboutDialogActivateLinkFunc"/>
+              c:type="GtkAboutDialogActivateLinkFunc"/>
       </return-value>
       <parameters>
         <parameter name="func">
           <type name="GtkAboutDialogActivateLinkFunc"
-                  c:type="GtkAboutDialogActivateLinkFunc"/>
+                c:type="GtkAboutDialogActivateLinkFunc"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy">
           <type name="GDestroyNotify" c:type="GDestroyNotify"/>
@@ -14640,23 +14584,23 @@
            glib:get-type="gtk_misc_get_type">
       <method name="set_alignment" c:identifier="gtk_misc_set_alignment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="misc">
             <type name="Misc" c:type="GtkMisc*"/>
           </parameter>
           <parameter name="xalign">
-            <type name="gfloat" c:type="gfloat"/>
+            <type name="float" c:type="gfloat"/>
           </parameter>
           <parameter name="yalign">
-            <type name="gfloat" c:type="gfloat"/>
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_alignment" c:identifier="gtk_misc_get_alignment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="misc">
@@ -14672,23 +14616,23 @@
       </method>
       <method name="set_padding" c:identifier="gtk_misc_set_padding">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="misc">
             <type name="Misc" c:type="GtkMisc*"/>
           </parameter>
           <parameter name="xpad">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="ypad">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_padding" c:identifier="gtk_misc_get_padding">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="misc">
@@ -14703,16 +14647,16 @@
         </parameters>
       </method>
       <property name="xalign">
-        <type name="gfloat" c:type="gfloat"/>
+        <type name="float" c:type="gfloat"/>
       </property>
       <property name="yalign">
-        <type name="gfloat" c:type="gfloat"/>
+        <type name="float" c:type="gfloat"/>
       </property>
       <property name="xpad">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="ypad">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
     </class>
     <class name="MenuShell"
@@ -14722,7 +14666,7 @@
            glib:get-type="gtk_menu_shell_get_type">
       <method name="append" c:identifier="gtk_menu_shell_append">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14735,7 +14679,7 @@
       </method>
       <method name="prepend" c:identifier="gtk_menu_shell_prepend">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14748,7 +14692,7 @@
       </method>
       <method name="insert" c:identifier="gtk_menu_shell_insert">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14758,13 +14702,13 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="position">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="deactivate" c:identifier="gtk_menu_shell_deactivate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14774,7 +14718,7 @@
       </method>
       <method name="select_item" c:identifier="gtk_menu_shell_select_item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14787,7 +14731,7 @@
       </method>
       <method name="deselect" c:identifier="gtk_menu_shell_deselect">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14797,7 +14741,7 @@
       </method>
       <method name="activate_item" c:identifier="gtk_menu_shell_activate_item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14807,26 +14751,26 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="force_deactivate">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="select_first" c:identifier="gtk_menu_shell_select_first">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
             <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
           <parameter name="search_sensitive">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="cancel" c:identifier="gtk_menu_shell_cancel">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14837,7 +14781,7 @@
       <method name="get_take_focus"
               c:identifier="gtk_menu_shell_get_take_focus">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14848,26 +14792,26 @@
       <method name="set_take_focus"
               c:identifier="gtk_menu_shell_set_take_focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
             <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
           <parameter name="take_focus">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <property name="take-focus">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <field name="submenu_placement">
         <type name="guint" c:type="guint"/>
       </field>
       <callback name="deactivate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14877,7 +14821,7 @@
       </callback>
       <callback name="selection_done">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14887,7 +14831,7 @@
       </callback>
       <callback name="move_current">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14900,20 +14844,20 @@
       </callback>
       <callback name="activate_current">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
             <type name="GtkMenuShell*" c:type="GtkMenuShell*"/>
           </parameter>
           <parameter name="force_hide">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="cancel">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14923,7 +14867,7 @@
       </callback>
       <callback name="select_item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14936,7 +14880,7 @@
       </callback>
       <callback name="insert">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14946,13 +14890,13 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="position">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_popup_delay">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
@@ -14962,40 +14906,40 @@
       </callback>
       <callback name="move_selected">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="menu_shell">
             <type name="GtkMenuShell*" c:type="GtkMenuShell*"/>
           </parameter>
           <parameter name="distance">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <glib:signal name="deactivate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="selection-done">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="move-current">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -15005,22 +14949,22 @@
       </glib:signal>
       <glib:signal name="activate-current">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </glib:signal>
       <glib:signal name="cancel">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="cycle-focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -15030,11 +14974,11 @@
       </glib:signal>
       <glib:signal name="move-selected">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -15042,21 +14986,21 @@
     <function name="menu_shell_select_last"
               c:identifier="_gtk_menu_shell_select_last">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="menu_shell">
           <type name="MenuShell" c:type="GtkMenuShell*"/>
         </parameter>
         <parameter name="search_sensitive">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="menu_shell_activate"
               c:identifier="_gtk_menu_shell_activate">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="menu_shell">
@@ -15067,7 +15011,7 @@
     <function name="menu_shell_get_popup_delay"
               c:identifier="_gtk_menu_shell_get_popup_delay">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="menu_shell">
@@ -15078,7 +15022,7 @@
     <function name="menu_shell_add_mnemonic"
               c:identifier="_gtk_menu_shell_add_mnemonic">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="menu_shell">
@@ -15095,7 +15039,7 @@
     <function name="menu_shell_remove_mnemonic"
               c:identifier="_gtk_menu_shell_remove_mnemonic">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="menu_shell">
@@ -15111,7 +15055,7 @@
     </function>
     <callback name="GtkMenuPositionFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="menu">
@@ -15127,13 +15071,13 @@
           <type name="gboolean*" c:type="gboolean*"/>
         </parameter>
         <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
     <callback name="GtkMenuDetachFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="attach_widget">
@@ -15151,7 +15095,7 @@
            glib:get-type="gtk_menu_get_type">
       <method name="popup" c:identifier="gtk_menu_popup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu">
@@ -15167,19 +15111,19 @@
             <type name="GtkMenuPositionFunc" c:type="GtkMenuPositionFunc"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="button">
             <type name="guint" c:type="guint"/>
           </parameter>
           <parameter name="activate_time">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
       <method name="reposition" c:identifier="gtk_menu_reposition">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu">
@@ -15189,7 +15133,7 @@
       </method>
       <method name="popdown" c:identifier="gtk_menu_popdown">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu">
@@ -15209,7 +15153,7 @@
       </method>
       <method name="set_active" c:identifier="gtk_menu_set_active">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu">
@@ -15222,13 +15166,13 @@
       </method>
       <method name="set_accel_group" c:identifier="gtk_menu_set_accel_group">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu">
             <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
-          <parameter name="accel_group">
+          <parameter name="accel_group" allow-none="1">
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
         </parameters>
@@ -15245,20 +15189,20 @@
       </method>
       <method name="set_accel_path" c:identifier="gtk_menu_set_accel_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu">
             <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
-          <parameter name="accel_path">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="accel_path" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="attach_to_widget" c:identifier="gtk_menu_attach_to_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu">
@@ -15274,7 +15218,7 @@
       </method>
       <method name="detach" c:identifier="gtk_menu_detach">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu">
@@ -15296,21 +15240,21 @@
       <method name="set_tearoff_state"
               c:identifier="gtk_menu_set_tearoff_state">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu">
             <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
           <parameter name="torn_off">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_tearoff_state"
               c:identifier="gtk_menu_get_tearoff_state">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="menu">
@@ -15320,20 +15264,20 @@
       </method>
       <method name="set_title" c:identifier="gtk_menu_set_title">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu">
             <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
           <parameter name="title">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_title" c:identifier="gtk_menu_get_title">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="menu">
@@ -15343,7 +15287,7 @@
       </method>
       <method name="reorder_child" c:identifier="gtk_menu_reorder_child">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu">
@@ -15353,26 +15297,26 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="position">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_screen" c:identifier="gtk_menu_set_screen">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu">
             <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
-          <parameter name="screen">
+          <parameter name="screen" allow-none="1">
             <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
       </method>
       <method name="attach" c:identifier="gtk_menu_attach">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu">
@@ -15397,46 +15341,46 @@
       </method>
       <method name="set_monitor" c:identifier="gtk_menu_set_monitor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="menu">
             <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
           <parameter name="monitor_num">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <property name="tearoff-state">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="tearoff-title">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <glib:signal name="move-scroll">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -15469,20 +15413,20 @@
            glib:get-type="gtk_label_get_type">
       <method name="set_text" c:identifier="gtk_label_set_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="str">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_text" c:identifier="gtk_label_get_text">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15492,7 +15436,7 @@
       </method>
       <method name="set_attributes" c:identifier="gtk_label_set_attributes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15515,20 +15459,20 @@
       </method>
       <method name="set_label" c:identifier="gtk_label_set_label">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="str">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_label" c:identifier="gtk_label_get_label">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15538,33 +15482,33 @@
       </method>
       <method name="set_markup" c:identifier="gtk_label_set_markup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="str">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_use_markup" c:identifier="gtk_label_set_use_markup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_use_markup" c:identifier="gtk_label_get_use_markup">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15575,21 +15519,21 @@
       <method name="set_use_underline"
               c:identifier="gtk_label_set_use_underline">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_use_underline"
               c:identifier="gtk_label_get_use_underline">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15600,14 +15544,14 @@
       <method name="set_markup_with_mnemonic"
               c:identifier="gtk_label_set_markup_with_mnemonic">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="str">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
@@ -15625,13 +15569,13 @@
       <method name="set_mnemonic_widget"
               c:identifier="gtk_label_set_mnemonic_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="widget">
+          <parameter name="widget" allow-none="1">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
@@ -15650,20 +15594,20 @@
       <method name="set_text_with_mnemonic"
               c:identifier="gtk_label_set_text_with_mnemonic">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="str">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_justify" c:identifier="gtk_label_set_justify">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15686,7 +15630,7 @@
       </method>
       <method name="set_ellipsize" c:identifier="gtk_label_set_ellipsize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15709,20 +15653,20 @@
       </method>
       <method name="set_width_chars" c:identifier="gtk_label_set_width_chars">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="n_chars">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_width_chars" c:identifier="gtk_label_get_width_chars">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15733,21 +15677,21 @@
       <method name="set_max_width_chars"
               c:identifier="gtk_label_set_max_width_chars">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="n_chars">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_max_width_chars"
               c:identifier="gtk_label_get_max_width_chars">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15757,33 +15701,33 @@
       </method>
       <method name="set_pattern" c:identifier="gtk_label_set_pattern">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="pattern">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_line_wrap" c:identifier="gtk_label_set_line_wrap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="wrap">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_line_wrap" c:identifier="gtk_label_get_line_wrap">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15794,7 +15738,7 @@
       <method name="set_line_wrap_mode"
               c:identifier="gtk_label_set_line_wrap_mode">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15818,20 +15762,20 @@
       </method>
       <method name="set_selectable" c:identifier="gtk_label_set_selectable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_selectable" c:identifier="gtk_label_get_selectable">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15841,20 +15785,20 @@
       </method>
       <method name="set_angle" c:identifier="gtk_label_set_angle">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="angle">
-            <type name="gdouble" c:type="gdouble"/>
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_angle" c:identifier="gtk_label_get_angle">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15864,24 +15808,24 @@
       </method>
       <method name="select_region" c:identifier="gtk_label_select_region">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_selection_bounds"
               c:identifier="gtk_label_get_selection_bounds">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15908,7 +15852,7 @@
       <method name="get_layout_offsets"
               c:identifier="gtk_label_get_layout_offsets">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15925,21 +15869,21 @@
       <method name="set_single_line_mode"
               c:identifier="gtk_label_set_single_line_mode">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="single_line_mode">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_single_line_mode"
               c:identifier="gtk_label_get_single_line_mode">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15949,7 +15893,7 @@
       </method>
       <method name="get" c:identifier="gtk_label_get">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15969,36 +15913,36 @@
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="string">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <property name="label">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="attributes">
         <type name="PangoAttrList" c:type="PangoAttrList"/>
       </property>
       <property name="use-markup">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="use-underline">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="justify">
         <type name="GtkJustification" c:type="GtkJustification"/>
       </property>
       <property name="pattern">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="wrap">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="wrap-mode">
         <type name="PangoWrapMode" c:type="PangoWrapMode"/>
       </property>
       <property name="selectable">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="mnemonic-keyval">
         <type name="guint" c:type="guint"/>
@@ -16007,29 +15951,29 @@
         <type name="GtkWidget" c:type="GtkWidget"/>
       </property>
       <property name="cursor-position">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="selection-bound">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="ellipsize">
         <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
       </property>
       <property name="width-chars">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="single-line-mode">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="angle">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </property>
       <property name="max-width-chars">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <callback name="move_cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -16039,16 +15983,16 @@
             <type name="GtkMovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="count">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="extend_selection">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="copy_clipboard">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -16058,7 +16002,7 @@
       </callback>
       <callback name="populate_popup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -16071,48 +16015,48 @@
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <glib:signal name="move-cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
             <type name="GtkMovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="p0">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="p1">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </glib:signal>
       <glib:signal name="copy-clipboard">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="populate-popup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -16127,7 +16071,7 @@
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -16138,7 +16082,7 @@
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -16172,7 +16116,7 @@
       <method name="set_accel_widget"
               c:identifier="gtk_accel_label_set_accel_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="accel_label">
@@ -16186,7 +16130,7 @@
       <method name="set_accel_closure"
               c:identifier="gtk_accel_label_set_accel_closure">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="accel_label">
@@ -16199,7 +16143,7 @@
       </method>
       <method name="refetch" c:identifier="gtk_accel_label_refetch">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="accel_label">
@@ -16214,47 +16158,47 @@
         <type name="GtkWidget" c:type="GtkWidget"/>
       </property>
       <field name="signal_quote1">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="signal_quote2">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="mod_name_shift">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="mod_name_control">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="mod_name_alt">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="mod_separator">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="accel_seperator">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="latin1_to_char">
         <type name="guint" c:type="guint"/>
       </field>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
@@ -16264,14 +16208,14 @@
       </return-value>
       <parameters>
         <parameter name="string">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="accel_label_class_get_accelerator_label"
               c:identifier="_gtk_accel_label_class_get_accelerator_label">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="klass">
@@ -16287,14 +16231,14 @@
     </function>
     <callback name="GtkAccelMapForeach">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="accel_path">
-          <type name="gchar*" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="accel_key">
           <type name="guint" c:type="guint"/>
@@ -16303,17 +16247,18 @@
           <type name="GdkModifierType" c:type="GdkModifierType"/>
         </parameter>
         <parameter name="changed">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </callback>
-    <function name="accel_map_add_entry" c:identifier="gtk_accel_map_add_entry">
+    <function name="accel_map_add_entry"
+              c:identifier="gtk_accel_map_add_entry">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="accel_path">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="accel_key">
           <type name="guint" c:type="guint"/>
@@ -16326,11 +16271,11 @@
     <function name="accel_map_lookup_entry"
               c:identifier="gtk_accel_map_lookup_entry">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="accel_path">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="key">
           <type name="GtkAccelKey" c:type="GtkAccelKey*"/>
@@ -16340,11 +16285,11 @@
     <function name="accel_map_change_entry"
               c:identifier="gtk_accel_map_change_entry">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="accel_path">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="accel_key">
           <type name="guint" c:type="guint"/>
@@ -16353,37 +16298,37 @@
           <type name="GdkModifierType" c:type="GdkModifierType"/>
         </parameter>
         <parameter name="replace">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="accel_map_load" c:identifier="gtk_accel_map_load">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="file_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="accel_map_save" c:identifier="gtk_accel_map_save">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="file_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="accel_map_foreach" c:identifier="gtk_accel_map_foreach">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="foreach_func">
           <type name="GtkAccelMapForeach" c:type="GtkAccelMapForeach"/>
@@ -16392,18 +16337,18 @@
     </function>
     <function name="accel_map_load_fd" c:identifier="gtk_accel_map_load_fd">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="fd">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="accel_map_load_scanner"
               c:identifier="gtk_accel_map_load_scanner">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="scanner">
@@ -16413,54 +16358,55 @@
     </function>
     <function name="accel_map_save_fd" c:identifier="gtk_accel_map_save_fd">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="fd">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="accel_map_lock_path" c:identifier="gtk_accel_map_lock_path">
+    <function name="accel_map_lock_path"
+              c:identifier="gtk_accel_map_lock_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="accel_path">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="accel_map_unlock_path"
               c:identifier="gtk_accel_map_unlock_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="accel_path">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="accel_map_add_filter"
               c:identifier="gtk_accel_map_add_filter">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="filter_pattern">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="accel_map_foreach_unfiltered"
               c:identifier="gtk_accel_map_foreach_unfiltered">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="foreach_func">
           <type name="GtkAccelMapForeach" c:type="GtkAccelMapForeach"/>
@@ -16479,11 +16425,11 @@
       </constructor>
       <glib:signal name="changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="gchararray" c:type="gchararray"/>
+            <type name="string" c:type="gchararray"/>
           </parameter>
           <parameter name="p0">
             <type name="guint" c:type="guint"/>
@@ -16496,17 +16442,17 @@
     </class>
     <function name="accel_map_init" c:identifier="_gtk_accel_map_init">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="accel_map_add_group"
               c:identifier="_gtk_accel_map_add_group">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="accel_path">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="accel_group">
           <type name="AccelGroup" c:type="GtkAccelGroup*"/>
@@ -16516,11 +16462,11 @@
     <function name="accel_map_remove_group"
               c:identifier="_gtk_accel_map_remove_group">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="accel_path">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="accel_group">
           <type name="AccelGroup" c:type="GtkAccelGroup*"/>
@@ -16530,11 +16476,11 @@
     <function name="accel_path_is_valid"
               c:identifier="_gtk_accel_path_is_valid">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="accel_path">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -16546,7 +16492,7 @@
       <method name="connect_widget_destroyed"
               c:identifier="gtk_accessible_connect_widget_destroyed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
@@ -16556,7 +16502,7 @@
       </method>
       <callback name="connect_widget_destroyed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
@@ -16566,22 +16512,22 @@
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
@@ -16597,16 +16543,16 @@
         </return-value>
         <parameters>
           <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="label">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="tooltip">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="stock_id">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -16620,13 +16566,13 @@
             <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
           <parameter name="action_name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </constructor>
       <method name="get_name" c:identifier="gtk_action_get_name">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16636,7 +16582,7 @@
       </method>
       <method name="is_sensitive" c:identifier="gtk_action_is_sensitive">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16646,7 +16592,7 @@
       </method>
       <method name="get_sensitive" c:identifier="gtk_action_get_sensitive">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16656,20 +16602,20 @@
       </method>
       <method name="set_sensitive" c:identifier="gtk_action_set_sensitive">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action">
             <type name="Action" c:type="GtkAction*"/>
           </parameter>
           <parameter name="sensitive">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="is_visible" c:identifier="gtk_action_is_visible">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16679,7 +16625,7 @@
       </method>
       <method name="get_visible" c:identifier="gtk_action_get_visible">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16689,20 +16635,20 @@
       </method>
       <method name="set_visible" c:identifier="gtk_action_set_visible">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action">
             <type name="Action" c:type="GtkAction*"/>
           </parameter>
           <parameter name="visible">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="activate" c:identifier="gtk_action_activate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16757,7 +16703,7 @@
       </method>
       <method name="connect_proxy" c:identifier="gtk_action_connect_proxy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16771,7 +16717,7 @@
       <method name="disconnect_proxy"
               c:identifier="gtk_action_disconnect_proxy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16795,7 +16741,7 @@
       <method name="connect_accelerator"
               c:identifier="gtk_action_connect_accelerator">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16806,7 +16752,7 @@
       <method name="disconnect_accelerator"
               c:identifier="gtk_action_disconnect_accelerator">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16816,7 +16762,7 @@
       </method>
       <method name="get_accel_path" c:identifier="gtk_action_get_accel_path">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16838,7 +16784,7 @@
       <method name="block_activate_from"
               c:identifier="gtk_action_block_activate_from">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16852,7 +16798,7 @@
       <method name="unblock_activate_from"
               c:identifier="gtk_action_unblock_activate_from">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16865,75 +16811,75 @@
       </method>
       <method name="set_accel_path" c:identifier="gtk_action_set_accel_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action">
             <type name="Action" c:type="GtkAction*"/>
           </parameter>
           <parameter name="accel_path">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_accel_group" c:identifier="gtk_action_set_accel_group">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action">
             <type name="Action" c:type="GtkAction*"/>
           </parameter>
-          <parameter name="accel_group">
+          <parameter name="accel_group" allow-none="1">
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
         </parameters>
       </method>
       <property name="name">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="label">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="short-label">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="tooltip">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="stock-id">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="icon-name">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="visible-horizontal">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="visible-vertical">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="visible-overflown">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="is-important">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="hide-if-empty">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="sensitive">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="visible">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="action-group">
         <type name="GtkActionGroup" c:type="GtkActionGroup"/>
       </property>
       <callback name="activate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16969,7 +16915,7 @@
       </callback>
       <callback name="connect_proxy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16982,7 +16928,7 @@
       </callback>
       <callback name="disconnect_proxy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -17005,29 +16951,29 @@
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <glib:signal name="activate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
     </class>
     <function name="action_emit_activate"
               c:identifier="_gtk_action_emit_activate">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="action">
@@ -17038,7 +16984,7 @@
     <function name="action_sync_sensitive"
               c:identifier="_gtk_action_sync_sensitive">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="action">
@@ -17049,7 +16995,7 @@
     <function name="action_sync_visible"
               c:identifier="_gtk_action_sync_visible">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="action">
@@ -17060,7 +17006,7 @@
     <function name="action_sync_menu_visible"
               c:identifier="_gtk_action_sync_menu_visible">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="action">
@@ -17070,26 +17016,528 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="empty">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <callback name="GtkTranslateFunc">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="path">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="func_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GtkPrintFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="func_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="str">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GtkItemFactoryCallback">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </callback>
+    <callback name="GtkItemFactoryCallback1">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="callback_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="callback_action">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="widget">
+          <type name="GtkWidget*" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <record name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry">
+      <field name="path">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="accelerator">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="callback">
+        <type name="GtkItemFactoryCallback" c:type="GtkItemFactoryCallback"/>
+      </field>
+      <field name="callback_action">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="item_type">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="extra_data">
+        <type name="gconstpointer" c:type="gconstpointer"/>
+      </field>
+    </record>
+    <record name="GtkItemFactoryItem" c:type="GtkItemFactoryItem">
+      <field name="path">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="widgets">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
+    </record>
+    <class name="ItemFactory"
+           c:type="GtkItemFactory"
+           parent="GtkObject"
+           glib:type-name="GtkItemFactory"
+           glib:get-type="gtk_item_factory_get_type">
+      <constructor name="new" c:identifier="gtk_item_factory_new">
+        <return-value>
+          <type name="ItemFactory" c:type="GtkItemFactory*"/>
+        </return-value>
+        <parameters>
+          <parameter name="container_type">
+            <type name="GType" c:type="GType"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="accel_group" allow-none="1">
+            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="from_widget"
+                   c:identifier="gtk_item_factory_from_widget">
+        <return-value>
+          <type name="ItemFactory" c:type="GtkItemFactory*"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="from_path" c:identifier="gtk_item_factory_from_path">
+        <return-value>
+          <type name="ItemFactory" c:type="GtkItemFactory*"/>
+        </return-value>
+        <parameters>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="construct" c:identifier="gtk_item_factory_construct">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="container_type">
+            <type name="GType" c:type="GType"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="accel_group">
+            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_item" c:identifier="gtk_item_factory_get_item">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_widget" c:identifier="gtk_item_factory_get_widget">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_widget_by_action"
+              c:identifier="gtk_item_factory_get_widget_by_action">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="action">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_item_by_action"
+              c:identifier="gtk_item_factory_get_item_by_action">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="action">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="create_item" c:identifier="gtk_item_factory_create_item">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="entry">
+            <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
+          </parameter>
+          <parameter name="callback_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="callback_type">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="create_items" c:identifier="gtk_item_factory_create_items">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="n_entries">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="entries">
+            <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
+          </parameter>
+          <parameter name="callback_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="delete_item" c:identifier="gtk_item_factory_delete_item">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="delete_entry" c:identifier="gtk_item_factory_delete_entry">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="entry">
+            <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="delete_entries"
+              c:identifier="gtk_item_factory_delete_entries">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="n_entries">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="entries">
+            <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="popup" c:identifier="gtk_item_factory_popup">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="mouse_button">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="uint32" c:type="guint32"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="popup_with_data"
+              c:identifier="gtk_item_factory_popup_with_data">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="popup_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+          <parameter name="x">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="mouse_button">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="uint32" c:type="guint32"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="popup_data" c:identifier="gtk_item_factory_popup_data">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_translate_func"
+              c:identifier="gtk_item_factory_set_translate_func">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="GtkTranslateFunc" c:type="GtkTranslateFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="notify">
+            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="create_items_ac"
+              c:identifier="gtk_item_factory_create_items_ac">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="n_entries">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="entries">
+            <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
+          </parameter>
+          <parameter name="callback_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="callback_type">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <field name="item_ht">
+        <type name="GHashTable*" c:type="GHashTable*"/>
+      </field>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="item_factory_add_foreign"
+              c:identifier="gtk_item_factory_add_foreign">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="accel_widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="full_path">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="accel_group">
+          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+        </parameter>
+        <parameter name="keyval">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="modifiers">
+          <type name="GdkModifierType" c:type="GdkModifierType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="item_factory_path_from_widget"
+              c:identifier="gtk_item_factory_path_from_widget">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="item_factory_popup_data_from_widget"
+              c:identifier="gtk_item_factory_popup_data_from_widget">
+      <return-value>
+        <type name="any" c:type="gpointer"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <callback name="GtkMenuCallback">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="GtkWidget*" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <record name="GtkMenuEntry" c:type="GtkMenuEntry"/>
+    <callback name="GtkItemFactoryCallback2">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="GtkWidget*" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="callback_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="callback_action">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <function name="item_factory_create_menu_entries"
+              c:identifier="gtk_item_factory_create_menu_entries">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="n_entries">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="entries">
+          <type name="GtkMenuEntry" c:type="GtkMenuEntry*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="item_factories_path_delete"
+              c:identifier="gtk_item_factories_path_delete">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ifactory_path">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <record name="GtkActionGroupPrivate" c:type="GtkActionGroupPrivate"/>
     <record name="GtkActionEntry" c:type="GtkActionEntry">
       <field name="name">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="stock_id">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="label">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="accelerator">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="tooltip">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="callback">
         <type name="GCallback" c:type="GCallback"/>
@@ -17097,45 +17545,45 @@
     </record>
     <record name="GtkToggleActionEntry" c:type="GtkToggleActionEntry">
       <field name="name">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="stock_id">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="label">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="accelerator">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="tooltip">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="callback">
         <type name="GCallback" c:type="GCallback"/>
       </field>
       <field name="is_active">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </field>
     </record>
     <record name="GtkRadioActionEntry" c:type="GtkRadioActionEntry">
       <field name="name">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="stock_id">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="label">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="accelerator">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="tooltip">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="value">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
     </record>
     <class name="ActionGroup"
@@ -17149,13 +17597,13 @@
         </return-value>
         <parameters>
           <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </constructor>
       <method name="get_name" c:identifier="gtk_action_group_get_name">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
@@ -17166,7 +17614,7 @@
       <method name="get_sensitive"
               c:identifier="gtk_action_group_get_sensitive">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
@@ -17177,20 +17625,20 @@
       <method name="set_sensitive"
               c:identifier="gtk_action_group_set_sensitive">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
             <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
           <parameter name="sensitive">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_visible" c:identifier="gtk_action_group_get_visible">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
@@ -17200,14 +17648,14 @@
       </method>
       <method name="set_visible" c:identifier="gtk_action_group_set_visible">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
             <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
           <parameter name="visible">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
@@ -17223,7 +17671,7 @@
       </method>
       <method name="add_action" c:identifier="gtk_action_group_add_action">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
@@ -17237,7 +17685,7 @@
       <method name="add_action_with_accel"
               c:identifier="gtk_action_group_add_action_with_accel">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
@@ -17246,15 +17694,15 @@
           <parameter name="action">
             <type name="Action" c:type="GtkAction*"/>
           </parameter>
-          <parameter name="accelerator">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="accelerator" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="remove_action"
               c:identifier="gtk_action_group_remove_action">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
@@ -17267,7 +17715,7 @@
       </method>
       <method name="add_actions" c:identifier="gtk_action_group_add_actions">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
@@ -17280,14 +17728,14 @@
             <type name="guint" c:type="guint"/>
           </parameter>
           <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
       <method name="add_toggle_actions"
               c:identifier="gtk_action_group_add_toggle_actions">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
@@ -17300,14 +17748,14 @@
             <type name="guint" c:type="guint"/>
           </parameter>
           <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
       <method name="add_radio_actions"
               c:identifier="gtk_action_group_add_radio_actions">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
@@ -17320,20 +17768,20 @@
             <type name="guint" c:type="guint"/>
           </parameter>
           <parameter name="value">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="on_change">
             <type name="GCallback" c:type="GCallback"/>
           </parameter>
           <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
       <method name="add_actions_full"
               c:identifier="gtk_action_group_add_actions_full">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
@@ -17346,7 +17794,7 @@
             <type name="guint" c:type="guint"/>
           </parameter>
           <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="destroy">
             <type name="GDestroyNotify" c:type="GDestroyNotify"/>
@@ -17356,7 +17804,7 @@
       <method name="add_toggle_actions_full"
               c:identifier="gtk_action_group_add_toggle_actions_full">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
@@ -17369,7 +17817,7 @@
             <type name="guint" c:type="guint"/>
           </parameter>
           <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="destroy">
             <type name="GDestroyNotify" c:type="GDestroyNotify"/>
@@ -17379,7 +17827,7 @@
       <method name="add_radio_actions_full"
               c:identifier="gtk_action_group_add_radio_actions_full">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
@@ -17392,13 +17840,13 @@
             <type name="guint" c:type="guint"/>
           </parameter>
           <parameter name="value">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="on_change">
             <type name="GCallback" c:type="GCallback"/>
           </parameter>
           <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="destroy">
             <type name="GDestroyNotify" c:type="GDestroyNotify"/>
@@ -17408,7 +17856,7 @@
       <method name="set_translate_func"
               c:identifier="gtk_action_group_set_translate_func">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
@@ -17418,7 +17866,7 @@
             <type name="GtkTranslateFunc" c:type="GtkTranslateFunc"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="notify">
             <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
@@ -17428,39 +17876,39 @@
       <method name="set_translation_domain"
               c:identifier="gtk_action_group_set_translation_domain">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
             <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
           <parameter name="domain">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="translate_string"
               c:identifier="gtk_action_group_translate_string">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
             <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
           <parameter name="string">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <property name="name">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="sensitive">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="visible">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <callback name="get_action">
         <return-value>
@@ -17471,33 +17919,33 @@
             <type name="GtkActionGroup*" c:type="GtkActionGroup*"/>
           </parameter>
           <parameter name="action_name">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <glib:signal name="connect-proxy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -17510,7 +17958,7 @@
       </glib:signal>
       <glib:signal name="disconnect-proxy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -17523,7 +17971,7 @@
       </glib:signal>
       <glib:signal name="pre-activate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -17533,7 +17981,7 @@
       </glib:signal>
       <glib:signal name="post-activate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -17545,7 +17993,7 @@
     <function name="action_group_emit_connect_proxy"
               c:identifier="_gtk_action_group_emit_connect_proxy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="action_group">
@@ -17562,7 +18010,7 @@
     <function name="action_group_emit_disconnect_proxy"
               c:identifier="_gtk_action_group_emit_disconnect_proxy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="action_group">
@@ -17579,7 +18027,7 @@
     <function name="action_group_emit_pre_activate"
               c:identifier="_gtk_action_group_emit_pre_activate">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="action_group">
@@ -17593,7 +18041,7 @@
     <function name="action_group_emit_post_activate"
               c:identifier="_gtk_action_group_emit_post_activate">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="action_group">
@@ -17612,29 +18060,29 @@
            glib:get-type="gtk_alignment_get_type">
       <method name="set" c:identifier="gtk_alignment_set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="alignment">
             <type name="Alignment" c:type="GtkAlignment*"/>
           </parameter>
           <parameter name="xalign">
-            <type name="gfloat" c:type="gfloat"/>
+            <type name="float" c:type="gfloat"/>
           </parameter>
           <parameter name="yalign">
-            <type name="gfloat" c:type="gfloat"/>
+            <type name="float" c:type="gfloat"/>
           </parameter>
           <parameter name="xscale">
-            <type name="gfloat" c:type="gfloat"/>
+            <type name="float" c:type="gfloat"/>
           </parameter>
           <parameter name="yscale">
-            <type name="gfloat" c:type="gfloat"/>
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_padding" c:identifier="gtk_alignment_set_padding">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="alignment">
@@ -17656,7 +18104,7 @@
       </method>
       <method name="get_padding" c:identifier="gtk_alignment_get_padding">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="alignment">
@@ -17677,16 +18125,16 @@
         </parameters>
       </method>
       <property name="xalign">
-        <type name="gfloat" c:type="gfloat"/>
+        <type name="float" c:type="gfloat"/>
       </property>
       <property name="yalign">
-        <type name="gfloat" c:type="gfloat"/>
+        <type name="float" c:type="gfloat"/>
       </property>
       <property name="xscale">
-        <type name="gfloat" c:type="gfloat"/>
+        <type name="float" c:type="gfloat"/>
       </property>
       <property name="yscale">
-        <type name="gfloat" c:type="gfloat"/>
+        <type name="float" c:type="gfloat"/>
       </property>
       <property name="top-padding">
         <type name="guint" c:type="guint"/>
@@ -17707,16 +18155,16 @@
       </return-value>
       <parameters>
         <parameter name="xalign">
-          <type name="gfloat" c:type="gfloat"/>
+          <type name="float" c:type="gfloat"/>
         </parameter>
         <parameter name="yalign">
-          <type name="gfloat" c:type="gfloat"/>
+          <type name="float" c:type="gfloat"/>
         </parameter>
         <parameter name="xscale">
-          <type name="gfloat" c:type="gfloat"/>
+          <type name="float" c:type="gfloat"/>
         </parameter>
         <parameter name="yscale">
-          <type name="gfloat" c:type="gfloat"/>
+          <type name="float" c:type="gfloat"/>
         </parameter>
       </parameters>
     </function>
@@ -17727,7 +18175,7 @@
            glib:get-type="gtk_arrow_get_type">
       <method name="set" c:identifier="gtk_arrow_set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="arrow">
@@ -17768,20 +18216,20 @@
            glib:get-type="gtk_frame_get_type">
       <method name="set_label" c:identifier="gtk_frame_set_label">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="frame">
             <type name="Frame" c:type="GtkFrame*"/>
           </parameter>
-          <parameter name="label">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="label" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_label" c:identifier="gtk_frame_get_label">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="frame">
@@ -17789,9 +18237,10 @@
           </parameter>
         </parameters>
       </method>
-      <method name="set_label_widget" c:identifier="gtk_frame_set_label_widget">
+      <method name="set_label_widget"
+              c:identifier="gtk_frame_set_label_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="frame">
@@ -17802,7 +18251,8 @@
           </parameter>
         </parameters>
       </method>
-      <method name="get_label_widget" c:identifier="gtk_frame_get_label_widget">
+      <method name="get_label_widget"
+              c:identifier="gtk_frame_get_label_widget">
         <return-value>
           <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
@@ -17814,23 +18264,23 @@
       </method>
       <method name="set_label_align" c:identifier="gtk_frame_set_label_align">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="frame">
             <type name="Frame" c:type="GtkFrame*"/>
           </parameter>
           <parameter name="xalign">
-            <type name="gfloat" c:type="gfloat"/>
+            <type name="float" c:type="gfloat"/>
           </parameter>
           <parameter name="yalign">
-            <type name="gfloat" c:type="gfloat"/>
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_label_align" c:identifier="gtk_frame_get_label_align">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="frame">
@@ -17846,7 +18296,7 @@
       </method>
       <method name="set_shadow_type" c:identifier="gtk_frame_set_shadow_type">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="frame">
@@ -17868,13 +18318,13 @@
         </parameters>
       </method>
       <property name="label">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="label-xalign">
-        <type name="gfloat" c:type="gfloat"/>
+        <type name="float" c:type="gfloat"/>
       </property>
       <property name="label-yalign">
-        <type name="gfloat" c:type="gfloat"/>
+        <type name="float" c:type="gfloat"/>
       </property>
       <property name="shadow">
         <type name="GtkShadowType" c:type="GtkShadowType"/>
@@ -17887,7 +18337,7 @@
       </property>
       <callback name="compute_child_allocation">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="frame">
@@ -17905,7 +18355,7 @@
       </return-value>
       <parameters>
         <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -17916,37 +18366,37 @@
            glib:get-type="gtk_aspect_frame_get_type">
       <method name="set" c:identifier="gtk_aspect_frame_set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="aspect_frame">
             <type name="AspectFrame" c:type="GtkAspectFrame*"/>
           </parameter>
           <parameter name="xalign">
-            <type name="gfloat" c:type="gfloat"/>
+            <type name="float" c:type="gfloat"/>
           </parameter>
           <parameter name="yalign">
-            <type name="gfloat" c:type="gfloat"/>
+            <type name="float" c:type="gfloat"/>
           </parameter>
           <parameter name="ratio">
-            <type name="gfloat" c:type="gfloat"/>
+            <type name="float" c:type="gfloat"/>
           </parameter>
           <parameter name="obey_child">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <property name="xalign">
-        <type name="gfloat" c:type="gfloat"/>
+        <type name="float" c:type="gfloat"/>
       </property>
       <property name="yalign">
-        <type name="gfloat" c:type="gfloat"/>
+        <type name="float" c:type="gfloat"/>
       </property>
       <property name="ratio">
-        <type name="gfloat" c:type="gfloat"/>
+        <type name="float" c:type="gfloat"/>
       </property>
       <property name="obey-child">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
     </class>
     <function name="aspect_frame_new" c:identifier="gtk_aspect_frame_new">
@@ -17955,33 +18405,33 @@
       </return-value>
       <parameters>
         <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="xalign">
-          <type name="gfloat" c:type="gfloat"/>
+          <type name="float" c:type="gfloat"/>
         </parameter>
         <parameter name="yalign">
-          <type name="gfloat" c:type="gfloat"/>
+          <type name="float" c:type="gfloat"/>
         </parameter>
         <parameter name="ratio">
-          <type name="gfloat" c:type="gfloat"/>
+          <type name="float" c:type="gfloat"/>
         </parameter>
         <parameter name="obey_child">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <record name="GtkAssistantPrivate" c:type="GtkAssistantPrivate"/>
     <callback name="GtkAssistantPageFunc">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="current_page">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
@@ -17993,7 +18443,7 @@
       <method name="get_current_page"
               c:identifier="gtk_assistant_get_current_page">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18004,20 +18454,20 @@
       <method name="set_current_page"
               c:identifier="gtk_assistant_set_current_page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
             <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
           <parameter name="page_num">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_n_pages" c:identifier="gtk_assistant_get_n_pages">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18034,13 +18484,13 @@
             <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
           <parameter name="page_num">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="prepend_page" c:identifier="gtk_assistant_prepend_page">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18053,7 +18503,7 @@
       </method>
       <method name="append_page" c:identifier="gtk_assistant_append_page">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18066,7 +18516,7 @@
       </method>
       <method name="insert_page" c:identifier="gtk_assistant_insert_page">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18076,14 +18526,14 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="position">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_forward_page_func"
               c:identifier="gtk_assistant_set_forward_page_func">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18093,7 +18543,7 @@
             <type name="GtkAssistantPageFunc" c:type="GtkAssistantPageFunc"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="destroy">
             <type name="GDestroyNotify" c:type="GDestroyNotify"/>
@@ -18102,7 +18552,7 @@
       </method>
       <method name="set_page_type" c:identifier="gtk_assistant_set_page_type">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18129,9 +18579,10 @@
           </parameter>
         </parameters>
       </method>
-      <method name="set_page_title" c:identifier="gtk_assistant_set_page_title">
+      <method name="set_page_title"
+              c:identifier="gtk_assistant_set_page_title">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18141,13 +18592,14 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="title">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_page_title" c:identifier="gtk_assistant_get_page_title">
+      <method name="get_page_title"
+              c:identifier="gtk_assistant_get_page_title">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18161,7 +18613,7 @@
       <method name="set_page_header_image"
               c:identifier="gtk_assistant_set_page_header_image">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18170,7 +18622,7 @@
           <parameter name="page">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="pixbuf">
+          <parameter name="pixbuf" allow-none="1">
             <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
@@ -18192,7 +18644,7 @@
       <method name="set_page_side_image"
               c:identifier="gtk_assistant_set_page_side_image">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18201,7 +18653,7 @@
           <parameter name="page">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="pixbuf">
+          <parameter name="pixbuf" allow-none="1">
             <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
@@ -18223,7 +18675,7 @@
       <method name="set_page_complete"
               c:identifier="gtk_assistant_set_page_complete">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18233,14 +18685,14 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="complete">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_page_complete"
               c:identifier="gtk_assistant_get_page_complete">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18254,7 +18706,7 @@
       <method name="add_action_widget"
               c:identifier="gtk_assistant_add_action_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18268,7 +18720,7 @@
       <method name="remove_action_widget"
               c:identifier="gtk_assistant_remove_action_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18282,7 +18734,7 @@
       <method name="update_buttons_state"
               c:identifier="gtk_assistant_update_buttons_state">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18292,7 +18744,7 @@
       </method>
       <callback name="prepare">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18305,7 +18757,7 @@
       </callback>
       <callback name="apply">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18315,7 +18767,7 @@
       </callback>
       <callback name="close">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18325,7 +18777,7 @@
       </callback>
       <callback name="cancel">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -18335,42 +18787,42 @@
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved5">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <glib:signal name="close">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="cancel">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="prepare">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
@@ -18380,7 +18832,7 @@
       </glib:signal>
       <glib:signal name="apply">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
     </class>
@@ -18394,7 +18846,7 @@
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </field>
       <field name="padding">
-        <type name="guint16" c:type="guint16"/>
+        <type name="uint16" c:type="guint16"/>
       </field>
       <field name="expand">
         <type name="guint" c:type="guint"/>
@@ -18416,7 +18868,7 @@
            glib:get-type="gtk_box_get_type">
       <method name="pack_start" c:identifier="gtk_box_pack_start">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="box">
@@ -18426,10 +18878,10 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="expand">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="fill">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="padding">
             <type name="guint" c:type="guint"/>
@@ -18438,7 +18890,7 @@
       </method>
       <method name="pack_end" c:identifier="gtk_box_pack_end">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="box">
@@ -18448,10 +18900,10 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="expand">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="fill">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="padding">
             <type name="guint" c:type="guint"/>
@@ -18461,7 +18913,7 @@
       <method name="pack_start_defaults"
               c:identifier="gtk_box_pack_start_defaults">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="box">
@@ -18472,9 +18924,10 @@
           </parameter>
         </parameters>
       </method>
-      <method name="pack_end_defaults" c:identifier="gtk_box_pack_end_defaults">
+      <method name="pack_end_defaults"
+              c:identifier="gtk_box_pack_end_defaults">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="box">
@@ -18487,20 +18940,20 @@
       </method>
       <method name="set_homogeneous" c:identifier="gtk_box_set_homogeneous">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="box">
             <type name="Box" c:type="GtkBox*"/>
           </parameter>
           <parameter name="homogeneous">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_homogeneous" c:identifier="gtk_box_get_homogeneous">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="box">
@@ -18510,20 +18963,20 @@
       </method>
       <method name="set_spacing" c:identifier="gtk_box_set_spacing">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="box">
             <type name="Box" c:type="GtkBox*"/>
           </parameter>
           <parameter name="spacing">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_spacing" c:identifier="gtk_box_get_spacing">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="box">
@@ -18533,7 +18986,7 @@
       </method>
       <method name="reorder_child" c:identifier="gtk_box_reorder_child">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="box">
@@ -18543,14 +18996,14 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="position">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="query_child_packing"
               c:identifier="gtk_box_query_child_packing">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="box">
@@ -18573,9 +19026,10 @@
           </parameter>
         </parameters>
       </method>
-      <method name="set_child_packing" c:identifier="gtk_box_set_child_packing">
+      <method name="set_child_packing"
+              c:identifier="gtk_box_set_child_packing">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="box">
@@ -18585,10 +19039,10 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="expand">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="fill">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="padding">
             <type name="guint" c:type="guint"/>
@@ -18599,10 +19053,10 @@
         </parameters>
       </method>
       <property name="spacing">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="homogeneous">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
     </class>
     <class name="ButtonBox"
@@ -18622,7 +19076,7 @@
       </method>
       <method name="set_layout" c:identifier="gtk_button_box_set_layout">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -18636,7 +19090,7 @@
       <method name="get_child_secondary"
               c:identifier="gtk_button_box_get_child_secondary">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -18650,7 +19104,7 @@
       <method name="set_child_secondary"
               c:identifier="gtk_button_box_set_child_secondary">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -18660,48 +19114,48 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="is_secondary">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_child_size"
               c:identifier="gtk_button_box_set_child_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="ButtonBox" c:type="GtkButtonBox*"/>
           </parameter>
           <parameter name="min_width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="min_height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_child_ipadding"
               c:identifier="gtk_button_box_set_child_ipadding">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="ButtonBox" c:type="GtkButtonBox*"/>
           </parameter>
           <parameter name="ipad_x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="ipad_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_child_size"
               c:identifier="gtk_button_box_get_child_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -18718,7 +19172,7 @@
       <method name="get_child_ipadding"
               c:identifier="gtk_button_box_get_child_ipadding">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -18739,7 +19193,7 @@
     <function name="button_box_child_requisition"
               c:identifier="_gtk_button_box_child_requisition">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="widget">
@@ -18761,10 +19215,10 @@
     </function>
     <record name="GtkBindingSet" c:type="GtkBindingSet">
       <field name="set_name">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="priority">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="widget_path_pspecs">
         <type name="GSList*" c:type="GSList*"/>
@@ -18819,7 +19273,7 @@
         <type name="GtkBindingSignal*" c:type="GtkBindingSignal*"/>
       </field>
       <field name="signal_name">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="n_args">
         <type name="guint" c:type="guint"/>
@@ -18842,7 +19296,7 @@
       </return-value>
       <parameters>
         <parameter name="set_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -18853,7 +19307,7 @@
       </return-value>
       <parameters>
         <parameter name="object_class">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
@@ -18863,13 +19317,13 @@
       </return-value>
       <parameters>
         <parameter name="set_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="bindings_activate" c:identifier="gtk_bindings_activate">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -18886,7 +19340,7 @@
     <function name="bindings_activate_event"
               c:identifier="gtk_bindings_activate_event">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -18900,7 +19354,7 @@
     <function name="binding_set_activate"
               c:identifier="gtk_binding_set_activate">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="binding_set">
@@ -18917,9 +19371,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="binding_entry_clear" c:identifier="gtk_binding_entry_clear">
+    <function name="binding_entry_clear"
+              c:identifier="gtk_binding_entry_clear">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="binding_set">
@@ -18936,7 +19391,7 @@
     <function name="binding_entry_add_signall"
               c:identifier="gtk_binding_entry_add_signall">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="binding_set">
@@ -18949,7 +19404,7 @@
           <type name="GdkModifierType" c:type="GdkModifierType"/>
         </parameter>
         <parameter name="signal_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="binding_args">
           <type name="GSList" c:type="GSList*"/>
@@ -18969,7 +19424,7 @@
     </function>
     <function name="binding_entry_skip" c:identifier="gtk_binding_entry_skip">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="binding_set">
@@ -18986,7 +19441,7 @@
     <function name="binding_entry_add_signal"
               c:identifier="gtk_binding_entry_add_signal">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="binding_set">
@@ -18999,7 +19454,7 @@
           <type name="GdkModifierType" c:type="GdkModifierType"/>
         </parameter>
         <parameter name="signal_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="n_args">
           <type name="guint" c:type="guint"/>
@@ -19009,7 +19464,7 @@
     <function name="binding_entry_remove"
               c:identifier="gtk_binding_entry_remove">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="binding_set">
@@ -19026,7 +19481,7 @@
     <function name="binding_set_add_path"
               c:identifier="gtk_binding_set_add_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="binding_set">
@@ -19036,7 +19491,7 @@
           <type name="PathType" c:type="GtkPathType"/>
         </parameter>
         <parameter name="path_pattern">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="priority">
           <type name="PathPriorityType" c:type="GtkPathPriorityType"/>
@@ -19046,7 +19501,7 @@
     <function name="binding_reset_parsed"
               c:identifier="_gtk_binding_reset_parsed">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="binding_signal_new" c:identifier="_gtk_binding_signal_new">
@@ -19055,7 +19510,7 @@
       </return-value>
       <parameters>
         <parameter name="signal_name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="itype">
           <type name="GType" c:type="GType"/>
@@ -19070,7 +19525,7 @@
           <type name="GSignalAccumulator" c:type="GSignalAccumulator"/>
         </parameter>
         <parameter name="accu_data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="c_marshaller">
           <type name="GSignalCMarshaller" c:type="GSignalCMarshaller"/>
@@ -19084,14 +19539,15 @@
       </parameters>
     </function>
     <record name="GtkBuilderPrivate" c:type="GtkBuilderPrivate"/>
-    <function name="builder_error_quark" c:identifier="gtk_builder_error_quark">
+    <function name="builder_error_quark"
+              c:identifier="gtk_builder_error_quark">
       <return-value>
         <type name="GQuark" c:type="GQuark"/>
       </return-value>
     </function>
     <callback name="GtkBuilderConnectFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="builder">
@@ -19101,10 +19557,10 @@
           <type name="GObject*" c:type="GObject*"/>
         </parameter>
         <parameter name="signal_name">
-          <type name="gchar*" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="handler_name">
-          <type name="gchar*" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="connect_object">
           <type name="GObject*" c:type="GObject*"/>
@@ -19113,7 +19569,7 @@
           <type name="GConnectFlags" c:type="GConnectFlags"/>
         </parameter>
         <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
@@ -19136,14 +19592,15 @@
             <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="filename">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="error">
             <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_from_string" c:identifier="gtk_builder_add_from_string">
+      <method name="add_from_string"
+              c:identifier="gtk_builder_add_from_string">
         <return-value>
           <type name="guint" c:type="guint"/>
         </return-value>
@@ -19152,10 +19609,10 @@
             <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="buffer">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="length">
-            <type name="gsize" c:type="gsize"/>
+            <type name="size" c:type="gsize"/>
           </parameter>
           <parameter name="error">
             <type name="GError" c:type="GError**"/>
@@ -19171,7 +19628,7 @@
             <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
@@ -19185,23 +19642,24 @@
           </parameter>
         </parameters>
       </method>
-      <method name="connect_signals" c:identifier="gtk_builder_connect_signals">
+      <method name="connect_signals"
+              c:identifier="gtk_builder_connect_signals">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="builder">
             <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
       <method name="connect_signals_full"
               c:identifier="gtk_builder_connect_signals_full">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="builder">
@@ -19211,28 +19669,28 @@
             <type name="GtkBuilderConnectFunc" c:type="GtkBuilderConnectFunc"/>
           </parameter>
           <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_translation_domain"
               c:identifier="gtk_builder_set_translation_domain">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="builder">
             <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="domain">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_translation_domain"
               c:identifier="gtk_builder_get_translation_domain">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="builder">
@@ -19250,14 +19708,14 @@
             <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="type_name">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </method>
       <method name="value_from_string"
               c:identifier="gtk_builder_value_from_string">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="builder">
@@ -19267,7 +19725,7 @@
             <type name="GParamSpec" c:type="GParamSpec*"/>
           </parameter>
           <parameter name="string">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="value">
             <type name="GValue" c:type="GValue*"/>
@@ -19280,7 +19738,7 @@
       <method name="value_from_string_type"
               c:identifier="gtk_builder_value_from_string_type">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="builder">
@@ -19290,7 +19748,7 @@
             <type name="GType" c:type="GType"/>
           </parameter>
           <parameter name="string">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="value">
             <type name="GValue" c:type="GValue*"/>
@@ -19301,7 +19759,7 @@
         </parameters>
       </method>
       <property name="translation-domain">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <callback name="get_type_from_name">
         <return-value>
@@ -19312,48 +19770,48 @@
             <type name="GtkBuilder*" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="type_name">
-            <type name="char*" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved5">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved6">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved7">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved8">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
@@ -19364,20 +19822,20 @@
                glib:get-type="gtk_buildable_get_type">
       <callback name="set_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="buildable">
             <type name="GtkBuildable*" c:type="GtkBuildable*"/>
           </parameter>
           <parameter name="name">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_name">
         <return-value>
-          <type name="gchar*" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="buildable">
@@ -19387,7 +19845,7 @@
       </callback>
       <callback name="add_child">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="buildable">
@@ -19400,13 +19858,13 @@
             <type name="GObject*" c:type="GObject*"/>
           </parameter>
           <parameter name="type">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="set_buildable_property">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="buildable">
@@ -19416,7 +19874,7 @@
             <type name="GtkBuilder*" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="name">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="value">
             <type name="GValue*" c:type="GValue*"/>
@@ -19435,13 +19893,13 @@
             <type name="GtkBuilder*" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="name">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="custom_tag_start">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="buildable">
@@ -19454,7 +19912,7 @@
             <type name="GObject*" c:type="GObject*"/>
           </parameter>
           <parameter name="tagname">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="parser">
             <type name="GMarkupParser*" c:type="GMarkupParser*"/>
@@ -19466,7 +19924,7 @@
       </callback>
       <callback name="custom_tag_end">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="buildable">
@@ -19479,7 +19937,7 @@
             <type name="GObject*" c:type="GObject*"/>
           </parameter>
           <parameter name="tagname">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="data">
             <type name="gpointer*" c:type="gpointer*"/>
@@ -19488,7 +19946,7 @@
       </callback>
       <callback name="custom_finished">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="buildable">
@@ -19501,16 +19959,16 @@
             <type name="GObject*" c:type="GObject*"/>
           </parameter>
           <parameter name="tagname">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="parser_finished">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="buildable">
@@ -19533,27 +19991,27 @@
             <type name="GtkBuilder*" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="childname">
-            <type name="gchar*" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
     </interface>
     <function name="buildable_set_name" c:identifier="gtk_buildable_set_name">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="buildable">
           <type name="Buildable" c:type="GtkBuildable*"/>
         </parameter>
         <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="buildable_get_name" c:identifier="gtk_buildable_get_name">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="buildable">
@@ -19561,9 +20019,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="buildable_add_child" c:identifier="gtk_buildable_add_child">
+    <function name="buildable_add_child"
+              c:identifier="gtk_buildable_add_child">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="buildable">
@@ -19576,14 +20035,14 @@
           <type name="GLib.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="type">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="buildable_set_buildable_property"
               c:identifier="gtk_buildable_set_buildable_property">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="buildable">
@@ -19593,7 +20052,7 @@
           <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
         <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="value">
           <type name="GValue" c:type="GValue*"/>
@@ -19613,14 +20072,14 @@
           <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
         <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="buildable_custom_tag_start"
               c:identifier="gtk_buildable_custom_tag_start">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="buildable">
@@ -19633,7 +20092,7 @@
           <type name="GLib.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="tagname">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="parser">
           <type name="GMarkupParser" c:type="GMarkupParser*"/>
@@ -19646,7 +20105,7 @@
     <function name="buildable_custom_tag_end"
               c:identifier="gtk_buildable_custom_tag_end">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="buildable">
@@ -19659,7 +20118,7 @@
           <type name="GLib.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="tagname">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="data">
           <type name="gpointer" c:type="gpointer*"/>
@@ -19669,7 +20128,7 @@
     <function name="buildable_custom_finished"
               c:identifier="gtk_buildable_custom_finished">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="buildable">
@@ -19682,17 +20141,17 @@
           <type name="GLib.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="tagname">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
     <function name="buildable_parser_finished"
               c:identifier="gtk_buildable_parser_finished">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="buildable">
@@ -19716,7 +20175,7 @@
           <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
         <parameter name="childname">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -19737,7 +20196,7 @@
     </record>
     <record name="GtkImageStockData" c:type="GtkImageStockData">
       <field name="stock_id">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
     </record>
     <record name="GtkImageIconSetData" c:type="GtkImageIconSetData">
@@ -19758,18 +20217,7 @@
     </record>
     <record name="GtkImageIconNameData" c:type="GtkImageIconNameData">
       <field name="icon_name">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="pixbuf">
-        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
-      </field>
-      <field name="theme_change_id">
-        <type name="guint" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkImageGIconData" c:type="GtkImageGIconData">
-      <field name="icon">
-        <type name="GIcon*" c:type="GIcon*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="pixbuf">
         <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
@@ -19785,7 +20233,7 @@
            glib:get-type="gtk_image_get_type">
       <method name="clear" c:identifier="gtk_image_clear">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -19795,7 +20243,7 @@
       </method>
       <method name="set_from_pixmap" c:identifier="gtk_image_set_from_pixmap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -19804,63 +20252,63 @@
           <parameter name="pixmap">
             <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
           </parameter>
-          <parameter name="mask">
+          <parameter name="mask" allow-none="1">
             <type name="GdkBitmap" c:type="GdkBitmap*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_from_image" c:identifier="gtk_image_set_from_image">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
             <type name="Image" c:type="GtkImage*"/>
           </parameter>
-          <parameter name="gdk_image">
+          <parameter name="gdk_image" allow-none="1">
             <type name="Gdk.Image" c:type="GdkImage*"/>
           </parameter>
-          <parameter name="mask">
+          <parameter name="mask" allow-none="1">
             <type name="GdkBitmap" c:type="GdkBitmap*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_from_file" c:identifier="gtk_image_set_from_file">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
             <type name="Image" c:type="GtkImage*"/>
           </parameter>
-          <parameter name="filename">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="filename" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_from_pixbuf" c:identifier="gtk_image_set_from_pixbuf">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
             <type name="Image" c:type="GtkImage*"/>
           </parameter>
-          <parameter name="pixbuf">
+          <parameter name="pixbuf" allow-none="1">
             <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_from_stock" c:identifier="gtk_image_set_from_stock">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
             <type name="Image" c:type="GtkImage*"/>
           </parameter>
           <parameter name="stock_id">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="size">
             <type name="IconSize" c:type="GtkIconSize"/>
@@ -19870,7 +20318,7 @@
       <method name="set_from_icon_set"
               c:identifier="gtk_image_set_from_icon_set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -19887,7 +20335,7 @@
       <method name="set_from_animation"
               c:identifier="gtk_image_set_from_animation">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -19901,30 +20349,14 @@
       <method name="set_from_icon_name"
               c:identifier="gtk_image_set_from_icon_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
             <type name="Image" c:type="GtkImage*"/>
           </parameter>
           <parameter name="icon_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_from_gicon" c:identifier="gtk_image_set_from_gicon">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-          <parameter name="icon">
-            <type name="GIcon" c:type="GIcon*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="size">
             <type name="IconSize" c:type="GtkIconSize"/>
@@ -19933,18 +20365,19 @@
       </method>
       <method name="set_pixel_size" c:identifier="gtk_image_set_pixel_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
             <type name="Image" c:type="GtkImage*"/>
           </parameter>
           <parameter name="pixel_size">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_storage_type" c:identifier="gtk_image_get_storage_type">
+      <method name="get_storage_type"
+              c:identifier="gtk_image_get_storage_type">
         <return-value>
           <type name="ImageType" c:type="GtkImageType"/>
         </return-value>
@@ -19956,7 +20389,7 @@
       </method>
       <method name="get_pixmap" c:identifier="gtk_image_get_pixmap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -19972,7 +20405,7 @@
       </method>
       <method name="get_image" c:identifier="gtk_image_get_image">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -19998,7 +20431,7 @@
       </method>
       <method name="get_stock" c:identifier="gtk_image_get_stock">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -20014,7 +20447,7 @@
       </method>
       <method name="get_icon_set" c:identifier="gtk_image_get_icon_set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -20040,7 +20473,7 @@
       </method>
       <method name="get_icon_name" c:identifier="gtk_image_get_icon_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -20054,25 +20487,9 @@
           </parameter>
         </parameters>
       </method>
-      <method name="get_gicon" c:identifier="gtk_image_get_gicon">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-          <parameter name="gicon">
-            <type name="GIcon" c:type="GIcon**"/>
-          </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize*"/>
-          </parameter>
-        </parameters>
-      </method>
       <method name="get_pixel_size" c:identifier="gtk_image_get_pixel_size">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -20082,7 +20499,7 @@
       </method>
       <method name="set" c:identifier="gtk_image_set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -20098,7 +20515,7 @@
       </method>
       <method name="get" c:identifier="gtk_image_get">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -20125,50 +20542,47 @@
         <type name="GdkPixmap" c:type="GdkPixmap"/>
       </property>
       <property name="file">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="stock">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="icon-set">
         <type name="GtkIconSet" c:type="GtkIconSet"/>
       </property>
       <property name="icon-size">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="pixel-size">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="pixbuf-animation">
         <type name="GdkPixbufAnimation" c:type="GdkPixbufAnimation"/>
       </property>
       <property name="icon-name">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="storage-type">
         <type name="GtkImageType" c:type="GtkImageType"/>
       </property>
-      <property name="gicon">
-        <type name="GIcon" c:type="GIcon"/>
-      </property>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
@@ -20183,10 +20597,10 @@
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="pixmap">
+        <parameter name="pixmap" allow-none="1">
           <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
-        <parameter name="mask">
+        <parameter name="mask" allow-none="1">
           <type name="GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
       </parameters>
@@ -20197,21 +20611,22 @@
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="image">
+        <parameter name="image" allow-none="1">
           <type name="Gdk.Image" c:type="GdkImage*"/>
         </parameter>
-        <parameter name="mask">
+        <parameter name="mask" allow-none="1">
           <type name="GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="image_new_from_file" c:identifier="gtk_image_new_from_file">
+    <function name="image_new_from_file"
+              c:identifier="gtk_image_new_from_file">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="filename">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -20221,7 +20636,7 @@
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="pixbuf">
+        <parameter name="pixbuf" allow-none="1">
           <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </parameter>
       </parameters>
@@ -20233,7 +20648,7 @@
       </return-value>
       <parameters>
         <parameter name="stock_id">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="size">
           <type name="IconSize" c:type="GtkIconSize"/>
@@ -20272,21 +20687,7 @@
       </return-value>
       <parameters>
         <parameter name="icon_name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="IconSize" c:type="GtkIconSize"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="image_new_from_gicon"
-              c:identifier="gtk_image_new_from_gicon">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon">
-          <type name="GIcon" c:type="GIcon*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="size">
           <type name="IconSize" c:type="GtkIconSize"/>
@@ -20300,7 +20701,7 @@
            glib:get-type="gtk_button_get_type">
       <method name="pressed" c:identifier="gtk_button_pressed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20310,7 +20711,7 @@
       </method>
       <method name="released" c:identifier="gtk_button_released">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20320,7 +20721,7 @@
       </method>
       <method name="clicked" c:identifier="gtk_button_clicked">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20330,7 +20731,7 @@
       </method>
       <method name="enter" c:identifier="gtk_button_enter">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20340,7 +20741,7 @@
       </method>
       <method name="leave" c:identifier="gtk_button_leave">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20350,7 +20751,7 @@
       </method>
       <method name="set_relief" c:identifier="gtk_button_set_relief">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20373,20 +20774,20 @@
       </method>
       <method name="set_label" c:identifier="gtk_button_set_label">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
             <type name="Button" c:type="GtkButton*"/>
           </parameter>
           <parameter name="label">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_label" c:identifier="gtk_button_get_label">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20397,21 +20798,21 @@
       <method name="set_use_underline"
               c:identifier="gtk_button_set_use_underline">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
             <type name="Button" c:type="GtkButton*"/>
           </parameter>
           <parameter name="use_underline">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_use_underline"
               c:identifier="gtk_button_get_use_underline">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20421,20 +20822,20 @@
       </method>
       <method name="set_use_stock" c:identifier="gtk_button_set_use_stock">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
             <type name="Button" c:type="GtkButton*"/>
           </parameter>
           <parameter name="use_stock">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_use_stock" c:identifier="gtk_button_get_use_stock">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20445,21 +20846,21 @@
       <method name="set_focus_on_click"
               c:identifier="gtk_button_set_focus_on_click">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
             <type name="Button" c:type="GtkButton*"/>
           </parameter>
           <parameter name="focus_on_click">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_focus_on_click"
               c:identifier="gtk_button_get_focus_on_click">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20469,23 +20870,23 @@
       </method>
       <method name="set_alignment" c:identifier="gtk_button_set_alignment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
             <type name="Button" c:type="GtkButton*"/>
           </parameter>
           <parameter name="xalign">
-            <type name="gfloat" c:type="gfloat"/>
+            <type name="float" c:type="gfloat"/>
           </parameter>
           <parameter name="yalign">
-            <type name="gfloat" c:type="gfloat"/>
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_alignment" c:identifier="gtk_button_get_alignment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20501,7 +20902,7 @@
       </method>
       <method name="set_image" c:identifier="gtk_button_set_image">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20525,7 +20926,7 @@
       <method name="set_image_position"
               c:identifier="gtk_button_set_image_position">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20548,7 +20949,7 @@
         </parameters>
       </method>
       <property name="label">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="image">
         <type name="GtkWidget" c:type="GtkWidget"/>
@@ -20557,26 +20958,26 @@
         <type name="GtkReliefStyle" c:type="GtkReliefStyle"/>
       </property>
       <property name="use-underline">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="use-stock">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="focus-on-click">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="xalign">
-        <type name="gfloat" c:type="gfloat"/>
+        <type name="float" c:type="gfloat"/>
       </property>
       <property name="yalign">
-        <type name="gfloat" c:type="gfloat"/>
+        <type name="float" c:type="gfloat"/>
       </property>
       <property name="image-position">
         <type name="GtkPositionType" c:type="GtkPositionType"/>
       </property>
       <callback name="pressed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20586,7 +20987,7 @@
       </callback>
       <callback name="released">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20596,7 +20997,7 @@
       </callback>
       <callback name="clicked">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20606,7 +21007,7 @@
       </callback>
       <callback name="enter">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20616,7 +21017,7 @@
       </callback>
       <callback name="leave">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20626,7 +21027,7 @@
       </callback>
       <callback name="activate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
@@ -20636,52 +21037,52 @@
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <glib:signal name="activate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="pressed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="released">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="clicked">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="enter">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="leave">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
     </class>
@@ -20697,7 +21098,7 @@
       </return-value>
       <parameters>
         <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -20708,7 +21109,7 @@
       </return-value>
       <parameters>
         <parameter name="stock_id">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -20719,27 +21120,27 @@
       </return-value>
       <parameters>
         <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="button_set_depressed"
               c:identifier="_gtk_button_set_depressed">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="button">
           <type name="Button" c:type="GtkButton*"/>
         </parameter>
         <parameter name="depressed">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="button_paint" c:identifier="_gtk_button_paint">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="button">
@@ -20755,4623 +21156,4236 @@
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
         <parameter name="main_detail">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="default_detail">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkCellEditable" c:type="GtkCellEditable"/>
-    <interface name="CellEditable"
-               c:type="GtkCellEditable"
-               glib:type-name="GtkCellEditable"
-               glib:get-type="gtk_cell_editable_get_type">
-      <callback name="editing_done">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell_editable">
-            <type name="GtkCellEditable*" c:type="GtkCellEditable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove_widget">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell_editable">
-            <type name="GtkCellEditable*" c:type="GtkCellEditable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="start_editing">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell_editable">
-            <type name="GtkCellEditable*" c:type="GtkCellEditable*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <glib:signal name="editing-done">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="remove-widget">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </interface>
-    <function name="cell_editable_start_editing"
-              c:identifier="gtk_cell_editable_start_editing">
+    <function name="marshal_BOOLEAN__VOID"
+              c:identifier="gtk_marshal_BOOLEAN__VOID">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="cell_editable">
-          <type name="CellEditable" c:type="GtkCellEditable*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="event">
-          <type name="GdkEvent" c:type="GdkEvent*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_editable_editing_done"
-              c:identifier="gtk_cell_editable_editing_done">
+    <function name="marshal_BOOLEAN__POINTER"
+              c:identifier="gtk_marshal_BOOLEAN__POINTER">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="cell_editable">
-          <type name="CellEditable" c:type="GtkCellEditable*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_editable_remove_widget"
-              c:identifier="gtk_cell_editable_remove_widget">
+    <function name="marshal_BOOLEAN__POINTER_POINTER_INT_INT"
+              c:identifier="gtk_marshal_BOOLEAN__POINTER_POINTER_INT_INT">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="cell_editable">
-          <type name="CellEditable" c:type="GtkCellEditable*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <class name="CellRenderer"
-           c:type="GtkCellRenderer"
-           parent="GtkObject"
-           glib:type-name="GtkCellRenderer"
-           glib:get-type="gtk_cell_renderer_get_type">
-      <constructor name="text_new" c:identifier="gtk_cell_renderer_text_new">
-        <return-value>
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </return-value>
-      </constructor>
-      <constructor name="accel_new" c:identifier="gtk_cell_renderer_accel_new">
-        <return-value>
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </return-value>
-      </constructor>
-      <constructor name="combo_new" c:identifier="gtk_cell_renderer_combo_new">
-        <return-value>
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </return-value>
-      </constructor>
-      <constructor name="pixbuf_new"
-                   c:identifier="gtk_cell_renderer_pixbuf_new">
-        <return-value>
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </return-value>
-      </constructor>
-      <constructor name="progress_new"
-                   c:identifier="gtk_cell_renderer_progress_new">
-        <return-value>
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </return-value>
-      </constructor>
-      <constructor name="spin_new" c:identifier="gtk_cell_renderer_spin_new">
-        <return-value>
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </return-value>
-      </constructor>
-      <constructor name="toggle_new"
-                   c:identifier="gtk_cell_renderer_toggle_new">
-        <return-value>
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </return-value>
-      </constructor>
-      <method name="get_size" c:identifier="gtk_cell_renderer_get_size">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="x_offset">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="y_offset">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="height">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="render" c:identifier="gtk_cell_renderer_render">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="window">
-            <type name="Gdk.Window" c:type="GdkWindow*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="background_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="expose_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="CellRendererState" c:type="GtkCellRendererState"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="activate" c:identifier="gtk_cell_renderer_activate">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="GdkEvent" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="background_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="CellRendererState" c:type="GtkCellRendererState"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="start_editing"
-              c:identifier="gtk_cell_renderer_start_editing">
-        <return-value>
-          <type name="CellEditable" c:type="GtkCellEditable*"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="GdkEvent" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="background_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="CellRendererState" c:type="GtkCellRendererState"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_fixed_size"
-              c:identifier="gtk_cell_renderer_set_fixed_size">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="height">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_fixed_size"
-              c:identifier="gtk_cell_renderer_get_fixed_size">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="height">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="editing_canceled"
-              c:identifier="gtk_cell_renderer_editing_canceled">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="stop_editing" c:identifier="gtk_cell_renderer_stop_editing">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="canceled">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="mode">
-        <type name="GtkCellRendererMode" c:type="GtkCellRendererMode"/>
-      </property>
-      <property name="visible">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="sensitive">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="xalign">
-        <type name="gfloat" c:type="gfloat"/>
-      </property>
-      <property name="yalign">
-        <type name="gfloat" c:type="gfloat"/>
-      </property>
-      <property name="xpad">
-        <type name="guint" c:type="guint"/>
-      </property>
-      <property name="ypad">
-        <type name="guint" c:type="guint"/>
-      </property>
-      <property name="width">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="height">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="is-expander">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="is-expanded">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="cell-background">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="cell-background-gdk">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </property>
-      <property name="cell-background-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <callback name="get_size">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="x_offset">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="y_offset">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="height">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="render">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="window">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="background_area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="expose_area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="GtkCellRendererState" c:type="GtkCellRendererState"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="activate">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-          <parameter name="background_area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="GtkCellRendererState" c:type="GtkCellRendererState"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="start_editing">
-        <return-value>
-          <type name="GtkCellEditable*" c:type="GtkCellEditable*"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-          <parameter name="background_area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="GtkCellRendererState" c:type="GtkCellRendererState"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="editing_canceled">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="editing_started">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="editable">
-            <type name="GtkCellEditable*" c:type="GtkCellEditable*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="editing-canceled">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="editing-started">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkCellEditable" c:type="GtkCellEditable"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gchararray" c:type="gchararray"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <record name="GtkTreeModel" c:type="GtkTreeModel"/>
-    <callback name="GtkTreeModelForeachFunc">
+    <function name="marshal_BOOLEAN__POINTER_INT_INT"
+              c:identifier="gtk_marshal_BOOLEAN__POINTER_INT_INT">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="path">
-          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </callback>
-    <function name="tree_path_new" c:identifier="gtk_tree_path_new">
-      <return-value>
-        <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-      </return-value>
     </function>
-    <function name="tree_path_new_from_string"
-              c:identifier="gtk_tree_path_new_from_string">
+    <function name="marshal_BOOLEAN__POINTER_INT_INT_UINT"
+              c:identifier="gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT">
       <return-value>
-        <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="path">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_path_new_from_indices"
-              c:identifier="gtk_tree_path_new_from_indices">
+    <function name="marshal_BOOLEAN__POINTER_STRING_STRING_POINTER"
+              c:identifier="gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER">
       <return-value>
-        <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="first_index">
-          <type name="gint" c:type="gint"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_path_to_string" c:identifier="gtk_tree_path_to_string">
+    <function name="marshal_ENUM__ENUM" c:identifier="gtk_marshal_ENUM__ENUM">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="path">
-          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_path_new_first" c:identifier="gtk_tree_path_new_first">
-      <return-value>
-        <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-      </return-value>
-    </function>
-    <function name="tree_path_append_index"
-              c:identifier="gtk_tree_path_append_index">
+    <function name="marshal_INT__POINTER"
+              c:identifier="gtk_marshal_INT__POINTER">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="path">
-          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="index_">
-          <type name="gint" c:type="gint"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_path_prepend_index"
-              c:identifier="gtk_tree_path_prepend_index">
+    <function name="marshal_INT__POINTER_CHAR_CHAR"
+              c:identifier="gtk_marshal_INT__POINTER_CHAR_CHAR">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="path">
-          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="index_">
-          <type name="gint" c:type="gint"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_path_get_depth" c:identifier="gtk_tree_path_get_depth">
+    <function name="marshal_VOID__ENUM_FLOAT"
+              c:identifier="gtk_marshal_VOID__ENUM_FLOAT">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="path">
-          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_path_get_indices"
-              c:identifier="gtk_tree_path_get_indices">
+    <function name="marshal_VOID__ENUM_FLOAT_BOOLEAN"
+              c:identifier="gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN">
       <return-value>
-        <type name="gint*" c:type="gint*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="path">
-          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_path_free" c:identifier="gtk_tree_path_free">
+    <function name="marshal_VOID__INT_INT"
+              c:identifier="gtk_marshal_VOID__INT_INT">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="path">
-          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_path_copy" c:identifier="gtk_tree_path_copy">
+    <function name="marshal_VOID__INT_INT_POINTER"
+              c:identifier="gtk_marshal_VOID__INT_INT_POINTER">
       <return-value>
-        <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="path">
-          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <glib:boxed c:type="TreePath"
-                glib:name="TreePath"
-                glib:type-name="GtkTreePath"
-                glib:get-type="gtk_tree_path_get_type">
-      <method name="compare" c:identifier="gtk_tree_path_compare">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="a">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="b">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="next" c:identifier="gtk_tree_path_next">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="prev" c:identifier="gtk_tree_path_prev">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="up" c:identifier="gtk_tree_path_up">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="down" c:identifier="gtk_tree_path_down">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="is_ancestor" c:identifier="gtk_tree_path_is_ancestor">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="descendant">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="is_descendant" c:identifier="gtk_tree_path_is_descendant">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="ancestor">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </glib:boxed>
-    <glib:boxed c:type="TreeRowReference"
-                glib:name="TreeRowReference"
-                glib:type-name="GtkTreeRowReference"
-                glib:get-type="gtk_tree_row_reference_get_type">
-      <constructor name="new" c:identifier="gtk_tree_row_reference_new">
-        <return-value>
-          <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
-        </return-value>
-        <parameters>
-          <parameter name="model">
-            <type name="GtkTreeModel" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="new_proxy"
-                   c:identifier="gtk_tree_row_reference_new_proxy">
-        <return-value>
-          <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
-        </return-value>
-        <parameters>
-          <parameter name="proxy">
-            <type name="GLib.Object" c:type="GObject*"/>
-          </parameter>
-          <parameter name="model">
-            <type name="GtkTreeModel" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_tree_row_reference_copy">
-        <return-value>
-          <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
-        </return-value>
-        <parameters>
-          <parameter name="reference">
-            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="get_path" c:identifier="gtk_tree_row_reference_get_path">
-        <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </return-value>
-        <parameters>
-          <parameter name="reference">
-            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_model" c:identifier="gtk_tree_row_reference_get_model">
-        <return-value>
-          <type name="GtkTreeModel" c:type="GtkTreeModel*"/>
-        </return-value>
-        <parameters>
-          <parameter name="reference">
-            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="valid" c:identifier="gtk_tree_row_reference_valid">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="reference">
-            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="free" c:identifier="gtk_tree_row_reference_free">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="reference">
-            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </glib:boxed>
-    <function name="tree_row_reference_inserted"
-              c:identifier="gtk_tree_row_reference_inserted">
+    <function name="marshal_VOID__POINTER_INT"
+              c:identifier="gtk_marshal_VOID__POINTER_INT">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="proxy">
-          <type name="GLib.Object" c:type="GObject*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_row_reference_deleted"
-              c:identifier="gtk_tree_row_reference_deleted">
+    <function name="marshal_VOID__POINTER_POINTER"
+              c:identifier="gtk_marshal_VOID__POINTER_POINTER">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="proxy">
-          <type name="GLib.Object" c:type="GObject*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_row_reference_reordered"
-              c:identifier="gtk_tree_row_reference_reordered">
+    <function name="marshal_VOID__POINTER_POINTER_POINTER"
+              c:identifier="gtk_marshal_VOID__POINTER_POINTER_POINTER">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="proxy">
-          <type name="GLib.Object" c:type="GObject*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="GtkTreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="new_order">
-          <type name="gint" c:type="gint*"/>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_iter_copy" c:identifier="gtk_tree_iter_copy">
+    <function name="marshal_VOID__POINTER_STRING_STRING"
+              c:identifier="gtk_marshal_VOID__POINTER_STRING_STRING">
       <return-value>
-        <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="iter">
-          <type name="GtkTreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_iter_free" c:identifier="gtk_tree_iter_free">
+    <function name="marshal_VOID__POINTER_UINT"
+              c:identifier="gtk_marshal_VOID__POINTER_UINT">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="iter">
-          <type name="GtkTreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-      </parameters>
-    </function>
-    <glib:boxed c:type="TreeIter"
-                glib:name="TreeIter"
-                glib:type-name="GtkTreeIter"
-                glib:get-type="gtk_tree_iter_get_type">
-    </glib:boxed>
-    <interface name="TreeModel"
-               c:type="GtkTreeModel"
-               glib:type-name="GtkTreeModel"
-               glib:get-type="gtk_tree_model_get_type">
-      <callback name="row_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="row_inserted">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="row_has_child_toggled">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="row_deleted">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="rows_reordered">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="new_order">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_flags">
-        <return-value>
-          <type name="GtkTreeModelFlags" c:type="GtkTreeModelFlags"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_n_columns">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_column_type">
-        <return-value>
-          <type name="GType" c:type="GType"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="index_">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_iter">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_path">
-        <return-value>
-          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_value">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="iter_next">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="iter_children">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="iter_has_child">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="iter_n_children">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="iter_nth_child">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="n">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="iter_parent">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="ref_node">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="unref_node">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <glib:signal name="row-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="row-inserted">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="row-has-child-toggled">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="row-deleted">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="rows-reordered">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </interface>
-    <function name="tree_model_get_flags"
-              c:identifier="gtk_tree_model_get_flags">
-      <return-value>
-        <type name="GtkTreeModelFlags" c:type="GtkTreeModelFlags"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_get_n_columns"
-              c:identifier="gtk_tree_model_get_n_columns">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_get_column_type"
-              c:identifier="gtk_tree_model_get_column_type">
-      <return-value>
-        <type name="GType" c:type="GType"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="index_">
-          <type name="gint" c:type="gint"/>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_get_iter" c:identifier="gtk_tree_model_get_iter">
+    <function name="marshal_VOID__POINTER_UINT_ENUM"
+              c:identifier="gtk_marshal_VOID__POINTER_UINT_ENUM">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_get_iter_from_string"
-              c:identifier="gtk_tree_model_get_iter_from_string">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="path_string">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_get_string_from_iter"
-              c:identifier="gtk_tree_model_get_string_from_iter">
+    <function name="marshal_VOID__POINTER_POINTER_UINT_UINT"
+              c:identifier="gtk_marshal_VOID__POINTER_POINTER_UINT_UINT">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_get_iter_first"
-              c:identifier="gtk_tree_model_get_iter_first">
+    <function name="marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT"
+              c:identifier="gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_get_path" c:identifier="gtk_tree_model_get_path">
+    <function name="marshal_VOID__POINTER_UINT_UINT"
+              c:identifier="gtk_marshal_VOID__POINTER_UINT_UINT">
       <return-value>
-        <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_get_value"
-              c:identifier="gtk_tree_model_get_value">
+    <function name="marshal_VOID__STRING_INT_POINTER"
+              c:identifier="gtk_marshal_VOID__STRING_INT_POINTER">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="value">
+        <parameter name="param_values">
           <type name="GValue" c:type="GValue*"/>
         </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
       </parameters>
     </function>
-    <function name="tree_model_iter_next"
-              c:identifier="gtk_tree_model_iter_next">
+    <function name="marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER"
+              c:identifier="gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_iter_children"
-              c:identifier="gtk_tree_model_iter_children">
+    <function name="marshal_VOID__UINT_POINTER_UINT_UINT_ENUM"
+              c:identifier="gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="parent">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_iter_has_child"
-              c:identifier="gtk_tree_model_iter_has_child">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_iter_n_children"
-              c:identifier="gtk_tree_model_iter_n_children">
+    <function name="marshal_VOID__UINT_STRING"
+              c:identifier="gtk_marshal_VOID__UINT_STRING">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="closure">
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="return_value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_iter_nth_child"
-              c:identifier="gtk_tree_model_iter_nth_child">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="n_param_values">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="param_values">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
-        <parameter name="parent">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="n">
-          <type name="gint" c:type="gint"/>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_iter_parent"
-              c:identifier="gtk_tree_model_iter_parent">
+    <function name="signal_newv" c:identifier="gtk_signal_newv">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="guint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="signal_flags">
+          <type name="SignalRunType" c:type="GtkSignalRunType"/>
         </parameter>
-        <parameter name="child">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="object_type">
+          <type name="GtkType" c:type="GtkType"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_ref_node" c:identifier="gtk_tree_model_ref_node">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="function_offset">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="marshaller">
+          <type name="GtkSignalMarshaller" c:type="GtkSignalMarshaller"/>
+        </parameter>
+        <parameter name="return_val">
+          <type name="GtkType" c:type="GtkType"/>
+        </parameter>
+        <parameter name="n_args">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="args">
+          <type name="GtkType" c:type="GtkType*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_unref_node"
-              c:identifier="gtk_tree_model_unref_node">
+    <function name="signal_new" c:identifier="gtk_signal_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="guint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="signal_flags">
+          <type name="SignalRunType" c:type="GtkSignalRunType"/>
+        </parameter>
+        <parameter name="object_type">
+          <type name="GtkType" c:type="GtkType"/>
+        </parameter>
+        <parameter name="function_offset">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="marshaller">
+          <type name="GtkSignalMarshaller" c:type="GtkSignalMarshaller"/>
+        </parameter>
+        <parameter name="return_val">
+          <type name="GtkType" c:type="GtkType"/>
+        </parameter>
+        <parameter name="n_args">
+          <type name="guint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_get" c:identifier="gtk_tree_model_get">
+    <function name="signal_emit_stop_by_name"
+              c:identifier="gtk_signal_emit_stop_by_name">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_get_valist"
-              c:identifier="gtk_tree_model_get_valist">
+    <function name="signal_connect_object_while_alive"
+              c:identifier="gtk_signal_connect_object_while_alive">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="var_args">
-          <type name="va_list" c:type="va_list"/>
+        <parameter name="func">
+          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+        </parameter>
+        <parameter name="alive_object">
+          <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_foreach" c:identifier="gtk_tree_model_foreach">
+    <function name="signal_connect_while_alive"
+              c:identifier="gtk_signal_connect_while_alive">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="func">
-          <type name="GtkTreeModelForeachFunc"
-                  c:type="GtkTreeModelForeachFunc"/>
+          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
         </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="func_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="alive_object">
+          <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_row_changed"
-              c:identifier="gtk_tree_model_row_changed">
+    <function name="signal_connect_full"
+              c:identifier="gtk_signal_connect_full">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="ulong" c:type="gulong"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="func">
+          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+        </parameter>
+        <parameter name="unsupported">
+          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy_func">
+          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
+        <parameter name="object_signal">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="after">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_row_inserted"
-              c:identifier="gtk_tree_model_row_inserted">
+    <function name="signal_emitv" c:identifier="gtk_signal_emitv">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="signal_id">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="args">
+          <type name="GtkArg" c:type="GtkArg*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_row_has_child_toggled"
-              c:identifier="gtk_tree_model_row_has_child_toggled">
+    <function name="signal_emit" c:identifier="gtk_signal_emit">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="signal_id">
+          <type name="guint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_row_deleted"
-              c:identifier="gtk_tree_model_row_deleted">
+    <function name="signal_emit_by_name"
+              c:identifier="gtk_signal_emit_by_name">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_rows_reordered"
-              c:identifier="gtk_tree_model_rows_reordered">
+    <function name="signal_emitv_by_name"
+              c:identifier="gtk_signal_emitv_by_name">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="new_order">
-          <type name="gint" c:type="gint*"/>
+        <parameter name="args">
+          <type name="GtkArg" c:type="GtkArg*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkTreeSortable" c:type="GtkTreeSortable"/>
-    <callback name="GtkTreeIterCompareFunc">
+    <function name="signal_compat_matched"
+              c:identifier="gtk_signal_compat_matched">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
-        <parameter name="a">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+        <parameter name="func">
+          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
         </parameter>
-        <parameter name="b">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="match">
+          <type name="GSignalMatchType" c:type="GSignalMatchType"/>
+        </parameter>
+        <parameter name="action">
+          <type name="guint" c:type="guint"/>
         </parameter>
       </parameters>
-    </callback>
-    <interface name="TreeSortable"
-               c:type="GtkTreeSortable"
-               glib:type-name="GtkTreeSortable"
-               glib:get-type="gtk_tree_sortable_get_type">
-      <callback name="sort_column_changed">
+    </function>
+    <record name="GtkCalendarPrivate" c:type="GtkCalendarPrivate"/>
+    <class name="Calendar"
+           c:type="GtkCalendar"
+           parent="Widget"
+           glib:type-name="GtkCalendar"
+           glib:get-type="gtk_calendar_get_type">
+      <method name="select_month" c:identifier="gtk_calendar_select_month">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="sortable">
-            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+          <parameter name="month">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="year">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_sort_column_id">
+      </method>
+      <method name="select_day" c:identifier="gtk_calendar_select_day">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="sortable">
-            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
-          <parameter name="sort_column_id">
-            <type name="gint*" c:type="gint*"/>
+          <parameter name="day">
+            <type name="guint" c:type="guint"/>
           </parameter>
-          <parameter name="order">
-            <type name="GtkSortType*" c:type="GtkSortType*"/>
+        </parameters>
+      </method>
+      <method name="mark_day" c:identifier="gtk_calendar_mark_day">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+          <parameter name="day">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_sort_column_id">
+      </method>
+      <method name="unmark_day" c:identifier="gtk_calendar_unmark_day">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="sortable">
-            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
-          <parameter name="sort_column_id">
-            <type name="gint" c:type="gint"/>
+          <parameter name="day">
+            <type name="guint" c:type="guint"/>
           </parameter>
-          <parameter name="order">
-            <type name="GtkSortType" c:type="GtkSortType"/>
+        </parameters>
+      </method>
+      <method name="clear_marks" c:identifier="gtk_calendar_clear_marks">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_sort_func">
+      </method>
+      <method name="set_display_options"
+              c:identifier="gtk_calendar_set_display_options">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="sortable">
-            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
-          <parameter name="sort_column_id">
-            <type name="gint" c:type="gint"/>
+          <parameter name="flags">
+            <type name="CalendarDisplayOptions"
+                  c:type="GtkCalendarDisplayOptions"/>
           </parameter>
-          <parameter name="func">
-            <type name="GtkTreeIterCompareFunc"
-                    c:type="GtkTreeIterCompareFunc"/>
+        </parameters>
+      </method>
+      <method name="get_display_options"
+              c:identifier="gtk_calendar_get_display_options">
+        <return-value>
+          <type name="CalendarDisplayOptions"
+                c:type="GtkCalendarDisplayOptions"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+        </parameters>
+      </method>
+      <method name="display_options"
+              c:identifier="gtk_calendar_display_options">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          <parameter name="flags">
+            <type name="CalendarDisplayOptions"
+                  c:type="GtkCalendarDisplayOptions"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_date" c:identifier="gtk_calendar_get_date">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+          <parameter name="year">
+            <type name="guint" c:type="guint*"/>
+          </parameter>
+          <parameter name="month">
+            <type name="guint" c:type="guint*"/>
+          </parameter>
+          <parameter name="day">
+            <type name="guint" c:type="guint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="freeze" c:identifier="gtk_calendar_freeze">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="thaw" c:identifier="gtk_calendar_thaw">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="year">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="month">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="day">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="show-heading">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-day-names">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="no-month-change">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-week-numbers">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="month_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_default_sort_func">
+      <callback name="day_selected">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="sortable">
-            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
+          <parameter name="calendar">
+            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
           </parameter>
-          <parameter name="func">
-            <type name="GtkTreeIterCompareFunc"
-                    c:type="GtkTreeIterCompareFunc"/>
+        </parameters>
+      </callback>
+      <callback name="day_selected_double_click">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
           </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+        </parameters>
+      </callback>
+      <callback name="prev_month">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameters>
+      </callback>
+      <callback name="next_month">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="has_default_sort_func">
+      <callback name="prev_year">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="sortable">
-            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
+          <parameter name="calendar">
+            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
       </callback>
-      <glib:signal name="sort-column-changed">
+      <callback name="next_year">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <glib:signal name="month-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-    </interface>
-    <function name="tree_sortable_sort_column_changed"
-              c:identifier="gtk_tree_sortable_sort_column_changed">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="sortable">
-          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_sortable_get_sort_column_id"
-              c:identifier="gtk_tree_sortable_get_sort_column_id">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="sortable">
-          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
-        </parameter>
-        <parameter name="sort_column_id">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="order">
-          <type name="SortType" c:type="GtkSortType*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_sortable_set_sort_column_id"
-              c:identifier="gtk_tree_sortable_set_sort_column_id">
+      <glib:signal name="day-selected">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="day-selected-double-click">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="prev-month">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="next-month">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="prev-year">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="next-year">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="calendar_new" c:identifier="gtk_calendar_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="sortable">
-          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
-        </parameter>
-        <parameter name="sort_column_id">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="order">
-          <type name="SortType" c:type="GtkSortType"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="tree_sortable_set_sort_func"
-              c:identifier="gtk_tree_sortable_set_sort_func">
+    <record name="GtkCellEditable" c:type="GtkCellEditable"/>
+    <interface name="CellEditable"
+               c:type="GtkCellEditable"
+               glib:type-name="GtkCellEditable"
+               glib:get-type="gtk_cell_editable_get_type">
+      <callback name="editing_done">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="cell_editable">
+            <type name="GtkCellEditable*" c:type="GtkCellEditable*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="remove_widget">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="cell_editable">
+            <type name="GtkCellEditable*" c:type="GtkCellEditable*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="start_editing">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="cell_editable">
+            <type name="GtkCellEditable*" c:type="GtkCellEditable*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="GdkEvent*" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <glib:signal name="editing-done">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="remove-widget">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </interface>
+    <function name="cell_editable_start_editing"
+              c:identifier="gtk_cell_editable_start_editing">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="sortable">
-          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
-        </parameter>
-        <parameter name="sort_column_id">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="sort_func">
-          <type name="GtkTreeIterCompareFunc" c:type="GtkTreeIterCompareFunc"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="cell_editable">
+          <type name="CellEditable" c:type="GtkCellEditable*"/>
         </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        <parameter name="event">
+          <type name="GdkEvent" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_sortable_set_default_sort_func"
-              c:identifier="gtk_tree_sortable_set_default_sort_func">
+    <function name="cell_editable_editing_done"
+              c:identifier="gtk_cell_editable_editing_done">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="sortable">
-          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
-        </parameter>
-        <parameter name="sort_func">
-          <type name="GtkTreeIterCompareFunc" c:type="GtkTreeIterCompareFunc"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        <parameter name="cell_editable">
+          <type name="CellEditable" c:type="GtkCellEditable*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_sortable_has_default_sort_func"
-              c:identifier="gtk_tree_sortable_has_default_sort_func">
+    <function name="cell_editable_remove_widget"
+              c:identifier="gtk_cell_editable_remove_widget">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="sortable">
-          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+        <parameter name="cell_editable">
+          <type name="CellEditable" c:type="GtkCellEditable*"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GtkTreeCellDataFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_column">
-          <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
-        </parameter>
-        <parameter name="cell">
-          <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
-        </parameter>
-        <parameter name="tree_model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="TreeViewColumn"
-           c:type="GtkTreeViewColumn"
+    <class name="CellRenderer"
+           c:type="GtkCellRenderer"
            parent="GtkObject"
-           glib:type-name="GtkTreeViewColumn"
-           glib:get-type="gtk_tree_view_column_get_type">
-      <constructor name="new" c:identifier="gtk_tree_view_column_new">
+           glib:type-name="GtkCellRenderer"
+           glib:get-type="gtk_cell_renderer_get_type">
+      <constructor name="text_new" c:identifier="gtk_cell_renderer_text_new">
         <return-value>
-          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
         </return-value>
       </constructor>
-      <constructor name="new_with_attributes"
-                   c:identifier="gtk_tree_view_column_new_with_attributes">
+      <constructor name="accel_new" c:identifier="gtk_cell_renderer_accel_new">
         <return-value>
-          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
         </return-value>
-        <parameters>
-          <parameter name="title">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-        </parameters>
       </constructor>
-      <method name="pack_start" c:identifier="gtk_tree_view_column_pack_start">
+      <constructor name="combo_new" c:identifier="gtk_cell_renderer_combo_new">
+        <return-value>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </return-value>
+      </constructor>
+      <constructor name="pixbuf_new"
+                   c:identifier="gtk_cell_renderer_pixbuf_new">
+        <return-value>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </return-value>
+      </constructor>
+      <constructor name="progress_new"
+                   c:identifier="gtk_cell_renderer_progress_new">
+        <return-value>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </return-value>
+      </constructor>
+      <constructor name="spin_new" c:identifier="gtk_cell_renderer_spin_new">
+        <return-value>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </return-value>
+      </constructor>
+      <constructor name="toggle_new"
+                   c:identifier="gtk_cell_renderer_toggle_new">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </return-value>
+      </constructor>
+      <method name="get_size" c:identifier="gtk_cell_renderer_get_size">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
           <parameter name="cell">
             <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="expand">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="x_offset">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="y_offset">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="height">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="pack_end" c:identifier="gtk_tree_view_column_pack_end">
+      <method name="render" c:identifier="gtk_cell_renderer_render">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
           <parameter name="cell">
             <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="expand">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="clear" c:identifier="gtk_tree_view_column_clear">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="background_area">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="expose_area">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="CellRendererState" c:type="GtkCellRendererState"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_cell_renderers"
-              c:identifier="gtk_tree_view_column_get_cell_renderers">
+      <method name="activate" c:identifier="gtk_cell_renderer_activate">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="GdkEvent" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="background_area">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="CellRendererState" c:type="GtkCellRendererState"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_attribute"
-              c:identifier="gtk_tree_view_column_add_attribute">
+      <method name="start_editing"
+              c:identifier="gtk_cell_renderer_start_editing">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="CellEditable" c:type="GtkCellEditable*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="cell_renderer">
+          <parameter name="cell">
             <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="attribute">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="event">
+            <type name="GdkEvent" c:type="GdkEvent*"/>
           </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="background_area">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="CellRendererState" c:type="GtkCellRendererState"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_attributes"
-              c:identifier="gtk_tree_view_column_set_attributes">
+      <method name="set_fixed_size"
+              c:identifier="gtk_cell_renderer_set_fixed_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="cell_renderer">
+          <parameter name="cell">
             <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
+          <parameter name="width">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int32" c:type="gint"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="set_cell_data_func"
-              c:identifier="gtk_tree_view_column_set_cell_data_func">
+      <method name="get_fixed_size"
+              c:identifier="gtk_cell_renderer_get_fixed_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="cell_renderer">
+          <parameter name="cell">
             <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="func">
-            <type name="GtkTreeCellDataFunc" c:type="GtkTreeCellDataFunc"/>
-          </parameter>
-          <parameter name="func_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="width">
+            <type name="gint" c:type="gint*"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          <parameter name="height">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clear_attributes"
-              c:identifier="gtk_tree_view_column_clear_attributes">
+      <method name="editing_canceled"
+              c:identifier="gtk_cell_renderer_editing_canceled">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="cell_renderer">
+          <parameter name="cell">
             <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_spacing"
-              c:identifier="gtk_tree_view_column_set_spacing">
+      <method name="stop_editing"
+              c:identifier="gtk_cell_renderer_stop_editing">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="spacing">
-            <type name="gint" c:type="gint"/>
+          <parameter name="canceled">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_spacing"
-              c:identifier="gtk_tree_view_column_get_spacing">
+      <property name="mode">
+        <type name="GtkCellRendererMode" c:type="GtkCellRendererMode"/>
+      </property>
+      <property name="visible">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="sensitive">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="xalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="yalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="xpad">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <property name="ypad">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <property name="width">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="height">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="is-expander">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="is-expanded">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="cell-background">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="cell-background-gdk">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </property>
+      <property name="cell-background-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="get_size">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="cell">
+            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="x_offset">
+            <type name="gint*" c:type="gint*"/>
+          </parameter>
+          <parameter name="y_offset">
+            <type name="gint*" c:type="gint*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="gint*" c:type="gint*"/>
+          </parameter>
+          <parameter name="height">
+            <type name="gint*" c:type="gint*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_visible"
-              c:identifier="gtk_tree_view_column_set_visible">
+      </callback>
+      <callback name="render">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="cell">
+            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="visible">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="window">
+            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="background_area">
+            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="expose_area">
+            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="GtkCellRendererState" c:type="GtkCellRendererState"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_visible"
-              c:identifier="gtk_tree_view_column_get_visible">
+      </callback>
+      <callback name="activate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="cell">
+            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="GdkEvent*" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="background_area">
+            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="GtkCellRendererState" c:type="GtkCellRendererState"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_resizable"
-              c:identifier="gtk_tree_view_column_set_resizable">
+      </callback>
+      <callback name="start_editing">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkCellEditable*" c:type="GtkCellEditable*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="cell">
+            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="resizable">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="event">
+            <type name="GdkEvent*" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="background_area">
+            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="GtkCellRendererState" c:type="GtkCellRendererState"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_resizable"
-              c:identifier="gtk_tree_view_column_get_resizable">
+      </callback>
+      <callback name="editing_canceled">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="cell">
+            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_sizing" c:identifier="gtk_tree_view_column_set_sizing">
+      </callback>
+      <callback name="editing_started">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="cell">
+            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="type">
-            <type name="TreeViewColumnSizing"
-                    c:type="GtkTreeViewColumnSizing"/>
+          <parameter name="editable">
+            <type name="GtkCellEditable*" c:type="GtkCellEditable*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_sizing" c:identifier="gtk_tree_view_column_get_sizing">
+      </callback>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="TreeViewColumnSizing" c:type="GtkTreeViewColumnSizing"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_width" c:identifier="gtk_tree_view_column_get_width">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_fixed_width"
-              c:identifier="gtk_tree_view_column_get_fixed_width">
+      </callback>
+      <glib:signal name="editing-canceled">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_fixed_width"
-              c:identifier="gtk_tree_view_column_set_fixed_width">
+      </glib:signal>
+      <glib:signal name="editing-started">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="object">
+            <type name="GtkCellEditable" c:type="GtkCellEditable"/>
           </parameter>
-          <parameter name="fixed_width">
-            <type name="gint" c:type="gint"/>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_min_width"
-              c:identifier="gtk_tree_view_column_set_min_width">
+      </glib:signal>
+    </class>
+    <record name="GtkTreeModel" c:type="GtkTreeModel"/>
+    <callback name="GtkTreeModelForeachFunc">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="model">
+          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <function name="tree_path_new" c:identifier="gtk_tree_path_new">
+      <return-value>
+        <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+      </return-value>
+    </function>
+    <function name="tree_path_new_from_string"
+              c:identifier="gtk_tree_path_new_from_string">
+      <return-value>
+        <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+      </return-value>
+      <parameters>
+        <parameter name="path">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_path_new_from_indices"
+              c:identifier="gtk_tree_path_new_from_indices">
+      <return-value>
+        <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+      </return-value>
+      <parameters>
+        <parameter name="first_index">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_path_to_string"
+              c:identifier="gtk_tree_path_to_string">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="path">
+          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_path_new_first"
+              c:identifier="gtk_tree_path_new_first">
+      <return-value>
+        <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+      </return-value>
+    </function>
+    <function name="tree_path_append_index"
+              c:identifier="gtk_tree_path_append_index">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="path">
+          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="index_">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_path_prepend_index"
+              c:identifier="gtk_tree_path_prepend_index">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="path">
+          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="index_">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_path_get_depth"
+              c:identifier="gtk_tree_path_get_depth">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="path">
+          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_path_get_indices"
+              c:identifier="gtk_tree_path_get_indices">
+      <return-value>
+        <type name="gint*" c:type="gint*"/>
+      </return-value>
+      <parameters>
+        <parameter name="path">
+          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_path_free" c:identifier="gtk_tree_path_free">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="path">
+          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_path_copy" c:identifier="gtk_tree_path_copy">
+      <return-value>
+        <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+      </return-value>
+      <parameters>
+        <parameter name="path">
+          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <glib:boxed c:type="TreePath"
+                glib:name="TreePath"
+                glib:type-name="GtkTreePath"
+                glib:get-type="gtk_tree_path_get_type">
+      <method name="compare" c:identifier="gtk_tree_path_compare">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="a">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="min_width">
-            <type name="gint" c:type="gint"/>
+          <parameter name="b">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_min_width"
-              c:identifier="gtk_tree_view_column_get_min_width">
+      <method name="next" c:identifier="gtk_tree_path_next">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_max_width"
-              c:identifier="gtk_tree_view_column_set_max_width">
+      <method name="prev" c:identifier="gtk_tree_path_prev">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="max_width">
-            <type name="gint" c:type="gint"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_max_width"
-              c:identifier="gtk_tree_view_column_get_max_width">
+      <method name="up" c:identifier="gtk_tree_path_up">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clicked" c:identifier="gtk_tree_view_column_clicked">
+      <method name="down" c:identifier="gtk_tree_path_down">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_title" c:identifier="gtk_tree_view_column_set_title">
+      <method name="is_ancestor" c:identifier="gtk_tree_path_is_ancestor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="title">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="descendant">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_title" c:identifier="gtk_tree_view_column_get_title">
+      <method name="is_descendant" c:identifier="gtk_tree_path_is_descendant">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="ancestor">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_expand" c:identifier="gtk_tree_view_column_set_expand">
+    </glib:boxed>
+    <glib:boxed c:type="TreeRowReference"
+                glib:name="TreeRowReference"
+                glib:type-name="GtkTreeRowReference"
+                glib:get-type="gtk_tree_row_reference_get_type">
+      <constructor name="new" c:identifier="gtk_tree_row_reference_new">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="model">
+            <type name="GtkTreeModel" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="expand">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_expand" c:identifier="gtk_tree_view_column_get_expand">
+      </constructor>
+      <constructor name="new_proxy"
+                   c:identifier="gtk_tree_row_reference_new_proxy">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="proxy">
+            <type name="GLib.Object" c:type="GObject*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="set_clickable"
-              c:identifier="gtk_tree_view_column_set_clickable">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="model">
+            <type name="GtkTreeModel" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="clickable">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_clickable"
-              c:identifier="gtk_tree_view_column_get_clickable">
+      </constructor>
+      <constructor name="copy" c:identifier="gtk_tree_row_reference_copy">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="reference">
+            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_widget" c:identifier="gtk_tree_view_column_set_widget">
+      </constructor>
+      <method name="get_path" c:identifier="gtk_tree_row_reference_get_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="reference">
+            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_widget" c:identifier="gtk_tree_view_column_get_widget">
+      <method name="get_model" c:identifier="gtk_tree_row_reference_get_model">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="GtkTreeModel" c:type="GtkTreeModel*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="reference">
+            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_alignment"
-              c:identifier="gtk_tree_view_column_set_alignment">
+      <method name="valid" c:identifier="gtk_tree_row_reference_valid">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="xalign">
-            <type name="gfloat" c:type="gfloat"/>
+          <parameter name="reference">
+            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_alignment"
-              c:identifier="gtk_tree_view_column_get_alignment">
+      <method name="free" c:identifier="gtk_tree_row_reference_free">
         <return-value>
-          <type name="gfloat" c:type="gfloat"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="reference">
+            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_reorderable"
-              c:identifier="gtk_tree_view_column_set_reorderable">
+    </glib:boxed>
+    <function name="tree_row_reference_inserted"
+              c:identifier="gtk_tree_row_reference_inserted">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="proxy">
+          <type name="GLib.Object" c:type="GObject*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_row_reference_deleted"
+              c:identifier="gtk_tree_row_reference_deleted">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="proxy">
+          <type name="GLib.Object" c:type="GObject*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_row_reference_reordered"
+              c:identifier="gtk_tree_row_reference_reordered">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="proxy">
+          <type name="GLib.Object" c:type="GObject*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="GtkTreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="new_order">
+          <type name="gint" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_iter_copy" c:identifier="gtk_tree_iter_copy">
+      <return-value>
+        <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+      </return-value>
+      <parameters>
+        <parameter name="iter">
+          <type name="GtkTreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_iter_free" c:identifier="gtk_tree_iter_free">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="iter">
+          <type name="GtkTreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <glib:boxed c:type="TreeIter"
+                glib:name="TreeIter"
+                glib:type-name="GtkTreeIter"
+                glib:get-type="gtk_tree_iter_get_type">
+    </glib:boxed>
+    <interface name="TreeModel"
+               c:type="GtkTreeModel"
+               glib:type-name="GtkTreeModel"
+               glib:get-type="gtk_tree_model_get_type">
+      <callback name="row_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="reorderable">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_reorderable"
-              c:identifier="gtk_tree_view_column_get_reorderable">
+      </callback>
+      <callback name="row_inserted">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_sort_column_id"
-              c:identifier="gtk_tree_view_column_set_sort_column_id">
+      </callback>
+      <callback name="row_has_child_toggled">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="sort_column_id">
-            <type name="gint" c:type="gint"/>
+          <parameter name="path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_sort_column_id"
-              c:identifier="gtk_tree_view_column_get_sort_column_id">
+      </callback>
+      <callback name="row_deleted">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_sort_indicator"
-              c:identifier="gtk_tree_view_column_set_sort_indicator">
+      </callback>
+      <callback name="rows_reordered">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="new_order">
+            <type name="gint*" c:type="gint*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_sort_indicator"
-              c:identifier="gtk_tree_view_column_get_sort_indicator">
+      </callback>
+      <callback name="get_flags">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="GtkTreeModelFlags" c:type="GtkTreeModelFlags"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_sort_order"
-              c:identifier="gtk_tree_view_column_set_sort_order">
+      </callback>
+      <callback name="get_n_columns">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="order">
-            <type name="SortType" c:type="GtkSortType"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_sort_order"
-              c:identifier="gtk_tree_view_column_get_sort_order">
+      </callback>
+      <callback name="get_column_type">
         <return-value>
-          <type name="SortType" c:type="GtkSortType"/>
+          <type name="GType" c:type="GType"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          </parameter>
+          <parameter name="index_">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="cell_set_cell_data"
-              c:identifier="gtk_tree_view_column_cell_set_cell_data">
+      </callback>
+      <callback name="get_iter">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
           <parameter name="tree_model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="is_expander">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="is_expanded">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="cell_get_size"
-              c:identifier="gtk_tree_view_column_cell_get_size">
+      </callback>
+      <callback name="get_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="x_offset">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="y_offset">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="height">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="cell_is_visible"
-              c:identifier="gtk_tree_view_column_cell_is_visible">
+      </callback>
+      <callback name="get_value">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GValue*" c:type="GValue*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="focus_cell" c:identifier="gtk_tree_view_column_focus_cell">
+      </callback>
+      <callback name="iter_next">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="cell_get_position"
-              c:identifier="gtk_tree_view_column_cell_get_position">
+      </callback>
+      <callback name="iter_children">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="cell_renderer">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="start_pos">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="width">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="parent">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="queue_resize"
-              c:identifier="gtk_tree_view_column_queue_resize">
+      </callback>
+      <callback name="iter_has_child">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_tree_view"
-              c:identifier="gtk_tree_view_column_get_tree_view">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="visible">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="resizable">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="width">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="spacing">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="sizing">
-        <type name="GtkTreeViewColumnSizing" c:type="GtkTreeViewColumnSizing"/>
-      </property>
-      <property name="fixed-width">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="min-width">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="max-width">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="title">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="expand">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="clickable">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
-      </property>
-      <property name="alignment">
-        <type name="gfloat" c:type="gfloat"/>
-      </property>
-      <property name="reorderable">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="sort-indicator">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="sort-order">
-        <type name="GtkSortType" c:type="GtkSortType"/>
-      </property>
-      <callback name="clicked">
+      </callback>
+      <callback name="iter_n_children">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="clicked">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <record name="GtkCellLayout" c:type="GtkCellLayout"/>
-    <callback name="GtkCellLayoutDataFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="cell_layout">
-          <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
-        </parameter>
-        <parameter name="cell">
-          <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
-        </parameter>
-        <parameter name="tree_model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <interface name="CellLayout"
-               c:type="GtkCellLayout"
-               glib:type-name="GtkCellLayout"
-               glib:get-type="gtk_cell_layout_get_type">
-      <callback name="pack_start">
+      <callback name="iter_nth_child">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="expand">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="parent">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="n">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="pack_end">
+      <callback name="iter_parent">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="expand">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="child">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="clear">
+      <callback name="ref_node">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="add_attribute">
+      <callback name="unref_node">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="attribute">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="tree_model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_cell_data_func">
+      <glib:signal name="row-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkCellLayoutDataFunc" c:type="GtkCellLayoutDataFunc"/>
-          </parameter>
-          <parameter name="func_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="object">
+            <type name="GtkTreePath" c:type="GtkTreePath"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="p0">
+            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="clear_attributes">
+      </glib:signal>
+      <glib:signal name="row-inserted">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+          <parameter name="object">
+            <type name="GtkTreePath" c:type="GtkTreePath"/>
           </parameter>
-          <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+          <parameter name="p0">
+            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="reorder">
+      </glib:signal>
+      <glib:signal name="row-has-child-toggled">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+          <parameter name="object">
+            <type name="GtkTreePath" c:type="GtkTreePath"/>
           </parameter>
-          <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+          <parameter name="p0">
+            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
           </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="row-deleted">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTreePath" c:type="GtkTreePath"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_cells">
+      </glib:signal>
+      <glib:signal name="rows-reordered">
         <return-value>
-          <type name="GList*" c:type="GList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+          <parameter name="object">
+            <type name="GtkTreePath" c:type="GtkTreePath"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </callback>
+      </glib:signal>
     </interface>
-    <function name="cell_layout_pack_start"
-              c:identifier="gtk_cell_layout_pack_start">
+    <function name="tree_model_get_flags"
+              c:identifier="gtk_tree_model_get_flags">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkTreeModelFlags" c:type="GtkTreeModelFlags"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
-        </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </parameter>
-        <parameter name="expand">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_pack_end"
-              c:identifier="gtk_cell_layout_pack_end">
+    <function name="tree_model_get_n_columns"
+              c:identifier="gtk_tree_model_get_n_columns">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+      </parameters>
+    </function>
+    <function name="tree_model_get_column_type"
+              c:identifier="gtk_tree_model_get_column_type">
+      <return-value>
+        <type name="GType" c:type="GType"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="expand">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="index_">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_get_cells"
-              c:identifier="gtk_cell_layout_get_cells">
+    <function name="tree_model_get_iter"
+              c:identifier="gtk_tree_model_get_iter">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_clear" c:identifier="gtk_cell_layout_clear">
+    <function name="tree_model_get_iter_from_string"
+              c:identifier="gtk_tree_model_get_iter_from_string">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="path_string">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_set_attributes"
-              c:identifier="gtk_cell_layout_set_attributes">
+    <function name="tree_model_get_string_from_iter"
+              c:identifier="gtk_tree_model_get_string_from_iter">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_add_attribute"
-              c:identifier="gtk_cell_layout_add_attribute">
+    <function name="tree_model_get_iter_first"
+              c:identifier="gtk_tree_model_get_iter_first">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="attribute">
-          <type name="gchar" c:type="gchar*"/>
+      </parameters>
+    </function>
+    <function name="tree_model_get_path"
+              c:identifier="gtk_tree_model_get_path">
+      <return-value>
+        <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_set_cell_data_func"
-              c:identifier="gtk_cell_layout_set_cell_data_func">
+    <function name="tree_model_get_value"
+              c:identifier="gtk_tree_model_get_value">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
-        </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="func">
-          <type name="GtkCellLayoutDataFunc" c:type="GtkCellLayoutDataFunc"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="func_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+        <parameter name="value">
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_clear_attributes"
-              c:identifier="gtk_cell_layout_clear_attributes">
+    <function name="tree_model_iter_next"
+              c:identifier="gtk_tree_model_iter_next">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_reorder" c:identifier="gtk_cell_layout_reorder">
+    <function name="tree_model_iter_children"
+              c:identifier="gtk_tree_model_iter_children">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="position">
-          <type name="gint" c:type="gint"/>
+        <parameter name="parent" allow-none="1">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_buildable_custom_tag_start"
-              c:identifier="_gtk_cell_layout_buildable_custom_tag_start">
+    <function name="tree_model_iter_has_child"
+              c:identifier="gtk_tree_model_iter_has_child">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="buildable">
-          <type name="Buildable" c:type="GtkBuildable*"/>
-        </parameter>
-        <parameter name="builder">
-          <type name="Builder" c:type="GtkBuilder*"/>
-        </parameter>
-        <parameter name="child">
-          <type name="GLib.Object" c:type="GObject*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="tagname">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="parser">
-          <type name="GMarkupParser" c:type="GMarkupParser*"/>
+      </parameters>
+    </function>
+    <function name="tree_model_iter_n_children"
+              c:identifier="gtk_tree_model_iter_n_children">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer*"/>
+        <parameter name="iter" allow-none="1">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_buildable_custom_tag_end"
-              c:identifier="_gtk_cell_layout_buildable_custom_tag_end">
+    <function name="tree_model_iter_nth_child"
+              c:identifier="gtk_tree_model_iter_nth_child">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="buildable">
-          <type name="Buildable" c:type="GtkBuildable*"/>
-        </parameter>
-        <parameter name="builder">
-          <type name="Builder" c:type="GtkBuilder*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="child">
-          <type name="GLib.Object" c:type="GObject*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="tagname">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="parent" allow-none="1">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer*"/>
+        <parameter name="n">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_buildable_add_child"
-              c:identifier="_gtk_cell_layout_buildable_add_child">
+    <function name="tree_model_iter_parent"
+              c:identifier="gtk_tree_model_iter_parent">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="buildable">
-          <type name="Buildable" c:type="GtkBuildable*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="builder">
-          <type name="Builder" c:type="GtkBuilder*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
         <parameter name="child">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="type">
-          <type name="gchar" c:type="gchar*"/>
+      </parameters>
+    </function>
+    <function name="tree_model_ref_node"
+              c:identifier="gtk_tree_model_ref_node">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="CellRendererText"
-           c:type="GtkCellRendererText"
-           parent="CellRenderer"
-           glib:type-name="GtkCellRendererText"
-           glib:get-type="gtk_cell_renderer_text_get_type">
-      <method name="set_fixed_height_from_font"
-              c:identifier="gtk_cell_renderer_text_set_fixed_height_from_font">
+    <function name="tree_model_unref_node"
+              c:identifier="gtk_tree_model_unref_node">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_model_get" c:identifier="gtk_tree_model_get">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_model_get_valist"
+              c:identifier="gtk_tree_model_get_valist">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="var_args">
+          <type name="va_list" c:type="va_list"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_model_foreach" c:identifier="gtk_tree_model_foreach">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GtkTreeModelForeachFunc"
+                c:type="GtkTreeModelForeachFunc"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_model_row_changed"
+              c:identifier="gtk_tree_model_row_changed">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_model_row_inserted"
+              c:identifier="gtk_tree_model_row_inserted">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_model_row_has_child_toggled"
+              c:identifier="gtk_tree_model_row_has_child_toggled">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_model_row_deleted"
+              c:identifier="gtk_tree_model_row_deleted">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_model_rows_reordered"
+              c:identifier="gtk_tree_model_rows_reordered">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="new_order">
+          <type name="gint" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkTreeSortable" c:type="GtkTreeSortable"/>
+    <callback name="GtkTreeIterCompareFunc">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="model">
+          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="a">
+          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="b">
+          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <interface name="TreeSortable"
+               c:type="GtkTreeSortable"
+               glib:type-name="GtkTreeSortable"
+               glib:get-type="gtk_tree_sortable_get_type">
+      <callback name="sort_column_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="renderer">
-            <type name="CellRendererText" c:type="GtkCellRendererText*"/>
-          </parameter>
-          <parameter name="number_of_rows">
-            <type name="gint" c:type="gint"/>
+          <parameter name="sortable">
+            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="text">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="markup">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="attributes">
-        <type name="PangoAttrList" c:type="PangoAttrList"/>
-      </property>
-      <property name="single-paragraph-mode">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="width-chars">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="wrap-width">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="alignment">
-        <type name="PangoAlignment" c:type="PangoAlignment"/>
-      </property>
-      <property name="background">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="foreground">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="background-gdk">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </property>
-      <property name="foreground-gdk">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </property>
-      <property name="font">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="font-desc">
-        <type name="PangoFontDescription" c:type="PangoFontDescription"/>
-      </property>
-      <property name="family">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="style">
-        <type name="PangoStyle" c:type="PangoStyle"/>
-      </property>
-      <property name="variant">
-        <type name="PangoVariant" c:type="PangoVariant"/>
-      </property>
-      <property name="weight">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="stretch">
-        <type name="PangoStretch" c:type="PangoStretch"/>
-      </property>
-      <property name="size">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="size-points">
-        <type name="gdouble" c:type="gdouble"/>
-      </property>
-      <property name="scale">
-        <type name="gdouble" c:type="gdouble"/>
-      </property>
-      <property name="editable">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="strikethrough">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="underline">
-        <type name="PangoUnderline" c:type="PangoUnderline"/>
-      </property>
-      <property name="rise">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="language">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="ellipsize">
-        <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
-      </property>
-      <property name="wrap-mode">
-        <type name="PangoWrapMode" c:type="PangoWrapMode"/>
-      </property>
-      <property name="background-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="foreground-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="family-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="style-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="variant-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="weight-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="stretch-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="size-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="scale-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="editable-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="strikethrough-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="underline-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="rise-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="language-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="ellipsize-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="align-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <callback name="edited">
+      </callback>
+      <callback name="get_sort_column_id">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="cell_renderer_text">
-            <type name="GtkCellRendererText*" c:type="GtkCellRendererText*"/>
+          <parameter name="sortable">
+            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
           </parameter>
-          <parameter name="path">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="sort_column_id">
+            <type name="gint*" c:type="gint*"/>
           </parameter>
-          <parameter name="new_text">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="order">
+            <type name="GtkSortType*" c:type="GtkSortType*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="edited">
+      <callback name="set_sort_column_id">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gchararray" c:type="gchararray"/>
+          <parameter name="sortable">
+            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="gchararray" c:type="gchararray"/>
+          <parameter name="sort_column_id">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="order">
+            <type name="GtkSortType" c:type="GtkSortType"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <class name="CellRendererAccel"
-           c:type="GtkCellRendererAccel"
-           parent="CellRendererText"
-           glib:type-name="GtkCellRendererAccel"
-           glib:get-type="gtk_cell_renderer_accel_get_type">
-      <property name="accel-key">
-        <type name="guint" c:type="guint"/>
-      </property>
-      <property name="accel-mods">
-        <type name="GdkModifierType" c:type="GdkModifierType"/>
-      </property>
-      <property name="keycode">
-        <type name="guint" c:type="guint"/>
-      </property>
-      <property name="accel-mode">
-        <type name="GtkCellRendererAccelMode"
-                c:type="GtkCellRendererAccelMode"/>
-      </property>
-      <callback name="accel_edited">
+      </callback>
+      <callback name="set_sort_func">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="accel">
-            <type name="GtkCellRendererAccel*" c:type="GtkCellRendererAccel*"/>
-          </parameter>
-          <parameter name="path_string">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-          <parameter name="accel_key">
-            <type name="guint" c:type="guint"/>
+          <parameter name="sortable">
+            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
           </parameter>
-          <parameter name="accel_mods">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
+          <parameter name="sort_column_id">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="hardware_keycode">
-            <type name="guint" c:type="guint"/>
+          <parameter name="func">
+            <type name="GtkTreeIterCompareFunc"
+                  c:type="GtkTreeIterCompareFunc"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="accel_cleared">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accel">
-            <type name="GtkCellRendererAccel*" c:type="GtkCellRendererAccel*"/>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
-          <parameter name="path_string">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="destroy">
+            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved0">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="accel-edited">
+      <callback name="set_default_sort_func">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gchararray" c:type="gchararray"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+          <parameter name="sortable">
+            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
+          <parameter name="func">
+            <type name="GtkTreeIterCompareFunc"
+                  c:type="GtkTreeIterCompareFunc"/>
           </parameter>
-          <parameter name="p2">
-            <type name="guint" c:type="guint"/>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="accel-cleared">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gchararray" c:type="gchararray"/>
+          <parameter name="destroy">
+            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <class name="CellRendererCombo"
-           c:type="GtkCellRendererCombo"
-           parent="CellRendererText"
-           glib:type-name="GtkCellRendererCombo"
-           glib:get-type="gtk_cell_renderer_combo_get_type">
-      <property name="model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
-      </property>
-      <property name="text-column">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="has-entry">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <glib:signal name="changed">
+      </callback>
+      <callback name="has_default_sort_func">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gchararray" c:type="gchararray"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+          <parameter name="sortable">
+            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <class name="CellRendererPixbuf"
-           c:type="GtkCellRendererPixbuf"
-           parent="CellRenderer"
-           glib:type-name="GtkCellRendererPixbuf"
-           glib:get-type="gtk_cell_renderer_pixbuf_get_type">
-      <property name="pixbuf">
-        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
-      </property>
-      <property name="pixbuf-expander-open">
-        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
-      </property>
-      <property name="pixbuf-expander-closed">
-        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
-      </property>
-      <property name="stock-id">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="stock-size">
-        <type name="guint" c:type="guint"/>
-      </property>
-      <property name="stock-detail">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="follow-state">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="icon-name">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <record name="GtkCellRendererProgressPrivate"
-              c:type="GtkCellRendererProgressPrivate"/>
-    <class name="CellRendererProgress"
-           c:type="GtkCellRendererProgress"
-           parent="CellRenderer"
-           glib:type-name="GtkCellRendererProgress"
-           glib:get-type="gtk_cell_renderer_progress_get_type">
-      <property name="value">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="text">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="pulse">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="text-xalign">
-        <type name="gfloat" c:type="gfloat"/>
-      </property>
-      <property name="text-yalign">
-        <type name="gfloat" c:type="gfloat"/>
-      </property>
-      <property name="orientation">
-        <type name="GtkProgressBarOrientation"
-                c:type="GtkProgressBarOrientation"/>
-      </property>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+      <glib:signal name="sort-column-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+      </glib:signal>
+    </interface>
+    <function name="tree_sortable_sort_column_changed"
+              c:identifier="gtk_tree_sortable_sort_column_changed">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="sortable">
+          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_sortable_get_sort_column_id"
+              c:identifier="gtk_tree_sortable_get_sort_column_id">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="sortable">
+          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+        </parameter>
+        <parameter name="sort_column_id">
+          <type name="gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="order">
+          <type name="SortType" c:type="GtkSortType*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_sortable_set_sort_column_id"
+              c:identifier="gtk_tree_sortable_set_sort_column_id">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="sortable">
+          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+        </parameter>
+        <parameter name="sort_column_id">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="order">
+          <type name="SortType" c:type="GtkSortType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_sortable_set_sort_func"
+              c:identifier="gtk_tree_sortable_set_sort_func">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="sortable">
+          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+        </parameter>
+        <parameter name="sort_column_id">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="sort_func">
+          <type name="GtkTreeIterCompareFunc" c:type="GtkTreeIterCompareFunc"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_sortable_set_default_sort_func"
+              c:identifier="gtk_tree_sortable_set_default_sort_func">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="sortable">
+          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+        </parameter>
+        <parameter name="sort_func">
+          <type name="GtkTreeIterCompareFunc" c:type="GtkTreeIterCompareFunc"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_sortable_has_default_sort_func"
+              c:identifier="gtk_tree_sortable_has_default_sort_func">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="sortable">
+          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <callback name="GtkTreeCellDataFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_column">
+          <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+        </parameter>
+        <parameter name="cell">
+          <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+        </parameter>
+        <parameter name="tree_model">
+          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="TreeViewColumn"
+           c:type="GtkTreeViewColumn"
+           parent="GtkObject"
+           glib:type-name="GtkTreeViewColumn"
+           glib:get-type="gtk_tree_view_column_get_type">
+      <constructor name="new" c:identifier="gtk_tree_view_column_new">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </return-value>
-      </callback>
-    </class>
-    <record name="GtkCellRendererSpinPrivate"
-              c:type="GtkCellRendererSpinPrivate"/>
-    <class name="CellRendererSpin"
-           c:type="GtkCellRendererSpin"
-           parent="CellRendererText"
-           glib:type-name="GtkCellRendererSpin"
-           glib:get-type="gtk_cell_renderer_spin_get_type">
-      <property name="adjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="climb-rate">
-        <type name="gdouble" c:type="gdouble"/>
-      </property>
-      <property name="digits">
-        <type name="guint" c:type="guint"/>
-      </property>
-    </class>
-    <class name="CellRendererToggle"
-           c:type="GtkCellRendererToggle"
-           parent="CellRenderer"
-           glib:type-name="GtkCellRendererToggle"
-           glib:get-type="gtk_cell_renderer_toggle_get_type">
-      <method name="get_radio"
-              c:identifier="gtk_cell_renderer_toggle_get_radio">
+      </constructor>
+      <constructor name="new_with_attributes"
+                   c:identifier="gtk_tree_view_column_new_with_attributes">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </return-value>
         <parameters>
-          <parameter name="toggle">
-            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_radio"
-              c:identifier="gtk_cell_renderer_toggle_set_radio">
+      </constructor>
+      <method name="pack_start" c:identifier="gtk_tree_view_column_pack_start">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toggle">
-            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="radio">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_active"
-              c:identifier="gtk_cell_renderer_toggle_get_active">
+      <method name="pack_end" c:identifier="gtk_tree_view_column_pack_end">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toggle">
-            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_active"
-              c:identifier="gtk_cell_renderer_toggle_set_active">
+      <method name="clear" c:identifier="gtk_tree_view_column_clear">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toggle">
-            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="activatable">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="active">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="radio">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="inconsistent">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="indicator-size">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <callback name="toggled">
+      <method name="get_cell_renderers"
+              c:identifier="gtk_tree_view_column_get_cell_renderers">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GList" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="cell_renderer_toggle">
-            <type name="GtkCellRendererToggle*"
-                    c:type="GtkCellRendererToggle*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </method>
+      <method name="add_attribute"
+              c:identifier="gtk_tree_view_column_add_attribute">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="cell_renderer">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="attribute">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_attributes"
+              c:identifier="gtk_tree_view_column_set_attributes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="cell_renderer">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_cell_data_func"
+              c:identifier="gtk_tree_view_column_set_cell_data_func">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="cell_renderer">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="GtkTreeCellDataFunc" c:type="GtkTreeCellDataFunc"/>
+          </parameter>
+          <parameter name="func_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="clear_attributes"
+              c:identifier="gtk_tree_view_column_clear_attributes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <glib:signal name="toggled">
+        <parameters>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="cell_renderer">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_spacing"
+              c:identifier="gtk_tree_view_column_set_spacing">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gchararray" c:type="gchararray"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="spacing">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <record name="GtkCellViewPrivate" c:type="GtkCellViewPrivate"/>
-    <class name="CellView"
-           c:type="GtkCellView"
-           parent="Widget"
-           glib:type-name="GtkCellView"
-           glib:get-type="gtk_cell_view_get_type">
-      <method name="set_model" c:identifier="gtk_cell_view_set_model">
+      </method>
+      <method name="get_spacing"
+              c:identifier="gtk_tree_view_column_get_spacing">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="cell_view">
-            <type name="CellView" c:type="GtkCellView*"/>
-          </parameter>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_displayed_row"
-              c:identifier="gtk_cell_view_set_displayed_row">
+      <method name="set_visible"
+              c:identifier="gtk_tree_view_column_set_visible">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_view">
-            <type name="CellView" c:type="GtkCellView*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="visible">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_displayed_row"
-              c:identifier="gtk_cell_view_get_displayed_row">
+      <method name="get_visible"
+              c:identifier="gtk_tree_view_column_get_visible">
         <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="cell_view">
-            <type name="CellView" c:type="GtkCellView*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size_of_row"
-              c:identifier="gtk_cell_view_get_size_of_row">
+      <method name="set_resizable"
+              c:identifier="gtk_tree_view_column_set_resizable">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_view">
-            <type name="CellView" c:type="GtkCellView*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="resizable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="requisition">
-            <type name="Requisition" c:type="GtkRequisition*"/>
+        </parameters>
+      </method>
+      <method name="get_resizable"
+              c:identifier="gtk_tree_view_column_get_resizable">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_background_color"
-              c:identifier="gtk_cell_view_set_background_color">
+      <method name="set_sizing" c:identifier="gtk_tree_view_column_set_sizing">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_view">
-            <type name="CellView" c:type="GtkCellView*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+          <parameter name="type">
+            <type name="TreeViewColumnSizing"
+                  c:type="GtkTreeViewColumnSizing"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_cell_renderers"
-              c:identifier="gtk_cell_view_get_cell_renderers">
+      <method name="get_sizing" c:identifier="gtk_tree_view_column_get_sizing">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="TreeViewColumnSizing" c:type="GtkTreeViewColumnSizing"/>
         </return-value>
         <parameters>
-          <parameter name="cell_view">
-            <type name="CellView" c:type="GtkCellView*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="background">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="background-gdk">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </property>
-      <property name="background-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
-      </property>
-    </class>
-    <function name="cell_view_new" c:identifier="gtk_cell_view_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="cell_view_new_with_text"
-              c:identifier="gtk_cell_view_new_with_text">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="cell_view_new_with_markup"
-              c:identifier="gtk_cell_view_new_with_markup">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="markup">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="cell_view_new_with_pixbuf"
-              c:identifier="gtk_cell_view_new_with_pixbuf">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="pixbuf">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="ToggleButton"
-           c:type="GtkToggleButton"
-           parent="Button"
-           glib:type-name="GtkToggleButton"
-           glib:get-type="gtk_toggle_button_get_type">
-      <method name="set_mode" c:identifier="gtk_toggle_button_set_mode">
+      <method name="get_width" c:identifier="gtk_tree_view_column_get_width">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="ToggleButton" c:type="GtkToggleButton*"/>
-          </parameter>
-          <parameter name="draw_indicator">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_mode" c:identifier="gtk_toggle_button_get_mode">
+      <method name="get_fixed_width"
+              c:identifier="gtk_tree_view_column_get_fixed_width">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_active" c:identifier="gtk_toggle_button_set_active">
+      <method name="set_fixed_width"
+              c:identifier="gtk_tree_view_column_set_fixed_width">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="is_active">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="fixed_width">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_active" c:identifier="gtk_toggle_button_get_active">
+      <method name="set_min_width"
+              c:identifier="gtk_tree_view_column_set_min_width">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="min_width">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="toggled" c:identifier="gtk_toggle_button_toggled">
+      <method name="get_min_width"
+              c:identifier="gtk_tree_view_column_get_min_width">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_inconsistent"
-              c:identifier="gtk_toggle_button_set_inconsistent">
+      <method name="set_max_width"
+              c:identifier="gtk_tree_view_column_set_max_width">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="max_width">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_inconsistent"
-              c:identifier="gtk_toggle_button_get_inconsistent">
+      <method name="get_max_width"
+              c:identifier="gtk_tree_view_column_get_max_width">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="active">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="inconsistent">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="draw-indicator">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <callback name="toggled">
+      <method name="clicked" c:identifier="gtk_tree_view_column_clicked">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="GtkToggleButton*" c:type="GtkToggleButton*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+      </method>
+      <method name="set_title" c:identifier="gtk_tree_view_column_set_title">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_title" c:identifier="gtk_tree_view_column_get_title">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_expand" c:identifier="gtk_tree_view_column_set_expand">
         <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="toggled">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="toggle_button_new" c:identifier="gtk_toggle_button_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="toggle_button_new_with_label"
-              c:identifier="gtk_toggle_button_new_with_label">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="toggle_button_new_with_mnemonic"
-              c:identifier="gtk_toggle_button_new_with_mnemonic">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="CheckButton"
-           c:type="GtkCheckButton"
-           parent="ToggleButton"
-           glib:type-name="GtkCheckButton"
-           glib:get-type="gtk_check_button_get_type">
-      <callback name="draw_indicator">
-        <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="check_button">
-            <type name="GtkCheckButton*" c:type="GtkCheckButton*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <function name="check_button_new" c:identifier="gtk_check_button_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="check_button_new_with_label"
-              c:identifier="gtk_check_button_new_with_label">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="check_button_new_with_mnemonic"
-              c:identifier="gtk_check_button_new_with_mnemonic">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="check_button_get_props"
-              c:identifier="_gtk_check_button_get_props">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="check_button">
-          <type name="CheckButton" c:type="GtkCheckButton*"/>
-        </parameter>
-        <parameter name="indicator_size">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="indicator_spacing">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Item"
-           c:type="GtkItem"
-           parent="Bin"
-           glib:type-name="GtkItem"
-           glib:get-type="gtk_item_get_type">
-      <method name="select" c:identifier="gtk_item_select">
+      </method>
+      <method name="get_expand" c:identifier="gtk_tree_view_column_get_expand">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="item">
-            <type name="Item" c:type="GtkItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="deselect" c:identifier="gtk_item_deselect">
+      <method name="set_clickable"
+              c:identifier="gtk_tree_view_column_set_clickable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="item">
-            <type name="Item" c:type="GtkItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="clickable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="toggle" c:identifier="gtk_item_toggle">
+      <method name="get_clickable"
+              c:identifier="gtk_tree_view_column_get_clickable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="item">
-            <type name="Item" c:type="GtkItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="select">
+      <method name="set_widget" c:identifier="gtk_tree_view_column_set_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="item">
-            <type name="GtkItem*" c:type="GtkItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="widget" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="deselect">
+      </method>
+      <method name="get_widget" c:identifier="gtk_tree_view_column_get_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="item">
-            <type name="GtkItem*" c:type="GtkItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="toggle">
+      </method>
+      <method name="set_alignment"
+              c:identifier="gtk_tree_view_column_set_alignment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="item">
-            <type name="GtkItem*" c:type="GtkItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="xalign">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="select">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="deselect">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="toggle">
+      </method>
+      <method name="get_alignment"
+              c:identifier="gtk_tree_view_column_get_alignment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="float" c:type="gfloat"/>
         </return-value>
-      </glib:signal>
-    </class>
-    <class name="MenuItem"
-           c:type="GtkMenuItem"
-           parent="Item"
-           glib:type-name="GtkMenuItem"
-           glib:get-type="gtk_menu_item_get_type">
-      <method name="set_submenu" c:identifier="gtk_menu_item_set_submenu">
+        <parameters>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_reorderable"
+              c:identifier="gtk_tree_view_column_set_reorderable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="submenu">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="reorderable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_submenu" c:identifier="gtk_menu_item_get_submenu">
+      <method name="get_reorderable"
+              c:identifier="gtk_tree_view_column_get_reorderable">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select" c:identifier="gtk_menu_item_select">
+      <method name="set_sort_column_id"
+              c:identifier="gtk_tree_view_column_set_sort_column_id">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="sort_column_id">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="deselect" c:identifier="gtk_menu_item_deselect">
+      <method name="get_sort_column_id"
+              c:identifier="gtk_tree_view_column_get_sort_column_id">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="activate" c:identifier="gtk_menu_item_activate">
+      <method name="set_sort_indicator"
+              c:identifier="gtk_tree_view_column_set_sort_indicator">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="toggle_size_request"
-              c:identifier="gtk_menu_item_toggle_size_request">
+      <method name="get_sort_indicator"
+              c:identifier="gtk_tree_view_column_get_sort_indicator">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-          <parameter name="requisition">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="toggle_size_allocate"
-              c:identifier="gtk_menu_item_toggle_size_allocate">
+      <method name="set_sort_order"
+              c:identifier="gtk_tree_view_column_set_sort_order">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="allocation">
-            <type name="gint" c:type="gint"/>
+          <parameter name="order">
+            <type name="SortType" c:type="GtkSortType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_right_justified"
-              c:identifier="gtk_menu_item_set_right_justified">
+      <method name="get_sort_order"
+              c:identifier="gtk_tree_view_column_get_sort_order">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="SortType" c:type="GtkSortType"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-          <parameter name="right_justified">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_right_justified"
-              c:identifier="gtk_menu_item_get_right_justified">
+      <method name="cell_set_cell_data"
+              c:identifier="gtk_tree_view_column_cell_set_cell_data">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="tree_model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="is_expander">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="is_expanded">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_accel_path" c:identifier="gtk_menu_item_set_accel_path">
+      <method name="cell_get_size"
+              c:identifier="gtk_tree_view_column_cell_get_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="accel_path">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="cell_area">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="x_offset">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="y_offset">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="height">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_submenu" c:identifier="gtk_menu_item_remove_submenu">
+      <method name="cell_is_visible"
+              c:identifier="gtk_tree_view_column_cell_is_visible">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="submenu">
-        <type name="GtkMenu" c:type="GtkMenu"/>
-      </property>
-      <field name="hide_on_activate">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <callback name="activate">
+      <method name="focus_cell" c:identifier="gtk_tree_view_column_focus_cell">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="GtkMenuItem*" c:type="GtkMenuItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="activate_item">
+      </method>
+      <method name="cell_get_position"
+              c:identifier="gtk_tree_view_column_cell_get_position">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="GtkMenuItem*" c:type="GtkMenuItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="cell_renderer">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="start_pos">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="toggle_size_request">
+      </method>
+      <method name="queue_resize"
+              c:identifier="gtk_tree_view_column_queue_resize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="GtkMenuItem*" c:type="GtkMenuItem*"/>
-          </parameter>
-          <parameter name="requisition">
-            <type name="gint*" c:type="gint*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="toggle_size_allocate">
+      </method>
+      <method name="get_tree_view"
+              c:identifier="gtk_tree_view_column_get_tree_view">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="GtkMenuItem*" c:type="GtkMenuItem*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="allocation">
-            <type name="gint" c:type="gint"/>
+        </parameters>
+      </method>
+      <property name="visible">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="resizable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="width">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="spacing">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="sizing">
+        <type name="GtkTreeViewColumnSizing" c:type="GtkTreeViewColumnSizing"/>
+      </property>
+      <property name="fixed-width">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="min-width">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="max-width">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="title">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="expand">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="clickable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="widget">
+        <type name="GtkWidget" c:type="GtkWidget"/>
+      </property>
+      <property name="alignment">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="reorderable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="sort-indicator">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="sort-order">
+        <type name="GtkSortType" c:type="GtkSortType"/>
+      </property>
+      <callback name="clicked">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_column">
+            <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="activate">
+      <glib:signal name="clicked">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="activate-item">
+    </class>
+    <record name="GtkCellLayout" c:type="GtkCellLayout"/>
+    <callback name="GtkCellLayoutDataFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="cell_layout">
+          <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+        </parameter>
+        <parameter name="cell">
+          <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+        </parameter>
+        <parameter name="tree_model">
+          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <interface name="CellLayout"
+               c:type="GtkCellLayout"
+               glib:type-name="GtkCellLayout"
+               glib:get-type="gtk_cell_layout_get_type">
+      <callback name="pack_start">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="toggle-size-request">
+        <parameters>
+          <parameter name="cell_layout">
+            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+          </parameter>
+          <parameter name="cell">
+            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="pack_end">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="cell_layout">
+            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+          </parameter>
+          <parameter name="cell">
+            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="toggle-size-allocate">
+      </callback>
+      <callback name="clear">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gint" c:type="gint"/>
+          <parameter name="cell_layout">
+            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="menu_item_new" c:identifier="gtk_menu_item_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="menu_item_new_with_label"
-              c:identifier="gtk_menu_item_new_with_label">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="menu_item_new_with_mnemonic"
-              c:identifier="gtk_menu_item_new_with_mnemonic">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="menu_item_refresh_accel_path"
-              c:identifier="_gtk_menu_item_refresh_accel_path">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="menu_item">
-          <type name="MenuItem" c:type="GtkMenuItem*"/>
-        </parameter>
-        <parameter name="prefix">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="accel_group">
-          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
-        </parameter>
-        <parameter name="group_changed">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="menu_item_is_selectable"
-              c:identifier="_gtk_menu_item_is_selectable">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="menu_item">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="menu_item_popup_submenu"
-              c:identifier="_gtk_menu_item_popup_submenu">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="menu_item">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="with_delay">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="menu_item_popdown_submenu"
-              c:identifier="_gtk_menu_item_popdown_submenu">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="menu_item">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="CheckMenuItem"
-           c:type="GtkCheckMenuItem"
-           parent="MenuItem"
-           glib:type-name="GtkCheckMenuItem"
-           glib:get-type="gtk_check_menu_item_get_type">
-      <method name="set_active" c:identifier="gtk_check_menu_item_set_active">
+      </callback>
+      <callback name="add_attribute">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          <parameter name="cell_layout">
+            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
           </parameter>
-          <parameter name="is_active">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="cell">
+            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_active" c:identifier="gtk_check_menu_item_get_active">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          <parameter name="attribute">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="toggled" c:identifier="gtk_check_menu_item_toggled">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_inconsistent"
-              c:identifier="gtk_check_menu_item_set_inconsistent">
+      </callback>
+      <callback name="set_cell_data_func">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          <parameter name="cell_layout">
+            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="cell">
+            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_inconsistent"
-              c:identifier="gtk_check_menu_item_get_inconsistent">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          <parameter name="func">
+            <type name="GtkCellLayoutDataFunc" c:type="GtkCellLayoutDataFunc"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="set_draw_as_radio"
-              c:identifier="gtk_check_menu_item_set_draw_as_radio">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          <parameter name="func_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
-          <parameter name="draw_as_radio">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="destroy">
+            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_draw_as_radio"
-              c:identifier="gtk_check_menu_item_get_draw_as_radio">
+      </callback>
+      <callback name="clear_attributes">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          <parameter name="cell_layout">
+            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+          </parameter>
+          <parameter name="cell">
+            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_show_toggle"
-              c:identifier="gtk_check_menu_item_set_show_toggle">
+      </callback>
+      <callback name="reorder">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          <parameter name="cell_layout">
+            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
           </parameter>
-          <parameter name="always">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="cell">
+            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
           </parameter>
-        </parameters>
-      </method>
-      <property name="active">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="inconsistent">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="draw-as-radio">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <callback name="toggled">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="check_menu_item">
-            <type name="GtkCheckMenuItem*" c:type="GtkCheckMenuItem*"/>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_indicator">
+      <callback name="get_cells">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GList*" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="check_menu_item">
-            <type name="GtkCheckMenuItem*" c:type="GtkCheckMenuItem*"/>
-          </parameter>
-          <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+          <parameter name="cell_layout">
+            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="toggled">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="check_menu_item_new" c:identifier="gtk_check_menu_item_new">
+    </interface>
+    <function name="cell_layout_pack_start"
+              c:identifier="gtk_cell_layout_pack_start">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        </parameter>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </parameter>
+        <parameter name="expand">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="check_menu_item_new_with_label"
-              c:identifier="gtk_check_menu_item_new_with_label">
+    <function name="cell_layout_pack_end"
+              c:identifier="gtk_cell_layout_pack_end">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        </parameter>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </parameter>
+        <parameter name="expand">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="check_menu_item_new_with_mnemonic"
-              c:identifier="gtk_check_menu_item_new_with_mnemonic">
+    <function name="cell_layout_get_cells"
+              c:identifier="gtk_cell_layout_get_cells">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="GList*" c:type="GList*"/>
       </return-value>
       <parameters>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="TextTag"
-           c:type="GtkTextTag"
-           parent="GLib.Object"
-           glib:type-name="GtkTextTag"
-           glib:get-type="gtk_text_tag_get_type">
-      <constructor name="new" c:identifier="gtk_text_tag_new">
-        <return-value>
-          <type name="TextTag" c:type="GtkTextTag*"/>
-        </return-value>
-        <parameters>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="table_lookup" c:identifier="gtk_text_tag_table_lookup">
-        <return-value>
-          <type name="TextTag" c:type="GtkTextTag*"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="get_priority" c:identifier="gtk_text_tag_get_priority">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_priority" c:identifier="gtk_text_tag_set_priority">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
-          </parameter>
-          <parameter name="priority">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="event" c:identifier="gtk_text_tag_event">
+    <function name="cell_layout_clear" c:identifier="gtk_cell_layout_clear">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="cell_layout_set_attributes"
+              c:identifier="gtk_cell_layout_set_attributes">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        </parameter>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="cell_layout_add_attribute"
+              c:identifier="gtk_cell_layout_add_attribute">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        </parameter>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </parameter>
+        <parameter name="attribute">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="cell_layout_set_cell_data_func"
+              c:identifier="gtk_cell_layout_set_cell_data_func">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        </parameter>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GtkCellLayoutDataFunc" c:type="GtkCellLayoutDataFunc"/>
+        </parameter>
+        <parameter name="func_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="cell_layout_clear_attributes"
+              c:identifier="gtk_cell_layout_clear_attributes">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        </parameter>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="cell_layout_reorder"
+              c:identifier="gtk_cell_layout_reorder">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        </parameter>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </parameter>
+        <parameter name="position">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="cell_layout_buildable_custom_tag_start"
+              c:identifier="_gtk_cell_layout_buildable_custom_tag_start">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="buildable">
+          <type name="Buildable" c:type="GtkBuildable*"/>
+        </parameter>
+        <parameter name="builder">
+          <type name="Builder" c:type="GtkBuilder*"/>
+        </parameter>
+        <parameter name="child">
+          <type name="GLib.Object" c:type="GObject*"/>
+        </parameter>
+        <parameter name="tagname">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="parser">
+          <type name="GMarkupParser" c:type="GMarkupParser*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="gpointer" c:type="gpointer*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="cell_layout_buildable_custom_tag_end"
+              c:identifier="_gtk_cell_layout_buildable_custom_tag_end">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="buildable">
+          <type name="Buildable" c:type="GtkBuildable*"/>
+        </parameter>
+        <parameter name="builder">
+          <type name="Builder" c:type="GtkBuilder*"/>
+        </parameter>
+        <parameter name="child">
+          <type name="GLib.Object" c:type="GObject*"/>
+        </parameter>
+        <parameter name="tagname">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="gpointer" c:type="gpointer*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="cell_layout_buildable_add_child"
+              c:identifier="_gtk_cell_layout_buildable_add_child">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="buildable">
+          <type name="Buildable" c:type="GtkBuildable*"/>
+        </parameter>
+        <parameter name="builder">
+          <type name="Builder" c:type="GtkBuilder*"/>
+        </parameter>
+        <parameter name="child">
+          <type name="GLib.Object" c:type="GObject*"/>
+        </parameter>
+        <parameter name="type">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="CellRendererText"
+           c:type="GtkCellRendererText"
+           parent="CellRenderer"
+           glib:type-name="GtkCellRendererText"
+           glib:get-type="gtk_cell_renderer_text_get_type">
+      <method name="set_fixed_height_from_font"
+              c:identifier="gtk_cell_renderer_text_set_fixed_height_from_font">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
-          </parameter>
-          <parameter name="event_object">
-            <type name="GLib.Object" c:type="GObject*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="GdkEvent" c:type="GdkEvent*"/>
+          <parameter name="renderer">
+            <type name="CellRendererText" c:type="GtkCellRendererText*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="GtkTextIter" c:type="GtkTextIter*"/>
+          <parameter name="number_of_rows">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <property name="name">
-        <type name="gchararray" c:type="gchararray"/>
+      <property name="text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="markup">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="attributes">
+        <type name="PangoAttrList" c:type="PangoAttrList"/>
+      </property>
+      <property name="single-paragraph-mode">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="width-chars">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="wrap-width">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="alignment">
+        <type name="PangoAlignment" c:type="PangoAlignment"/>
       </property>
       <property name="background">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="foreground">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="background-gdk">
         <type name="GdkColor" c:type="GdkColor"/>
@@ -25379,20 +25393,14 @@
       <property name="foreground-gdk">
         <type name="GdkColor" c:type="GdkColor"/>
       </property>
-      <property name="background-stipple">
-        <type name="GdkPixmap" c:type="GdkPixmap"/>
-      </property>
-      <property name="foreground-stipple">
-        <type name="GdkPixmap" c:type="GdkPixmap"/>
-      </property>
       <property name="font">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="font-desc">
         <type name="PangoFontDescription" c:type="PangoFontDescription"/>
       </property>
       <property name="family">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="style">
         <type name="PangoStyle" c:type="PangoStyle"/>
@@ -25401,15670 +25409,7483 @@
         <type name="PangoVariant" c:type="PangoVariant"/>
       </property>
       <property name="weight">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="stretch">
         <type name="PangoStretch" c:type="PangoStretch"/>
       </property>
       <property name="size">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="size-points">
-        <type name="gdouble" c:type="gdouble"/>
+        <type name="double" c:type="gdouble"/>
       </property>
       <property name="scale">
-        <type name="gdouble" c:type="gdouble"/>
-      </property>
-      <property name="pixels-above-lines">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="pixels-below-lines">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="pixels-inside-wrap">
-        <type name="gint" c:type="gint"/>
+        <type name="double" c:type="gdouble"/>
       </property>
       <property name="editable">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="wrap-mode">
-        <type name="GtkWrapMode" c:type="GtkWrapMode"/>
-      </property>
-      <property name="justification">
-        <type name="GtkJustification" c:type="GtkJustification"/>
-      </property>
-      <property name="direction">
-        <type name="GtkTextDirection" c:type="GtkTextDirection"/>
-      </property>
-      <property name="left-margin">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="indent">
-        <type name="gint" c:type="gint"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="strikethrough">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="right-margin">
-        <type name="gint" c:type="gint"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="underline">
         <type name="PangoUnderline" c:type="PangoUnderline"/>
       </property>
       <property name="rise">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="background-full-height">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="int32" c:type="gint"/>
       </property>
       <property name="language">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="tabs">
-        <type name="PangoTabArray" c:type="PangoTabArray"/>
-      </property>
-      <property name="invisible">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="paragraph-background">
-        <type name="gchararray" c:type="gchararray"/>
+        <type name="string" c:type="gchararray"/>
       </property>
-      <property name="paragraph-background-gdk">
-        <type name="GdkColor" c:type="GdkColor"/>
+      <property name="ellipsize">
+        <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
       </property>
-      <property name="accumulative-margin">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="wrap-mode">
+        <type name="PangoWrapMode" c:type="PangoWrapMode"/>
       </property>
       <property name="background-set">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="foreground-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="background-stipple-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="foreground-stipple-set">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="family-set">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="style-set">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="variant-set">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="weight-set">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="stretch-set">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="size-set">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="scale-set">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="pixels-above-lines-set">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="editable-set">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="pixels-below-lines-set">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="strikethrough-set">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="pixels-inside-wrap-set">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="underline-set">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="editable-set">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="rise-set">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="wrap-mode-set">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="language-set">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="justification-set">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="ellipsize-set">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="left-margin-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="indent-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="strikethrough-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="right-margin-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="underline-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="rise-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="background-full-height-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="language-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="tabs-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="invisible-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="paragraph-background-set">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="align-set">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="event">
+      <callback name="edited">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tag">
-            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
-          </parameter>
-          <parameter name="event_object">
-            <type name="GObject*" c:type="GObject*"/>
+          <parameter name="cell_renderer_text">
+            <type name="GtkCellRendererText*" c:type="GtkCellRendererText*"/>
           </parameter>
-          <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          <parameter name="new_text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="event">
+      <glib:signal name="edited">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GObject" c:type="GObject"/>
+            <type name="string" c:type="gchararray"/>
           </parameter>
           <parameter name="p0">
-            <type name="GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
       </glib:signal>
     </class>
-    <record name="GtkTextAppearance" c:type="GtkTextAppearance">
-      <field name="bg_color">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </field>
-      <field name="fg_color">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </field>
-      <field name="bg_stipple">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
-      </field>
-      <field name="fg_stipple">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
-      </field>
-      <field name="rise">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="padding1">
-        <type name="gpointer" c:type="gpointer"/>
-      </field>
-      <field name="underline">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="strikethrough">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="draw_bg">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="inside_selection">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="is_text">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="pad1">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="pad2">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="pad3">
+    <class name="CellRendererAccel"
+           c:type="GtkCellRendererAccel"
+           parent="CellRendererText"
+           glib:type-name="GtkCellRendererAccel"
+           glib:get-type="gtk_cell_renderer_accel_get_type">
+      <property name="accel-key">
         <type name="guint" c:type="guint"/>
-      </field>
-      <field name="pad4">
+      </property>
+      <property name="accel-mods">
+        <type name="GdkModifierType" c:type="GdkModifierType"/>
+      </property>
+      <property name="keycode">
         <type name="guint" c:type="guint"/>
-      </field>
-    </record>
-    <function name="text_attributes_new" c:identifier="gtk_text_attributes_new">
-      <return-value>
-        <type name="GtkTextAttributes*" c:type="GtkTextAttributes*"/>
-      </return-value>
-    </function>
-    <function name="text_attributes_copy"
-              c:identifier="gtk_text_attributes_copy">
-      <return-value>
-        <type name="GtkTextAttributes*" c:type="GtkTextAttributes*"/>
-      </return-value>
-      <parameters>
-        <parameter name="src">
-          <type name="GtkTextAttributes" c:type="GtkTextAttributes*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_attributes_copy_values"
-              c:identifier="gtk_text_attributes_copy_values">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="src">
-          <type name="GtkTextAttributes" c:type="GtkTextAttributes*"/>
-        </parameter>
-        <parameter name="dest">
-          <type name="GtkTextAttributes" c:type="GtkTextAttributes*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_attributes_unref"
-              c:identifier="gtk_text_attributes_unref">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="values">
-          <type name="GtkTextAttributes" c:type="GtkTextAttributes*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_attributes_ref" c:identifier="gtk_text_attributes_ref">
-      <return-value>
-        <type name="GtkTextAttributes*" c:type="GtkTextAttributes*"/>
-      </return-value>
-      <parameters>
-        <parameter name="values">
-          <type name="GtkTextAttributes" c:type="GtkTextAttributes*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <glib:boxed c:type="TextAttributes"
-                glib:name="TextAttributes"
-                glib:type-name="GtkTextAttributes"
-                glib:get-type="gtk_text_attributes_get_type">
-    </glib:boxed>
-    <class name="TextChildAnchor"
-           c:type="GtkTextChildAnchor"
-           parent="GLib.Object"
-           glib:type-name="GtkTextChildAnchor"
-           glib:get-type="gtk_text_child_anchor_get_type">
-      <constructor name="new" c:identifier="gtk_text_child_anchor_new">
-        <return-value>
-          <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
-        </return-value>
-      </constructor>
-      <method name="get_widgets"
-              c:identifier="gtk_text_child_anchor_get_widgets">
+      </property>
+      <property name="accel-mode">
+        <type name="GtkCellRendererAccelMode"
+              c:type="GtkCellRendererAccelMode"/>
+      </property>
+      <callback name="accel_edited">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <parameter name="accel">
+            <type name="GtkCellRendererAccel*" c:type="GtkCellRendererAccel*"/>
+          </parameter>
+          <parameter name="path_string">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="accel_key">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="accel_mods">
+            <type name="GdkModifierType" c:type="GdkModifierType"/>
+          </parameter>
+          <parameter name="hardware_keycode">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_deleted"
-              c:identifier="gtk_text_child_anchor_get_deleted">
+      </callback>
+      <callback name="accel_cleared">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <parameter name="accel">
+            <type name="GtkCellRendererAccel*" c:type="GtkCellRendererAccel*"/>
+          </parameter>
+          <parameter name="path_string">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="register_child"
-              c:identifier="gtk_text_child_anchor_register_child">
+      </callback>
+      <callback name="_gtk_reserved0">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="accel-edited">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="p0">
+            <type name="guint" c:type="guint"/>
           </parameter>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="p1">
+            <type name="GdkModifierType" c:type="GdkModifierType"/>
+          </parameter>
+          <parameter name="p2">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="unregister_child"
-              c:identifier="gtk_text_child_anchor_unregister_child">
+      </glib:signal>
+      <glib:signal name="accel-cleared">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="queue_resize"
-              c:identifier="gtk_text_child_anchor_queue_resize">
+      </glib:signal>
+    </class>
+    <class name="CellRendererCombo"
+           c:type="GtkCellRendererCombo"
+           parent="CellRendererText"
+           glib:type-name="GtkCellRendererCombo"
+           glib:get-type="gtk_cell_renderer_combo_get_type">
+      <property name="model">
+        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+      </property>
+      <property name="text-column">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="has-entry">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+    </class>
+    <class name="CellRendererPixbuf"
+           c:type="GtkCellRendererPixbuf"
+           parent="CellRenderer"
+           glib:type-name="GtkCellRendererPixbuf"
+           glib:get-type="gtk_cell_renderer_pixbuf_get_type">
+      <property name="pixbuf">
+        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
+      </property>
+      <property name="pixbuf-expander-open">
+        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
+      </property>
+      <property name="pixbuf-expander-closed">
+        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
+      </property>
+      <property name="stock-id">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="stock-size">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <property name="stock-detail">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="follow-state">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="icon-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
-          </parameter>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-        </parameters>
-      </method>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="GtkCellRendererProgressPrivate"
+            c:type="GtkCellRendererProgressPrivate"/>
+    <class name="CellRendererProgress"
+           c:type="GtkCellRendererProgress"
+           parent="CellRenderer"
+           glib:type-name="GtkCellRendererProgress"
+           glib:get-type="gtk_cell_renderer_progress_get_type">
+      <property name="value">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="pulse">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="text-xalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="text-yalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="orientation">
+        <type name="GtkProgressBarOrientation"
+              c:type="GtkProgressBarOrientation"/>
+      </property>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
-    <function name="text_iter_get_buffer"
-              c:identifier="gtk_text_iter_get_buffer">
-      <return-value>
-        <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
-      </return-value>
-      <parameters>
-        <parameter name="iter">
-          <type name="GtkTextIter" c:type="GtkTextIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_iter_copy" c:identifier="gtk_text_iter_copy">
-      <return-value>
-        <type name="GtkTextIter*" c:type="GtkTextIter*"/>
-      </return-value>
-      <parameters>
-        <parameter name="iter">
-          <type name="GtkTextIter" c:type="GtkTextIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_iter_free" c:identifier="gtk_text_iter_free">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="iter">
-          <type name="GtkTextIter" c:type="GtkTextIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <glib:boxed c:type="TextIter"
-                glib:name="TextIter"
-                glib:type-name="GtkTextIter"
-                glib:get-type="gtk_text_iter_get_type">
-      <method name="get_offset" c:identifier="gtk_text_iter_get_offset">
+    <record name="GtkCellRendererSpinPrivate"
+            c:type="GtkCellRendererSpinPrivate"/>
+    <class name="CellRendererSpin"
+           c:type="GtkCellRendererSpin"
+           parent="CellRendererText"
+           glib:type-name="GtkCellRendererSpin"
+           glib:get-type="gtk_cell_renderer_spin_get_type">
+      <property name="adjustment">
+        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="climb-rate">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="digits">
+        <type name="guint" c:type="guint"/>
+      </property>
+    </class>
+    <class name="CellRendererToggle"
+           c:type="GtkCellRendererToggle"
+           parent="CellRenderer"
+           glib:type-name="GtkCellRendererToggle"
+           glib:get-type="gtk_cell_renderer_toggle_get_type">
+      <method name="get_radio"
+              c:identifier="gtk_cell_renderer_toggle_get_radio">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="toggle">
+            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_line" c:identifier="gtk_text_iter_get_line">
+      <method name="set_radio"
+              c:identifier="gtk_cell_renderer_toggle_set_radio">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="toggle">
+            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
+          </parameter>
+          <parameter name="radio">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_line_offset"
-              c:identifier="gtk_text_iter_get_line_offset">
+      <method name="get_active"
+              c:identifier="gtk_cell_renderer_toggle_get_active">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="toggle">
+            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_line_index" c:identifier="gtk_text_iter_get_line_index">
+      <method name="set_active"
+              c:identifier="gtk_cell_renderer_toggle_set_active">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="toggle">
+            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
+          </parameter>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visible_line_offset"
-              c:identifier="gtk_text_iter_get_visible_line_offset">
+      <property name="activatable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="active">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="radio">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="inconsistent">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="indicator-size">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <callback name="toggled">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell_renderer_toggle">
+            <type name="GtkCellRendererToggle*"
+                  c:type="GtkCellRendererToggle*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_visible_line_index"
-              c:identifier="gtk_text_iter_get_visible_line_index">
+      </callback>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_char" c:identifier="gtk_text_iter_get_char">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="toggled">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_slice" c:identifier="gtk_text_iter_get_slice">
+      </glib:signal>
+    </class>
+    <record name="GtkCellViewPrivate" c:type="GtkCellViewPrivate"/>
+    <class name="CellView"
+           c:type="GtkCellView"
+           parent="Widget"
+           glib:type-name="GtkCellView"
+           glib:get-type="gtk_cell_view_get_type">
+      <method name="set_model" c:identifier="gtk_cell_view_set_model">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell_view">
+            <type name="CellView" c:type="GtkCellView*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="model" allow-none="1">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_text" c:identifier="gtk_text_iter_get_text">
+      <method name="set_displayed_row"
+              c:identifier="gtk_cell_view_set_displayed_row">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell_view">
+            <type name="CellView" c:type="GtkCellView*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="path" allow-none="1">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visible_slice"
-              c:identifier="gtk_text_iter_get_visible_slice">
+      <method name="get_displayed_row"
+              c:identifier="gtk_cell_view_get_displayed_row">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell_view">
+            <type name="CellView" c:type="GtkCellView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visible_text"
-              c:identifier="gtk_text_iter_get_visible_text">
+      <method name="get_size_of_row"
+              c:identifier="gtk_cell_view_get_size_of_row">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell_view">
+            <type name="CellView" c:type="GtkCellView*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="requisition">
+            <type name="Requisition" c:type="GtkRequisition*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_pixbuf" c:identifier="gtk_text_iter_get_pixbuf">
+      <method name="set_background_color"
+              c:identifier="gtk_cell_view_set_background_color">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell_view">
+            <type name="CellView" c:type="GtkCellView*"/>
+          </parameter>
+          <parameter name="color">
+            <type name="GdkColor" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_marks" c:identifier="gtk_text_iter_get_marks">
+      <method name="get_cell_renderers"
+              c:identifier="gtk_cell_view_get_cell_renderers">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GList" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell_view">
+            <type name="CellView" c:type="GtkCellView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_child_anchor"
-              c:identifier="gtk_text_iter_get_child_anchor">
+      <property name="background">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="background-gdk">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </property>
+      <property name="background-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="model">
+        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+      </property>
+    </class>
+    <function name="cell_view_new" c:identifier="gtk_cell_view_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="cell_view_new_with_text"
+              c:identifier="gtk_cell_view_new_with_text">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="cell_view_new_with_markup"
+              c:identifier="gtk_cell_view_new_with_markup">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="markup">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="cell_view_new_with_pixbuf"
+              c:identifier="gtk_cell_view_new_with_pixbuf">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="pixbuf">
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="ToggleButton"
+           c:type="GtkToggleButton"
+           parent="Button"
+           glib:type-name="GtkToggleButton"
+           glib:get-type="gtk_toggle_button_get_type">
+      <method name="set_mode" c:identifier="gtk_toggle_button_set_mode">
         <return-value>
-          <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          </parameter>
+          <parameter name="draw_indicator">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_toggled_tags"
-              c:identifier="gtk_text_iter_get_toggled_tags">
+      <method name="get_mode" c:identifier="gtk_toggle_button_get_mode">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="toggled_on">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="begins_tag" c:identifier="gtk_text_iter_begins_tag">
+      <method name="set_active" c:identifier="gtk_toggle_button_set_active">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
           </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="is_active">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="ends_tag" c:identifier="gtk_text_iter_ends_tag">
+      <method name="get_active" c:identifier="gtk_toggle_button_get_active">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="toggles_tag" c:identifier="gtk_text_iter_toggles_tag">
+      <method name="toggled" c:identifier="gtk_toggle_button_toggled">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="has_tag" c:identifier="gtk_text_iter_has_tag">
+      <method name="set_inconsistent"
+              c:identifier="gtk_toggle_button_set_inconsistent">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
           </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tags" c:identifier="gtk_text_iter_get_tags">
+      <method name="get_inconsistent"
+              c:identifier="gtk_toggle_button_get_inconsistent">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="editable" c:identifier="gtk_text_iter_editable">
+      <property name="active">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="inconsistent">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="draw-indicator">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="toggled">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="default_setting">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="toggle_button">
+            <type name="GtkToggleButton*" c:type="GtkToggleButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="can_insert" c:identifier="gtk_text_iter_can_insert">
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="toggled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="toggle_button_new" c:identifier="gtk_toggle_button_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="toggle_button_new_with_label"
+              c:identifier="gtk_toggle_button_new_with_label">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="toggle_button_new_with_mnemonic"
+              c:identifier="gtk_toggle_button_new_with_mnemonic">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="CheckButton"
+           c:type="GtkCheckButton"
+           parent="ToggleButton"
+           glib:type-name="GtkCheckButton"
+           glib:get-type="gtk_check_button_get_type">
+      <callback name="draw_indicator">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="check_button">
+            <type name="GtkCheckButton*" c:type="GtkCheckButton*"/>
           </parameter>
-          <parameter name="default_editability">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="area">
+            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="starts_word" c:identifier="gtk_text_iter_starts_word">
+      </callback>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="ends_word" c:identifier="gtk_text_iter_ends_word">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="inside_word" c:identifier="gtk_text_iter_inside_word">
+      </callback>
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="starts_sentence"
-              c:identifier="gtk_text_iter_starts_sentence">
+      </callback>
+      <callback name="_gtk_reserved4">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="ends_sentence" c:identifier="gtk_text_iter_ends_sentence">
+      </callback>
+    </class>
+    <function name="check_button_new" c:identifier="gtk_check_button_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="check_button_new_with_label"
+              c:identifier="gtk_check_button_new_with_label">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="check_button_new_with_mnemonic"
+              c:identifier="gtk_check_button_new_with_mnemonic">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="check_button_get_props"
+              c:identifier="_gtk_check_button_get_props">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="check_button">
+          <type name="CheckButton" c:type="GtkCheckButton*"/>
+        </parameter>
+        <parameter name="indicator_size">
+          <type name="gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="indicator_spacing">
+          <type name="gint" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Item"
+           c:type="GtkItem"
+           parent="Bin"
+           glib:type-name="GtkItem"
+           glib:get-type="gtk_item_get_type">
+      <method name="select" c:identifier="gtk_item_select">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="item">
+            <type name="Item" c:type="GtkItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="inside_sentence"
-              c:identifier="gtk_text_iter_inside_sentence">
+      <method name="deselect" c:identifier="gtk_item_deselect">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="item">
+            <type name="Item" c:type="GtkItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="starts_line" c:identifier="gtk_text_iter_starts_line">
+      <method name="toggle" c:identifier="gtk_item_toggle">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="item">
+            <type name="Item" c:type="GtkItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="ends_line" c:identifier="gtk_text_iter_ends_line">
+      <callback name="select">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="item">
+            <type name="GtkItem*" c:type="GtkItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="is_cursor_position"
-              c:identifier="gtk_text_iter_is_cursor_position">
+      </callback>
+      <callback name="deselect">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="item">
+            <type name="GtkItem*" c:type="GtkItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_chars_in_line"
-              c:identifier="gtk_text_iter_get_chars_in_line">
+      </callback>
+      <callback name="toggle">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="item">
+            <type name="GtkItem*" c:type="GtkItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_bytes_in_line"
-              c:identifier="gtk_text_iter_get_bytes_in_line">
+      </callback>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_attributes" c:identifier="gtk_text_iter_get_attributes">
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="select">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="deselect">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="toggle">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <class name="MenuItem"
+           c:type="GtkMenuItem"
+           parent="Item"
+           glib:type-name="GtkMenuItem"
+           glib:get-type="gtk_menu_item_get_type">
+      <method name="set_submenu" c:identifier="gtk_menu_item_set_submenu">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
           </parameter>
-          <parameter name="values">
-            <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+          <parameter name="submenu">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_language" c:identifier="gtk_text_iter_get_language">
+      <method name="get_submenu" c:identifier="gtk_menu_item_get_submenu">
         <return-value>
-          <type name="PangoLanguage" c:type="PangoLanguage*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_end" c:identifier="gtk_text_iter_is_end">
+      <method name="select" c:identifier="gtk_menu_item_select">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_start" c:identifier="gtk_text_iter_is_start">
+      <method name="deselect" c:identifier="gtk_menu_item_deselect">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_char" c:identifier="gtk_text_iter_forward_char">
+      <method name="activate" c:identifier="gtk_menu_item_activate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_char" c:identifier="gtk_text_iter_backward_char">
+      <method name="toggle_size_request"
+              c:identifier="gtk_menu_item_toggle_size_request">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+          <parameter name="requisition">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_chars" c:identifier="gtk_text_iter_forward_chars">
+      <method name="toggle_size_allocate"
+              c:identifier="gtk_menu_item_toggle_size_allocate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
           </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="allocation">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_chars" c:identifier="gtk_text_iter_backward_chars">
+      <method name="set_right_justified"
+              c:identifier="gtk_menu_item_set_right_justified">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
           </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="right_justified">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_line" c:identifier="gtk_text_iter_forward_line">
+      <method name="get_right_justified"
+              c:identifier="gtk_menu_item_get_right_justified">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_line" c:identifier="gtk_text_iter_backward_line">
+      <method name="set_accel_path"
+              c:identifier="gtk_menu_item_set_accel_path">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+          <parameter name="accel_path" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_lines" c:identifier="gtk_text_iter_forward_lines">
+      <method name="remove_submenu"
+              c:identifier="gtk_menu_item_remove_submenu">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_lines" c:identifier="gtk_text_iter_backward_lines">
+      <property name="submenu">
+        <type name="GtkMenu" c:type="GtkMenu"/>
+      </property>
+      <field name="hide_on_activate">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <callback name="activate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="menu_item">
+            <type name="GtkMenuItem*" c:type="GtkMenuItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="forward_word_end"
-              c:identifier="gtk_text_iter_forward_word_end">
+      </callback>
+      <callback name="activate_item">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="menu_item">
+            <type name="GtkMenuItem*" c:type="GtkMenuItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="backward_word_start"
-              c:identifier="gtk_text_iter_backward_word_start">
+      </callback>
+      <callback name="toggle_size_request">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="menu_item">
+            <type name="GtkMenuItem*" c:type="GtkMenuItem*"/>
+          </parameter>
+          <parameter name="requisition">
+            <type name="gint*" c:type="gint*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="forward_word_ends"
-              c:identifier="gtk_text_iter_forward_word_ends">
+      </callback>
+      <callback name="toggle_size_allocate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="backward_word_starts"
-              c:identifier="gtk_text_iter_backward_word_starts">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="menu_item">
+            <type name="GtkMenuItem*" c:type="GtkMenuItem*"/>
           </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="allocation">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="forward_visible_line"
-              c:identifier="gtk_text_iter_forward_visible_line">
+      </callback>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="backward_visible_line"
-              c:identifier="gtk_text_iter_backward_visible_line">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="forward_visible_lines"
-              c:identifier="gtk_text_iter_forward_visible_lines">
+      </callback>
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="backward_visible_lines"
-              c:identifier="gtk_text_iter_backward_visible_lines">
+      </callback>
+      <callback name="_gtk_reserved4">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="forward_visible_word_end"
-              c:identifier="gtk_text_iter_forward_visible_word_end">
+      </callback>
+      <glib:signal name="activate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="backward_visible_word_start"
-              c:identifier="gtk_text_iter_backward_visible_word_start">
+      </glib:signal>
+      <glib:signal name="activate-item">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="forward_visible_word_ends"
-              c:identifier="gtk_text_iter_forward_visible_word_ends">
+      </glib:signal>
+      <glib:signal name="toggle-size-request">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="object">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="backward_visible_word_starts"
-              c:identifier="gtk_text_iter_backward_visible_word_starts">
+      </glib:signal>
+      <glib:signal name="toggle-size-allocate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="object">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="forward_sentence_end"
-              c:identifier="gtk_text_iter_forward_sentence_end">
+      </glib:signal>
+    </class>
+    <function name="menu_item_new" c:identifier="gtk_menu_item_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="menu_item_new_with_label"
+              c:identifier="gtk_menu_item_new_with_label">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="menu_item_new_with_mnemonic"
+              c:identifier="gtk_menu_item_new_with_mnemonic">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="menu_item_refresh_accel_path"
+              c:identifier="_gtk_menu_item_refresh_accel_path">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="menu_item">
+          <type name="MenuItem" c:type="GtkMenuItem*"/>
+        </parameter>
+        <parameter name="prefix">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="accel_group">
+          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+        </parameter>
+        <parameter name="group_changed">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="menu_item_is_selectable"
+              c:identifier="_gtk_menu_item_is_selectable">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="menu_item">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="menu_item_popup_submenu"
+              c:identifier="_gtk_menu_item_popup_submenu">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="menu_item">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="with_delay">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="menu_item_popdown_submenu"
+              c:identifier="_gtk_menu_item_popdown_submenu">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="menu_item">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="CheckMenuItem"
+           c:type="GtkCheckMenuItem"
+           parent="MenuItem"
+           glib:type-name="GtkCheckMenuItem"
+           glib:get-type="gtk_check_menu_item_get_type">
+      <method name="set_active" c:identifier="gtk_check_menu_item_set_active">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="backward_sentence_start"
-              c:identifier="gtk_text_iter_backward_sentence_start">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="is_active">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_sentence_ends"
-              c:identifier="gtk_text_iter_forward_sentence_ends">
+      <method name="get_active" c:identifier="gtk_check_menu_item_get_active">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_sentence_starts"
-              c:identifier="gtk_text_iter_backward_sentence_starts">
+      <method name="toggled" c:identifier="gtk_check_menu_item_toggled">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_cursor_position"
-              c:identifier="gtk_text_iter_forward_cursor_position">
+      <method name="set_inconsistent"
+              c:identifier="gtk_check_menu_item_set_inconsistent">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="backward_cursor_position"
-              c:identifier="gtk_text_iter_backward_cursor_position">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_cursor_positions"
-              c:identifier="gtk_text_iter_forward_cursor_positions">
+      <method name="get_inconsistent"
+              c:identifier="gtk_check_menu_item_get_inconsistent">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_cursor_positions"
-              c:identifier="gtk_text_iter_backward_cursor_positions">
+      <method name="set_draw_as_radio"
+              c:identifier="gtk_check_menu_item_set_draw_as_radio">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="forward_visible_cursor_position"
-              c:identifier="gtk_text_iter_forward_visible_cursor_position">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="draw_as_radio">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_visible_cursor_position"
-              c:identifier="gtk_text_iter_backward_visible_cursor_position">
+      <method name="get_draw_as_radio"
+              c:identifier="gtk_check_menu_item_get_draw_as_radio">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_visible_cursor_positions"
-              c:identifier="gtk_text_iter_forward_visible_cursor_positions">
+      <method name="set_show_toggle"
+              c:identifier="gtk_check_menu_item_set_show_toggle">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
           </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="always">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_visible_cursor_positions"
-              c:identifier="gtk_text_iter_backward_visible_cursor_positions">
+      <property name="active">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="inconsistent">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="draw-as-radio">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="toggled">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="check_menu_item">
+            <type name="GtkCheckMenuItem*" c:type="GtkCheckMenuItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_offset" c:identifier="gtk_text_iter_set_offset">
+      </callback>
+      <callback name="draw_indicator">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="check_menu_item">
+            <type name="GtkCheckMenuItem*" c:type="GtkCheckMenuItem*"/>
           </parameter>
-          <parameter name="char_offset">
-            <type name="gint" c:type="gint"/>
+          <parameter name="area">
+            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_line" c:identifier="gtk_text_iter_set_line">
+      </callback>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="line_number">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_line_offset"
-              c:identifier="gtk_text_iter_set_line_offset">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="char_on_line">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_line_index" c:identifier="gtk_text_iter_set_line_index">
+      </callback>
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="byte_on_line">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="forward_to_end" c:identifier="gtk_text_iter_forward_to_end">
+      </callback>
+      <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="forward_to_line_end"
-              c:identifier="gtk_text_iter_forward_to_line_end">
+      </callback>
+      <glib:signal name="toggled">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_visible_line_offset"
-              c:identifier="gtk_text_iter_set_visible_line_offset">
+      </glib:signal>
+    </class>
+    <function name="check_menu_item_new"
+              c:identifier="gtk_check_menu_item_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="check_menu_item_new_with_label"
+              c:identifier="gtk_check_menu_item_new_with_label">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="check_menu_item_new_with_mnemonic"
+              c:identifier="gtk_check_menu_item_new_with_mnemonic">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="TextTag"
+           c:type="GtkTextTag"
+           parent="GLib.Object"
+           glib:type-name="GtkTextTag"
+           glib:get-type="gtk_text_tag_get_type">
+      <constructor name="new" c:identifier="gtk_text_tag_new">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="TextTag" c:type="GtkTextTag*"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="char_on_line">
-            <type name="gint" c:type="gint"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_visible_line_index"
-              c:identifier="gtk_text_iter_set_visible_line_index">
+      </constructor>
+      <constructor name="table_lookup"
+                   c:identifier="gtk_text_tag_table_lookup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="TextTag" c:type="GtkTextTag*"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
           </parameter>
-          <parameter name="byte_on_line">
-            <type name="gint" c:type="gint"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="forward_to_tag_toggle"
-              c:identifier="gtk_text_iter_forward_to_tag_toggle">
+      </constructor>
+      <method name="get_priority" c:identifier="gtk_text_tag_get_priority">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
           <parameter name="tag">
             <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_to_tag_toggle"
-              c:identifier="gtk_text_iter_backward_to_tag_toggle">
+      <method name="set_priority" c:identifier="gtk_text_tag_set_priority">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
           <parameter name="tag">
             <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="forward_find_char"
-              c:identifier="gtk_text_iter_forward_find_char">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="pred">
-            <type name="GtkTextCharPredicate" c:type="GtkTextCharPredicate"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="limit">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="backward_find_char"
-              c:identifier="gtk_text_iter_backward_find_char">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="pred">
-            <type name="GtkTextCharPredicate" c:type="GtkTextCharPredicate"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="limit">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="priority">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_search" c:identifier="gtk_text_iter_forward_search">
+      <method name="event" c:identifier="gtk_text_tag_event">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="str">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="TextSearchFlags" c:type="GtkTextSearchFlags"/>
-          </parameter>
-          <parameter name="match_start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
-          <parameter name="match_end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="event_object">
+            <type name="GLib.Object" c:type="GObject*"/>
           </parameter>
-          <parameter name="limit">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="event">
+            <type name="GdkEvent" c:type="GdkEvent*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="backward_search"
-              c:identifier="gtk_text_iter_backward_search">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
           <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="str">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="TextSearchFlags" c:type="GtkTextSearchFlags"/>
-          </parameter>
-          <parameter name="match_start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="match_end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="limit">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+            <type name="GtkTextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="equal" c:identifier="gtk_text_iter_equal">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="lhs">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="rhs">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="compare" c:identifier="gtk_text_iter_compare">
+      <property name="name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="background">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="foreground">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="background-gdk">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </property>
+      <property name="foreground-gdk">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </property>
+      <property name="background-stipple">
+        <type name="GdkPixmap" c:type="GdkPixmap"/>
+      </property>
+      <property name="foreground-stipple">
+        <type name="GdkPixmap" c:type="GdkPixmap"/>
+      </property>
+      <property name="font">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="font-desc">
+        <type name="PangoFontDescription" c:type="PangoFontDescription"/>
+      </property>
+      <property name="family">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="style">
+        <type name="PangoStyle" c:type="PangoStyle"/>
+      </property>
+      <property name="variant">
+        <type name="PangoVariant" c:type="PangoVariant"/>
+      </property>
+      <property name="weight">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="stretch">
+        <type name="PangoStretch" c:type="PangoStretch"/>
+      </property>
+      <property name="size">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="size-points">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="scale">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="pixels-above-lines">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="pixels-below-lines">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="pixels-inside-wrap">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="editable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="wrap-mode">
+        <type name="GtkWrapMode" c:type="GtkWrapMode"/>
+      </property>
+      <property name="justification">
+        <type name="GtkJustification" c:type="GtkJustification"/>
+      </property>
+      <property name="direction">
+        <type name="GtkTextDirection" c:type="GtkTextDirection"/>
+      </property>
+      <property name="left-margin">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="indent">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="strikethrough">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="right-margin">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="underline">
+        <type name="PangoUnderline" c:type="PangoUnderline"/>
+      </property>
+      <property name="rise">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="background-full-height">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="language">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="tabs">
+        <type name="PangoTabArray" c:type="PangoTabArray"/>
+      </property>
+      <property name="invisible">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="paragraph-background">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="paragraph-background-gdk">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </property>
+      <property name="accumulative-margin">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="background-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="foreground-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="background-stipple-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="foreground-stipple-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="family-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="style-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="variant-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="weight-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="stretch-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="size-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="scale-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="pixels-above-lines-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="pixels-below-lines-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="pixels-inside-wrap-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="editable-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="wrap-mode-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="justification-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="left-margin-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="indent-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="strikethrough-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="right-margin-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="underline-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="rise-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="background-full-height-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="language-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="tabs-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="invisible-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="paragraph-background-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="event">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="lhs">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="rhs">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="tag">
+            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="in_range" c:identifier="gtk_text_iter_in_range">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="event_object">
+            <type name="GObject*" c:type="GObject*"/>
           </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="event">
+            <type name="GdkEvent*" c:type="GdkEvent*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="iter">
+            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="order" c:identifier="gtk_text_iter_order">
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="event">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="first">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="object">
+            <type name="GObject" c:type="GObject"/>
           </parameter>
-          <parameter name="second">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="p0">
+            <type name="GdkEvent" c:type="GdkEvent"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="GtkTextIter" c:type="GtkTextIter"/>
           </parameter>
         </parameters>
-      </method>
-    </glib:boxed>
-    <callback name="GtkTextCharPredicate">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ch">
-          <type name="gunichar" c:type="gunichar"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GtkTargetEntry" c:type="GtkTargetEntry">
-      <field name="target">
-        <type name="gchar*" c:type="gchar*"/>
+      </glib:signal>
+    </class>
+    <record name="GtkTextAppearance" c:type="GtkTextAppearance">
+      <field name="bg_color">
+        <type name="GdkColor" c:type="GdkColor"/>
       </field>
-      <field name="flags">
+      <field name="fg_color">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </field>
+      <field name="bg_stipple">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
+      <field name="fg_stipple">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
+      <field name="rise">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="padding1">
+        <type name="any" c:type="gpointer"/>
+      </field>
+      <field name="underline">
         <type name="guint" c:type="guint"/>
       </field>
-      <field name="info">
+      <field name="strikethrough">
         <type name="guint" c:type="guint"/>
       </field>
-    </record>
-    <record name="GtkTargetPair" c:type="GtkTargetPair">
-      <field name="target">
-        <type name="GdkAtom" c:type="GdkAtom"/>
+      <field name="draw_bg">
+        <type name="guint" c:type="guint"/>
       </field>
-      <field name="flags">
+      <field name="inside_selection">
         <type name="guint" c:type="guint"/>
       </field>
-      <field name="info">
+      <field name="is_text">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="pad1">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="pad2">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="pad3">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="pad4">
         <type name="guint" c:type="guint"/>
       </field>
     </record>
-    <function name="target_list_new" c:identifier="gtk_target_list_new">
-      <return-value>
-        <type name="GtkTargetList*" c:type="GtkTargetList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="targets">
-          <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-        </parameter>
-        <parameter name="ntargets">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="target_list_ref" c:identifier="gtk_target_list_ref">
-      <return-value>
-        <type name="GtkTargetList*" c:type="GtkTargetList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="target_list_unref" c:identifier="gtk_target_list_unref">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="target_list_add" c:identifier="gtk_target_list_add">
+    <function name="text_attributes_new"
+              c:identifier="gtk_text_attributes_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkTextAttributes*" c:type="GtkTextAttributes*"/>
       </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
-        </parameter>
-        <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="info">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="target_list_add_text_targets"
-              c:identifier="gtk_target_list_add_text_targets">
+    <function name="text_attributes_copy"
+              c:identifier="gtk_text_attributes_copy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkTextAttributes*" c:type="GtkTextAttributes*"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
-        </parameter>
-        <parameter name="info">
-          <type name="guint" c:type="guint"/>
+        <parameter name="src">
+          <type name="GtkTextAttributes" c:type="GtkTextAttributes*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_add_rich_text_targets"
-              c:identifier="gtk_target_list_add_rich_text_targets">
+    <function name="text_attributes_copy_values"
+              c:identifier="gtk_text_attributes_copy_values">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
-        </parameter>
-        <parameter name="info">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="deserializable">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="src">
+          <type name="GtkTextAttributes" c:type="GtkTextAttributes*"/>
         </parameter>
-        <parameter name="buffer">
-          <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
+        <parameter name="dest">
+          <type name="GtkTextAttributes" c:type="GtkTextAttributes*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_add_image_targets"
-              c:identifier="gtk_target_list_add_image_targets">
+    <function name="text_attributes_unref"
+              c:identifier="gtk_text_attributes_unref">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
-        </parameter>
-        <parameter name="info">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="writable">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="values">
+          <type name="GtkTextAttributes" c:type="GtkTextAttributes*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_add_uri_targets"
-              c:identifier="gtk_target_list_add_uri_targets">
+    <function name="text_attributes_ref"
+              c:identifier="gtk_text_attributes_ref">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkTextAttributes*" c:type="GtkTextAttributes*"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
-        </parameter>
-        <parameter name="info">
-          <type name="guint" c:type="guint"/>
+        <parameter name="values">
+          <type name="GtkTextAttributes" c:type="GtkTextAttributes*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_add_table"
-              c:identifier="gtk_target_list_add_table">
+    <glib:boxed c:type="TextAttributes"
+                glib:name="TextAttributes"
+                glib:type-name="GtkTextAttributes"
+                glib:get-type="gtk_text_attributes_get_type">
+    </glib:boxed>
+    <class name="TextChildAnchor"
+           c:type="GtkTextChildAnchor"
+           parent="GLib.Object"
+           glib:type-name="GtkTextChildAnchor"
+           glib:get-type="gtk_text_child_anchor_get_type">
+      <constructor name="new" c:identifier="gtk_text_child_anchor_new">
+        <return-value>
+          <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+        </return-value>
+      </constructor>
+      <method name="get_widgets"
+              c:identifier="gtk_text_child_anchor_get_widgets">
+        <return-value>
+          <type name="GList" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_deleted"
+              c:identifier="gtk_text_child_anchor_get_deleted">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="register_child"
+              c:identifier="gtk_text_child_anchor_register_child">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="layout">
+            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unregister_child"
+              c:identifier="gtk_text_child_anchor_unregister_child">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="queue_resize"
+              c:identifier="gtk_text_child_anchor_queue_resize">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          </parameter>
+          <parameter name="layout">
+            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="text_iter_get_buffer"
+              c:identifier="gtk_text_iter_get_buffer">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
-        </parameter>
-        <parameter name="targets">
-          <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-        </parameter>
-        <parameter name="ntargets">
-          <type name="guint" c:type="guint"/>
+        <parameter name="iter">
+          <type name="GtkTextIter" c:type="GtkTextIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_remove" c:identifier="gtk_target_list_remove">
+    <function name="text_iter_copy" c:identifier="gtk_text_iter_copy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkTextIter*" c:type="GtkTextIter*"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
-        </parameter>
-        <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+        <parameter name="iter">
+          <type name="GtkTextIter" c:type="GtkTextIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_find" c:identifier="gtk_target_list_find">
+    <function name="text_iter_free" c:identifier="gtk_text_iter_free">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
-        </parameter>
-        <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="info">
-          <type name="guint" c:type="guint*"/>
+        <parameter name="iter">
+          <type name="GtkTextIter" c:type="GtkTextIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_table_new_from_list"
-              c:identifier="gtk_target_table_new_from_list">
-      <return-value>
-        <type name="GtkTargetEntry*" c:type="GtkTargetEntry*"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
-        </parameter>
-        <parameter name="n_targets">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="target_table_free" c:identifier="gtk_target_table_free">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="targets">
-          <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-        </parameter>
-        <parameter name="n_targets">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_owner_set" c:identifier="gtk_selection_owner_set">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_owner_set_for_display"
-              c:identifier="gtk_selection_owner_set_for_display">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="display">
-          <type name="Gdk.Display" c:type="GdkDisplay*"/>
-        </parameter>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_add_target"
-              c:identifier="gtk_selection_add_target">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="info">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_add_targets"
-              c:identifier="gtk_selection_add_targets">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="targets">
-          <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-        </parameter>
-        <parameter name="ntargets">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_clear_targets"
-              c:identifier="gtk_selection_clear_targets">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_convert" c:identifier="gtk_selection_convert">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_set" c:identifier="gtk_selection_data_set">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="type">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="format">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="data">
-          <type name="guchar" c:type="guchar*"/>
-        </parameter>
-        <parameter name="length">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_set_text"
-              c:identifier="gtk_selection_data_set_text">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="str">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="len">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_get_text"
-              c:identifier="gtk_selection_data_get_text">
-      <return-value>
-        <type name="guchar*" c:type="guchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_set_pixbuf"
-              c:identifier="gtk_selection_data_set_pixbuf">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="pixbuf">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_get_pixbuf"
-              c:identifier="gtk_selection_data_get_pixbuf">
-      <return-value>
-        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_set_uris"
-              c:identifier="gtk_selection_data_set_uris">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="uris">
-          <type name="gchar" c:type="gchar**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_get_uris"
-              c:identifier="gtk_selection_data_get_uris">
-      <return-value>
-        <type name="gchar**" c:type="gchar**"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_get_targets"
-              c:identifier="gtk_selection_data_get_targets">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="targets">
-          <type name="GdkAtom" c:type="GdkAtom**"/>
-        </parameter>
-        <parameter name="n_atoms">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_targets_include_text"
-              c:identifier="gtk_selection_data_targets_include_text">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_targets_include_rich_text"
-              c:identifier="gtk_selection_data_targets_include_rich_text">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_targets_include_image"
-              c:identifier="gtk_selection_data_targets_include_image">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="writable">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_targets_include_uri"
-              c:identifier="gtk_selection_data_targets_include_uri">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="targets_include_text"
-              c:identifier="gtk_targets_include_text">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="targets">
-          <type name="GdkAtom" c:type="GdkAtom*"/>
-        </parameter>
-        <parameter name="n_targets">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="targets_include_rich_text"
-              c:identifier="gtk_targets_include_rich_text">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="targets">
-          <type name="GdkAtom" c:type="GdkAtom*"/>
-        </parameter>
-        <parameter name="n_targets">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="targets_include_image"
-              c:identifier="gtk_targets_include_image">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="targets">
-          <type name="GdkAtom" c:type="GdkAtom*"/>
-        </parameter>
-        <parameter name="n_targets">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="writable">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="targets_include_uri" c:identifier="gtk_targets_include_uri">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="targets">
-          <type name="GdkAtom" c:type="GdkAtom*"/>
-        </parameter>
-        <parameter name="n_targets">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_remove_all"
-              c:identifier="gtk_selection_remove_all">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_clear" c:identifier="gtk_selection_clear">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="event">
-          <type name="GdkEventSelection" c:type="GdkEventSelection*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_request" c:identifier="_gtk_selection_request">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="event">
-          <type name="GdkEventSelection" c:type="GdkEventSelection*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_incr_event"
-              c:identifier="_gtk_selection_incr_event">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="event">
-          <type name="GdkEventProperty" c:type="GdkEventProperty*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_notify" c:identifier="_gtk_selection_notify">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="event">
-          <type name="GdkEventSelection" c:type="GdkEventSelection*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_property_notify"
-              c:identifier="_gtk_selection_property_notify">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="event">
-          <type name="GdkEventProperty" c:type="GdkEventProperty*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <glib:boxed c:type="SelectionData"
-                glib:name="SelectionData"
-                glib:type-name="GtkSelectionData"
-                glib:get-type="gtk_selection_data_get_type">
-      <constructor name="copy" c:identifier="gtk_selection_data_copy">
+    <glib:boxed c:type="TextIter"
+                glib:name="TextIter"
+                glib:type-name="GtkTextIter"
+                glib:get-type="gtk_text_iter_get_type">
+      <method name="get_offset" c:identifier="gtk_text_iter_get_offset">
         <return-value>
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="data">
-            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_selection_data_free">
+      </method>
+      <method name="get_line" c:identifier="gtk_text_iter_get_line">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="data">
-            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-    </glib:boxed>
-    <glib:boxed c:type="TargetList"
-                glib:name="TargetList"
-                glib:type-name="GtkTargetList"
-                glib:get-type="gtk_target_list_get_type">
-    </glib:boxed>
-    <callback name="GtkClipboardReceivedFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clipboard">
-          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
-        </parameter>
-        <parameter name="selection_data">
-          <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkClipboardTextReceivedFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clipboard">
-          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
-        </parameter>
-        <parameter name="text">
-          <type name="gchar*" c:type="gchar*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkClipboardRichTextReceivedFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clipboard">
-          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
-        </parameter>
-        <parameter name="format">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="text">
-          <type name="guint8*" c:type="guint8*"/>
-        </parameter>
-        <parameter name="length">
-          <type name="gsize" c:type="gsize"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkClipboardImageReceivedFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clipboard">
-          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
-        </parameter>
-        <parameter name="pixbuf">
-          <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkClipboardTargetsReceivedFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clipboard">
-          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
-        </parameter>
-        <parameter name="atoms">
-          <type name="GdkAtom*" c:type="GdkAtom*"/>
-        </parameter>
-        <parameter name="n_atoms">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkClipboardGetFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clipboard">
-          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
-        </parameter>
-        <parameter name="selection_data">
-          <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="info">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="user_data_or_owner">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkClipboardClearFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clipboard">
-          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
-        </parameter>
-        <parameter name="user_data_or_owner">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="Clipboard"
-           c:type="GtkClipboard"
-           parent="GLib.Object"
-           glib:type-name="GtkClipboard"
-           glib:get-type="gtk_clipboard_get_type">
-      <constructor name="get_for_display"
-                   c:identifier="gtk_clipboard_get_for_display">
+      <method name="get_line_offset"
+              c:identifier="gtk_text_iter_get_line_offset">
         <return-value>
-          <type name="Clipboard" c:type="GtkClipboard*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="display">
-            <type name="Gdk.Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="selection">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="get" c:identifier="gtk_clipboard_get">
+      </method>
+      <method name="get_line_index"
+              c:identifier="gtk_text_iter_get_line_index">
         <return-value>
-          <type name="Clipboard" c:type="GtkClipboard*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="get_display" c:identifier="gtk_clipboard_get_display">
+      </method>
+      <method name="get_visible_line_offset"
+              c:identifier="gtk_text_iter_get_visible_line_offset">
         <return-value>
-          <type name="Gdk.Display" c:type="GdkDisplay*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_with_data" c:identifier="gtk_clipboard_set_with_data">
+      <method name="get_visible_line_index"
+              c:identifier="gtk_text_iter_get_visible_line_index">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="guint" c:type="guint"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="get_func">
-            <type name="GtkClipboardGetFunc" c:type="GtkClipboardGetFunc"/>
+        </parameters>
+      </method>
+      <method name="get_char" c:identifier="gtk_text_iter_get_char">
+        <return-value>
+          <type name="gunichar" c:type="gunichar"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="clear_func">
-            <type name="GtkClipboardClearFunc" c:type="GtkClipboardClearFunc"/>
+        </parameters>
+      </method>
+      <method name="get_slice" c:identifier="gtk_text_iter_get_slice">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_with_owner" c:identifier="gtk_clipboard_set_with_owner">
+      <method name="get_text" c:identifier="gtk_text_iter_get_text">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="targets">
-            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="n_targets">
-            <type name="guint" c:type="guint"/>
+        </parameters>
+      </method>
+      <method name="get_visible_slice"
+              c:identifier="gtk_text_iter_get_visible_slice">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="get_func">
-            <type name="GtkClipboardGetFunc" c:type="GtkClipboardGetFunc"/>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="clear_func">
-            <type name="GtkClipboardClearFunc" c:type="GtkClipboardClearFunc"/>
+        </parameters>
+      </method>
+      <method name="get_visible_text"
+              c:identifier="gtk_text_iter_get_visible_text">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="owner">
-            <type name="GLib.Object" c:type="GObject*"/>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_owner" c:identifier="gtk_clipboard_get_owner">
+      <method name="get_pixbuf" c:identifier="gtk_text_iter_get_pixbuf">
         <return-value>
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clear" c:identifier="gtk_clipboard_clear">
+      <method name="get_marks" c:identifier="gtk_text_iter_get_marks">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_text" c:identifier="gtk_clipboard_set_text">
+      <method name="get_child_anchor"
+              c:identifier="gtk_text_iter_get_child_anchor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="len">
-            <type name="gint" c:type="gint"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_image" c:identifier="gtk_clipboard_set_image">
+      <method name="get_toggled_tags"
+              c:identifier="gtk_text_iter_get_toggled_tags">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="toggled_on">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="request_contents"
-              c:identifier="gtk_clipboard_request_contents">
+      <method name="begins_tag" c:identifier="gtk_text_iter_begins_tag">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="target">
-            <type name="GdkAtom" c:type="GdkAtom"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkClipboardReceivedFunc"
-                    c:type="GtkClipboardReceivedFunc"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="tag" allow-none="1">
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="request_text" c:identifier="gtk_clipboard_request_text">
+      <method name="ends_tag" c:identifier="gtk_text_iter_ends_tag">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkClipboardTextReceivedFunc"
-                    c:type="GtkClipboardTextReceivedFunc"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="tag" allow-none="1">
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="request_rich_text"
-              c:identifier="gtk_clipboard_request_rich_text">
+      <method name="toggles_tag" c:identifier="gtk_text_iter_toggles_tag">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="buffer">
-            <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkClipboardRichTextReceivedFunc"
-                    c:type="GtkClipboardRichTextReceivedFunc"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="tag" allow-none="1">
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="request_image" c:identifier="gtk_clipboard_request_image">
+      <method name="has_tag" c:identifier="gtk_text_iter_has_tag">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkClipboardImageReceivedFunc"
-                    c:type="GtkClipboardImageReceivedFunc"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="request_targets"
-              c:identifier="gtk_clipboard_request_targets">
+      <method name="get_tags" c:identifier="gtk_text_iter_get_tags">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="callback">
-            <type name="GtkClipboardTargetsReceivedFunc"
-                    c:type="GtkClipboardTargetsReceivedFunc"/>
+        </parameters>
+      </method>
+      <method name="editable" c:identifier="gtk_text_iter_editable">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="default_setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_for_contents"
-              c:identifier="gtk_clipboard_wait_for_contents">
+      <method name="can_insert" c:identifier="gtk_text_iter_can_insert">
         <return-value>
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="target">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="default_editability">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_for_text" c:identifier="gtk_clipboard_wait_for_text">
+      <method name="starts_word" c:identifier="gtk_text_iter_starts_word">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_for_rich_text"
-              c:identifier="gtk_clipboard_wait_for_rich_text">
+      <method name="ends_word" c:identifier="gtk_text_iter_ends_word">
         <return-value>
-          <type name="guint8" c:type="guint8*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="buffer">
-            <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="gsize" c:type="gsize*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_for_image" c:identifier="gtk_clipboard_wait_for_image">
+      <method name="inside_word" c:identifier="gtk_text_iter_inside_word">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_for_targets"
-              c:identifier="gtk_clipboard_wait_for_targets">
+      <method name="starts_sentence"
+              c:identifier="gtk_text_iter_starts_sentence">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GdkAtom" c:type="GdkAtom**"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_is_text_available"
-              c:identifier="gtk_clipboard_wait_is_text_available">
+      <method name="ends_sentence" c:identifier="gtk_text_iter_ends_sentence">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_is_rich_text_available"
-              c:identifier="gtk_clipboard_wait_is_rich_text_available">
+      <method name="inside_sentence"
+              c:identifier="gtk_text_iter_inside_sentence">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="buffer">
-            <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_is_image_available"
-              c:identifier="gtk_clipboard_wait_is_image_available">
+      <method name="starts_line" c:identifier="gtk_text_iter_starts_line">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_is_target_available"
-              c:identifier="gtk_clipboard_wait_is_target_available">
+      <method name="ends_line" c:identifier="gtk_text_iter_ends_line">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="target">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_can_store" c:identifier="gtk_clipboard_set_can_store">
+      <method name="is_cursor_position"
+              c:identifier="gtk_text_iter_is_cursor_position">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="gint" c:type="gint"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="store" c:identifier="gtk_clipboard_store">
+      <method name="get_chars_in_line"
+              c:identifier="gtk_text_iter_get_chars_in_line">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <glib:signal name="owner-change">
+      <method name="get_bytes_in_line"
+              c:identifier="gtk_text_iter_get_bytes_in_line">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="clipboard_handle_event"
-              c:identifier="_gtk_clipboard_handle_event">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="event">
-          <type name="GdkEventOwnerChange" c:type="GdkEventOwnerChange*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clipboard_store_all"
-              c:identifier="_gtk_clipboard_store_all">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-    </function>
-    <record name="GtkColorButtonPrivate" c:type="GtkColorButtonPrivate"/>
-    <class name="ColorButton"
-           c:type="GtkColorButton"
-           parent="Button"
-           glib:type-name="GtkColorButton"
-           glib:get-type="gtk_color_button_get_type">
-      <method name="set_color" c:identifier="gtk_color_button_set_color">
+      </method>
+      <method name="get_attributes"
+              c:identifier="gtk_text_iter_get_attributes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+          <parameter name="values">
+            <type name="TextAttributes" c:type="GtkTextAttributes*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_alpha" c:identifier="gtk_color_button_set_alpha">
+      <method name="get_language" c:identifier="gtk_text_iter_get_language">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="PangoLanguage" c:type="PangoLanguage*"/>
         </return-value>
         <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
-          </parameter>
-          <parameter name="alpha">
-            <type name="guint16" c:type="guint16"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_color" c:identifier="gtk_color_button_get_color">
+      <method name="is_end" c:identifier="gtk_text_iter_is_end">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
-          </parameter>
-          <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_alpha" c:identifier="gtk_color_button_get_alpha">
+      <method name="is_start" c:identifier="gtk_text_iter_is_start">
         <return-value>
-          <type name="guint16" c:type="guint16"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_alpha"
-              c:identifier="gtk_color_button_set_use_alpha">
+      <method name="forward_char" c:identifier="gtk_text_iter_forward_char">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="use_alpha">
-            <type name="gboolean" c:type="gboolean"/>
+        </parameters>
+      </method>
+      <method name="backward_char" c:identifier="gtk_text_iter_backward_char">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_use_alpha"
-              c:identifier="gtk_color_button_get_use_alpha">
+      <method name="forward_chars" c:identifier="gtk_text_iter_forward_chars">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_title" c:identifier="gtk_color_button_set_title">
+      <method name="backward_chars"
+              c:identifier="gtk_text_iter_backward_chars">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="title">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_title" c:identifier="gtk_color_button_get_title">
+      <method name="forward_line" c:identifier="gtk_text_iter_forward_line">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="use-alpha">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="title">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="color">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </property>
-      <property name="alpha">
-        <type name="guint" c:type="guint"/>
-      </property>
-      <callback name="color_set">
+      <method name="backward_line" c:identifier="gtk_text_iter_backward_line">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="cp">
-            <type name="GtkColorButton*" c:type="GtkColorButton*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </method>
+      <method name="forward_lines" c:identifier="gtk_text_iter_forward_lines">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_lines"
+              c:identifier="gtk_text_iter_backward_lines">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_word_end"
+              c:identifier="gtk_text_iter_forward_word_end">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_word_start"
+              c:identifier="gtk_text_iter_backward_word_start">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-      <glib:signal name="color-set">
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_word_ends"
+              c:identifier="gtk_text_iter_forward_word_ends">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </glib:signal>
-    </class>
-    <function name="color_button_new" c:identifier="gtk_color_button_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="color_button_new_with_color"
-              c:identifier="gtk_color_button_new_with_color">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="VBox"
-           c:type="GtkVBox"
-           parent="Box"
-           glib:type-name="GtkVBox"
-           glib:get-type="gtk_vbox_get_type">
-    </class>
-    <function name="vbox_new" c:identifier="gtk_vbox_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="homogeneous">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <callback name="GtkColorSelectionChangePaletteFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="colors">
-          <type name="GdkColor*" c:type="GdkColor*"/>
-        </parameter>
-        <parameter name="n_colors">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkColorSelectionChangePaletteWithScreenFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="screen">
-          <type name="GdkScreen*" c:type="GdkScreen*"/>
-        </parameter>
-        <parameter name="colors">
-          <type name="GdkColor*" c:type="GdkColor*"/>
-        </parameter>
-        <parameter name="n_colors">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="ColorSelection"
-           c:type="GtkColorSelection"
-           parent="VBox"
-           glib:type-name="GtkColorSelection"
-           glib:get-type="gtk_color_selection_get_type">
-      <method name="get_has_opacity_control"
-              c:identifier="gtk_color_selection_get_has_opacity_control">
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_word_starts"
+              c:identifier="gtk_text_iter_backward_word_starts">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_has_opacity_control"
-              c:identifier="gtk_color_selection_set_has_opacity_control">
+      <method name="forward_visible_line"
+              c:identifier="gtk_text_iter_forward_visible_line">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="has_opacity">
-            <type name="gboolean" c:type="gboolean"/>
+        </parameters>
+      </method>
+      <method name="backward_visible_line"
+              c:identifier="gtk_text_iter_backward_visible_line">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_has_palette"
-              c:identifier="gtk_color_selection_get_has_palette">
+      <method name="forward_visible_lines"
+              c:identifier="gtk_text_iter_forward_visible_lines">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_has_palette"
-              c:identifier="gtk_color_selection_set_has_palette">
+      <method name="backward_visible_lines"
+              c:identifier="gtk_text_iter_backward_visible_lines">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="has_palette">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_current_color"
-              c:identifier="gtk_color_selection_set_current_color">
+      <method name="forward_visible_word_end"
+              c:identifier="gtk_text_iter_forward_visible_word_end">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+        </parameters>
+      </method>
+      <method name="backward_visible_word_start"
+              c:identifier="gtk_text_iter_backward_visible_word_start">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_current_alpha"
-              c:identifier="gtk_color_selection_set_current_alpha">
+      <method name="forward_visible_word_ends"
+              c:identifier="gtk_text_iter_forward_visible_word_ends">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="alpha">
-            <type name="guint16" c:type="guint16"/>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_current_color"
-              c:identifier="gtk_color_selection_get_current_color">
+      <method name="backward_visible_word_starts"
+              c:identifier="gtk_text_iter_backward_visible_word_starts">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_current_alpha"
-              c:identifier="gtk_color_selection_get_current_alpha">
+      <method name="forward_sentence_end"
+              c:identifier="gtk_text_iter_forward_sentence_end">
         <return-value>
-          <type name="guint16" c:type="guint16"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_previous_color"
-              c:identifier="gtk_color_selection_set_previous_color">
+      <method name="backward_sentence_start"
+              c:identifier="gtk_text_iter_backward_sentence_start">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+        </parameters>
+      </method>
+      <method name="forward_sentence_ends"
+              c:identifier="gtk_text_iter_forward_sentence_ends">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_previous_alpha"
-              c:identifier="gtk_color_selection_set_previous_alpha">
+      <method name="backward_sentence_starts"
+              c:identifier="gtk_text_iter_backward_sentence_starts">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="alpha">
-            <type name="guint16" c:type="guint16"/>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_previous_color"
-              c:identifier="gtk_color_selection_get_previous_color">
+      <method name="forward_cursor_position"
+              c:identifier="gtk_text_iter_forward_cursor_position">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+        </parameters>
+      </method>
+      <method name="backward_cursor_position"
+              c:identifier="gtk_text_iter_backward_cursor_position">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_previous_alpha"
-              c:identifier="gtk_color_selection_get_previous_alpha">
+      <method name="forward_cursor_positions"
+              c:identifier="gtk_text_iter_forward_cursor_positions">
         <return-value>
-          <type name="guint16" c:type="guint16"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_adjusting"
-              c:identifier="gtk_color_selection_is_adjusting">
+      <method name="backward_cursor_positions"
+              c:identifier="gtk_text_iter_backward_cursor_positions">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_color" c:identifier="gtk_color_selection_set_color">
+      <method name="forward_visible_cursor_position"
+              c:identifier="gtk_text_iter_forward_visible_cursor_position">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="color">
-            <type name="gdouble" c:type="gdouble*"/>
+        </parameters>
+      </method>
+      <method name="backward_visible_cursor_position"
+              c:identifier="gtk_text_iter_backward_visible_cursor_position">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_color" c:identifier="gtk_color_selection_get_color">
+      <method name="forward_visible_cursor_positions"
+              c:identifier="gtk_text_iter_forward_visible_cursor_positions">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="color">
-            <type name="gdouble" c:type="gdouble*"/>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_update_policy"
-              c:identifier="gtk_color_selection_set_update_policy">
+      <method name="backward_visible_cursor_positions"
+              c:identifier="gtk_text_iter_backward_visible_cursor_positions">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="policy">
-            <type name="UpdateType" c:type="GtkUpdateType"/>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <property name="has-palette">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="has-opacity-control">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="current-color">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </property>
-      <property name="current-alpha">
-        <type name="guint" c:type="guint"/>
-      </property>
-      <callback name="color_changed">
+      <method name="set_offset" c:identifier="gtk_text_iter_set_offset">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="color_selection">
-            <type name="GtkColorSelection*" c:type="GtkColorSelection*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="char_offset">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </method>
+      <method name="set_line" c:identifier="gtk_text_iter_set_line">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="line_number">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_line_offset"
+              c:identifier="gtk_text_iter_set_line_offset">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="char_on_line">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_line_index"
+              c:identifier="gtk_text_iter_set_line_index">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="byte_on_line">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_to_end"
+              c:identifier="gtk_text_iter_forward_to_end">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <glib:signal name="color-changed">
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_to_line_end"
+              c:identifier="gtk_text_iter_forward_to_line_end">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </glib:signal>
-    </class>
-    <function name="color_selection_new" c:identifier="gtk_color_selection_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="color_selection_palette_from_string"
-              c:identifier="gtk_color_selection_palette_from_string">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="str">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="colors">
-          <type name="GdkColor" c:type="GdkColor**"/>
-        </parameter>
-        <parameter name="n_colors">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="color_selection_palette_to_string"
-              c:identifier="gtk_color_selection_palette_to_string">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="colors">
-          <type name="GdkColor" c:type="GdkColor*"/>
-        </parameter>
-        <parameter name="n_colors">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="color_selection_set_change_palette_hook"
-              c:identifier="gtk_color_selection_set_change_palette_hook">
-      <return-value>
-        <type name="GtkColorSelectionChangePaletteFunc"
-                c:type="GtkColorSelectionChangePaletteFunc"/>
-      </return-value>
-      <parameters>
-        <parameter name="func">
-          <type name="GtkColorSelectionChangePaletteFunc"
-                  c:type="GtkColorSelectionChangePaletteFunc"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="color_selection_set_change_palette_with_screen_hook"
-              c:identifier="gtk_color_selection_set_change_palette_with_screen_hook">
-      <return-value>
-        <type name="GtkColorSelectionChangePaletteWithScreenFunc"
-                c:type="GtkColorSelectionChangePaletteWithScreenFunc"/>
-      </return-value>
-      <parameters>
-        <parameter name="func">
-          <type name="GtkColorSelectionChangePaletteWithScreenFunc"
-                  c:type="GtkColorSelectionChangePaletteWithScreenFunc"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="ColorSelectionDialog"
-           c:type="GtkColorSelectionDialog"
-           parent="Dialog"
-           glib:type-name="GtkColorSelectionDialog"
-           glib:get-type="gtk_color_selection_dialog_get_type">
-      <callback name="_gtk_reserved1">
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_visible_line_offset"
+              c:identifier="gtk_text_iter_set_visible_line_offset">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="char_on_line">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_visible_line_index"
+              c:identifier="gtk_text_iter_set_visible_line_index">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="byte_on_line">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_to_tag_toggle"
+              c:identifier="gtk_text_iter_forward_to_tag_toggle">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="tag" allow-none="1">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_to_tag_toggle"
+              c:identifier="gtk_text_iter_backward_to_tag_toggle">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-    </class>
-    <function name="color_selection_dialog_new"
-              c:identifier="gtk_color_selection_dialog_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="title">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_get_data" c:identifier="gtk_drag_get_data">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_finish" c:identifier="gtk_drag_finish">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="success">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="del">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_get_source_widget"
-              c:identifier="gtk_drag_get_source_widget">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_highlight" c:identifier="gtk_drag_highlight">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_unhighlight" c:identifier="gtk_drag_unhighlight">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_dest_set" c:identifier="gtk_drag_dest_set">
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="tag" allow-none="1">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_find_char"
+              c:identifier="gtk_text_iter_forward_find_char">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="pred">
+            <type name="GtkTextCharPredicate" c:type="GtkTextCharPredicate"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="limit">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_find_char"
+              c:identifier="gtk_text_iter_backward_find_char">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="pred">
+            <type name="GtkTextCharPredicate" c:type="GtkTextCharPredicate"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="limit">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_search"
+              c:identifier="gtk_text_iter_forward_search">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="TextSearchFlags" c:type="GtkTextSearchFlags"/>
+          </parameter>
+          <parameter name="match_start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="match_end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="limit" allow-none="1">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_search"
+              c:identifier="gtk_text_iter_backward_search">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="TextSearchFlags" c:type="GtkTextSearchFlags"/>
+          </parameter>
+          <parameter name="match_start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="match_end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="limit" allow-none="1">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="equal" c:identifier="gtk_text_iter_equal">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="lhs">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="rhs">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="compare" c:identifier="gtk_text_iter_compare">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="lhs">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="rhs">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="in_range" c:identifier="gtk_text_iter_in_range">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="order" c:identifier="gtk_text_iter_order">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="first">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="second">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <callback name="GtkTextCharPredicate">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="ch">
+          <type name="gunichar" c:type="gunichar"/>
         </parameter>
-        <parameter name="flags">
-          <type name="DestDefaults" c:type="GtkDestDefaults"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
+      </parameters>
+    </callback>
+    <record name="GtkTargetEntry" c:type="GtkTargetEntry">
+      <field name="target">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="flags">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="info">
+        <type name="guint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="GtkTargetPair" c:type="GtkTargetPair">
+      <field name="target">
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </field>
+      <field name="flags">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="info">
+        <type name="guint" c:type="guint"/>
+      </field>
+    </record>
+    <function name="target_list_new" c:identifier="gtk_target_list_new">
+      <return-value>
+        <type name="GtkTargetList*" c:type="GtkTargetList*"/>
+      </return-value>
+      <parameters>
         <parameter name="targets">
           <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
         </parameter>
-        <parameter name="n_targets">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="actions">
-          <type name="GdkDragAction" c:type="GdkDragAction"/>
+        <parameter name="ntargets">
+          <type name="guint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_dest_set_proxy" c:identifier="gtk_drag_dest_set_proxy">
+    <function name="target_list_ref" c:identifier="gtk_target_list_ref">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkTargetList*" c:type="GtkTargetList*"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="proxy_window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="protocol">
-          <type name="GdkDragProtocol" c:type="GdkDragProtocol"/>
-        </parameter>
-        <parameter name="use_coordinates">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="list">
+          <type name="GtkTargetList" c:type="GtkTargetList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_dest_unset" c:identifier="gtk_drag_dest_unset">
+    <function name="target_list_unref" c:identifier="gtk_target_list_unref">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="list">
+          <type name="GtkTargetList" c:type="GtkTargetList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_dest_find_target"
-              c:identifier="gtk_drag_dest_find_target">
+    <function name="target_list_add" c:identifier="gtk_target_list_add">
       <return-value>
-        <type name="GdkAtom" c:type="GdkAtom"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="list">
+          <type name="GtkTargetList" c:type="GtkTargetList*"/>
         </parameter>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        <parameter name="target">
+          <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
-        <parameter name="target_list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
+        <parameter name="flags">
+          <type name="guint" c:type="guint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="drag_dest_get_target_list"
-              c:identifier="gtk_drag_dest_get_target_list">
-      <return-value>
-        <type name="GtkTargetList*" c:type="GtkTargetList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="info">
+          <type name="guint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_dest_set_target_list"
-              c:identifier="gtk_drag_dest_set_target_list">
+    <function name="target_list_add_text_targets"
+              c:identifier="gtk_target_list_add_text_targets">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="list">
+          <type name="GtkTargetList" c:type="GtkTargetList*"/>
         </parameter>
-        <parameter name="target_list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
+        <parameter name="info">
+          <type name="guint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_dest_add_text_targets"
-              c:identifier="gtk_drag_dest_add_text_targets">
+    <function name="target_list_add_rich_text_targets"
+              c:identifier="gtk_target_list_add_rich_text_targets">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="list">
+          <type name="GtkTargetList" c:type="GtkTargetList*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="drag_dest_add_image_targets"
-              c:identifier="gtk_drag_dest_add_image_targets">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="info">
+          <type name="guint" c:type="guint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="drag_dest_add_uri_targets"
-              c:identifier="gtk_drag_dest_add_uri_targets">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="deserializable">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="buffer">
+          <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_dest_set_track_motion"
-              c:identifier="gtk_drag_dest_set_track_motion">
+    <function name="target_list_add_image_targets"
+              c:identifier="gtk_target_list_add_image_targets">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="list">
+          <type name="GtkTargetList" c:type="GtkTargetList*"/>
         </parameter>
-        <parameter name="track_motion">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="info">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="writable">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_dest_get_track_motion"
-              c:identifier="gtk_drag_dest_get_track_motion">
+    <function name="target_list_add_uri_targets"
+              c:identifier="gtk_target_list_add_uri_targets">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="list">
+          <type name="GtkTargetList" c:type="GtkTargetList*"/>
+        </parameter>
+        <parameter name="info">
+          <type name="guint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_source_set" c:identifier="gtk_drag_source_set">
+    <function name="target_list_add_table"
+              c:identifier="gtk_target_list_add_table">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="start_button_mask">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
+        <parameter name="list">
+          <type name="GtkTargetList" c:type="GtkTargetList*"/>
         </parameter>
         <parameter name="targets">
           <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
         </parameter>
-        <parameter name="n_targets">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="actions">
-          <type name="GdkDragAction" c:type="GdkDragAction"/>
+        <parameter name="ntargets">
+          <type name="guint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_source_unset" c:identifier="gtk_drag_source_unset">
+    <function name="target_list_remove" c:identifier="gtk_target_list_remove">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="list">
+          <type name="GtkTargetList" c:type="GtkTargetList*"/>
+        </parameter>
+        <parameter name="target">
+          <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_source_get_target_list"
-              c:identifier="gtk_drag_source_get_target_list">
+    <function name="target_list_find" c:identifier="gtk_target_list_find">
       <return-value>
-        <type name="GtkTargetList*" c:type="GtkTargetList*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="list">
+          <type name="GtkTargetList" c:type="GtkTargetList*"/>
+        </parameter>
+        <parameter name="target">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="info">
+          <type name="guint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_source_set_target_list"
-              c:identifier="gtk_drag_source_set_target_list">
+    <function name="target_table_new_from_list"
+              c:identifier="gtk_target_table_new_from_list">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkTargetEntry*" c:type="GtkTargetEntry*"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="list">
+          <type name="GtkTargetList" c:type="GtkTargetList*"/>
         </parameter>
-        <parameter name="target_list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
+        <parameter name="n_targets">
+          <type name="gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_source_add_text_targets"
-              c:identifier="gtk_drag_source_add_text_targets">
+    <function name="target_table_free" c:identifier="gtk_target_table_free">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="targets">
+          <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+        </parameter>
+        <parameter name="n_targets">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_source_add_image_targets"
-              c:identifier="gtk_drag_source_add_image_targets">
+    <function name="selection_owner_set"
+              c:identifier="gtk_selection_owner_set">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="widget">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
+        <parameter name="selection">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
       </parameters>
     </function>
-    <function name="drag_source_add_uri_targets"
-              c:identifier="gtk_drag_source_add_uri_targets">
+    <function name="selection_owner_set_for_display"
+              c:identifier="gtk_selection_owner_set_for_display">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
+        <parameter name="display">
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
+        </parameter>
+        <parameter name="widget" allow-none="1">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
+        <parameter name="selection">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
       </parameters>
     </function>
-    <function name="drag_source_set_icon"
-              c:identifier="gtk_drag_source_set_icon">
+    <function name="selection_add_target"
+              c:identifier="gtk_selection_add_target">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="widget">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="colormap">
-          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+        <parameter name="selection">
+          <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        <parameter name="target">
+          <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
-        <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+        <parameter name="info">
+          <type name="guint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_source_set_icon_pixbuf"
-              c:identifier="gtk_drag_source_set_icon_pixbuf">
+    <function name="selection_add_targets"
+              c:identifier="gtk_selection_add_targets">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="widget">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="pixbuf">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+        <parameter name="selection">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="targets">
+          <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+        </parameter>
+        <parameter name="ntargets">
+          <type name="guint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_source_set_icon_stock"
-              c:identifier="gtk_drag_source_set_icon_stock">
+    <function name="selection_clear_targets"
+              c:identifier="gtk_selection_clear_targets">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="widget">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="stock_id">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="selection">
+          <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_source_set_icon_name"
-              c:identifier="gtk_drag_source_set_icon_name">
+    <function name="selection_convert" c:identifier="gtk_selection_convert">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="widget">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="icon_name">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="selection">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="target">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_begin" c:identifier="gtk_drag_begin">
+    <function name="selection_data_set" c:identifier="gtk_selection_data_set">
       <return-value>
-        <type name="GdkDragContext*" c:type="GdkDragContext*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="selection_data">
+          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
         </parameter>
-        <parameter name="targets">
-          <type name="TargetList" c:type="GtkTargetList*"/>
+        <parameter name="type">
+          <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
-        <parameter name="actions">
-          <type name="GdkDragAction" c:type="GdkDragAction"/>
+        <parameter name="format">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="button">
-          <type name="gint" c:type="gint"/>
+        <parameter name="data">
+          <type name="guchar" c:type="guchar*"/>
         </parameter>
-        <parameter name="event">
-          <type name="GdkEvent" c:type="GdkEvent*"/>
+        <parameter name="length">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_set_icon_widget"
-              c:identifier="gtk_drag_set_icon_widget">
+    <function name="selection_data_set_text"
+              c:identifier="gtk_selection_data_set_text">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="selection_data">
+          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
         </parameter>
-        <parameter name="hot_x">
-          <type name="gint" c:type="gint"/>
+        <parameter name="str">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="hot_y">
-          <type name="gint" c:type="gint"/>
+        <parameter name="len">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_set_icon_pixmap"
-              c:identifier="gtk_drag_set_icon_pixmap">
+    <function name="selection_data_get_text"
+              c:identifier="gtk_selection_data_get_text">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="guchar*" c:type="guchar*"/>
       </return-value>
       <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="colormap">
-          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-        <parameter name="hot_x">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="hot_y">
-          <type name="gint" c:type="gint"/>
+        <parameter name="selection_data">
+          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_set_icon_pixbuf"
-              c:identifier="gtk_drag_set_icon_pixbuf">
+    <function name="selection_data_set_pixbuf"
+              c:identifier="gtk_selection_data_set_pixbuf">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        <parameter name="selection_data">
+          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
         </parameter>
         <parameter name="pixbuf">
           <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </parameter>
-        <parameter name="hot_x">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="hot_y">
-          <type name="gint" c:type="gint"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="drag_set_icon_stock" c:identifier="gtk_drag_set_icon_stock">
+    <function name="selection_data_get_pixbuf"
+              c:identifier="gtk_selection_data_get_pixbuf">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
       </return-value>
       <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="stock_id">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="hot_x">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="hot_y">
-          <type name="gint" c:type="gint"/>
+        <parameter name="selection_data">
+          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_set_icon_name" c:identifier="gtk_drag_set_icon_name">
+    <function name="selection_data_set_uris"
+              c:identifier="gtk_selection_data_set_uris">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="icon_name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="hot_x">
-          <type name="gint" c:type="gint"/>
+        <parameter name="selection_data">
+          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
         </parameter>
-        <parameter name="hot_y">
-          <type name="gint" c:type="gint"/>
+        <parameter name="uris">
+          <type name="gchar" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_set_icon_default"
-              c:identifier="gtk_drag_set_icon_default">
+    <function name="selection_data_get_uris"
+              c:identifier="gtk_selection_data_get_uris">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="gchar**" c:type="gchar**"/>
       </return-value>
       <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        <parameter name="selection_data">
+          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_check_threshold"
-              c:identifier="gtk_drag_check_threshold">
+    <function name="selection_data_get_targets"
+              c:identifier="gtk_selection_data_get_targets">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="start_x">
-          <type name="gint" c:type="gint"/>
+        <parameter name="selection_data">
+          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
         </parameter>
-        <parameter name="start_y">
-          <type name="gint" c:type="gint"/>
+        <parameter name="targets">
+          <type name="GdkAtom" c:type="GdkAtom**"/>
         </parameter>
-        <parameter name="current_x">
-          <type name="gint" c:type="gint"/>
+        <parameter name="n_atoms">
+          <type name="gint" c:type="gint*"/>
         </parameter>
-        <parameter name="current_y">
-          <type name="gint" c:type="gint"/>
+      </parameters>
+    </function>
+    <function name="selection_data_targets_include_text"
+              c:identifier="gtk_selection_data_targets_include_text">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="selection_data">
+          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_source_handle_event"
-              c:identifier="_gtk_drag_source_handle_event">
+    <function name="selection_data_targets_include_rich_text"
+              c:identifier="gtk_selection_data_targets_include_rich_text">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="selection_data">
+          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
         </parameter>
-        <parameter name="event">
-          <type name="GdkEvent" c:type="GdkEvent*"/>
+        <parameter name="buffer">
+          <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_dest_handle_event"
-              c:identifier="_gtk_drag_dest_handle_event">
+    <function name="selection_data_targets_include_image"
+              c:identifier="gtk_selection_data_targets_include_image">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="toplevel">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="selection_data">
+          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
         </parameter>
-        <parameter name="event">
-          <type name="GdkEvent" c:type="GdkEvent*"/>
+        <parameter name="writable">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_set_default_icon"
-              c:identifier="gtk_drag_set_default_icon">
+    <function name="selection_data_targets_include_uri"
+              c:identifier="gtk_selection_data_targets_include_uri">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="colormap">
-          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+        <parameter name="selection_data">
+          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
         </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+      </parameters>
+    </function>
+    <function name="targets_include_text"
+              c:identifier="gtk_targets_include_text">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="targets">
+          <type name="GdkAtom" c:type="GdkAtom*"/>
         </parameter>
-        <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+        <parameter name="n_targets">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="hot_x">
-          <type name="gint" c:type="gint"/>
+      </parameters>
+    </function>
+    <function name="targets_include_rich_text"
+              c:identifier="gtk_targets_include_rich_text">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="targets">
+          <type name="GdkAtom" c:type="GdkAtom*"/>
         </parameter>
-        <parameter name="hot_y">
-          <type name="gint" c:type="gint"/>
+        <parameter name="n_targets">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="buffer">
+          <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkEditable" c:type="GtkEditable"/>
-    <interface name="Editable"
-               c:type="GtkEditable"
-               glib:type-name="GtkEditable"
-               glib:get-type="gtk_editable_get_type">
-      <callback name="insert_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="delete_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
-          </parameter>
-          <parameter name="start_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="end_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="do_insert_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="do_delete_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
-          </parameter>
-          <parameter name="start_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="end_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_chars">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
-          </parameter>
-          <parameter name="start_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="end_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_selection_bounds">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
-          </parameter>
-          <parameter name="start_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="end_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_selection_bounds">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
-          </parameter>
-          <parameter name="start_pos">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="end_pos">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_position">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_position">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <glib:signal name="changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="insert-text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gchararray" c:type="gchararray"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="delete-text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </interface>
-    <function name="editable_select_region"
-              c:identifier="gtk_editable_select_region">
+    <function name="targets_include_image"
+              c:identifier="gtk_targets_include_image">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
+        <parameter name="targets">
+          <type name="GdkAtom" c:type="GdkAtom*"/>
         </parameter>
-        <parameter name="start">
-          <type name="gint" c:type="gint"/>
+        <parameter name="n_targets">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="end">
-          <type name="gint" c:type="gint"/>
+        <parameter name="writable">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="editable_get_selection_bounds"
-              c:identifier="gtk_editable_get_selection_bounds">
+    <function name="targets_include_uri"
+              c:identifier="gtk_targets_include_uri">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
+        <parameter name="targets">
+          <type name="GdkAtom" c:type="GdkAtom*"/>
         </parameter>
-        <parameter name="start">
-          <type name="gint" c:type="gint*"/>
+        <parameter name="n_targets">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="end">
-          <type name="gint" c:type="gint*"/>
+      </parameters>
+    </function>
+    <function name="selection_remove_all"
+              c:identifier="gtk_selection_remove_all">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="editable_insert_text"
-              c:identifier="gtk_editable_insert_text">
+    <function name="selection_clear" c:identifier="gtk_selection_clear">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="new_text">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="event">
+          <type name="GdkEventSelection" c:type="GdkEventSelection*"/>
         </parameter>
-        <parameter name="new_text_length">
-          <type name="gint" c:type="gint"/>
+      </parameters>
+    </function>
+    <function name="selection_request" c:identifier="_gtk_selection_request">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="position">
-          <type name="gint" c:type="gint*"/>
+        <parameter name="event">
+          <type name="GdkEventSelection" c:type="GdkEventSelection*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="editable_delete_text"
-              c:identifier="gtk_editable_delete_text">
+    <function name="selection_incr_event"
+              c:identifier="_gtk_selection_incr_event">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
-        </parameter>
-        <parameter name="start_pos">
-          <type name="gint" c:type="gint"/>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
-        <parameter name="end_pos">
-          <type name="gint" c:type="gint"/>
+        <parameter name="event">
+          <type name="GdkEventProperty" c:type="GdkEventProperty*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="editable_get_chars" c:identifier="gtk_editable_get_chars">
+    <function name="selection_notify" c:identifier="_gtk_selection_notify">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
-        </parameter>
-        <parameter name="start_pos">
-          <type name="gint" c:type="gint"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="end_pos">
-          <type name="gint" c:type="gint"/>
+        <parameter name="event">
+          <type name="GdkEventSelection" c:type="GdkEventSelection*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="editable_cut_clipboard"
-              c:identifier="gtk_editable_cut_clipboard">
+    <function name="selection_property_notify"
+              c:identifier="_gtk_selection_property_notify">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="event">
+          <type name="GdkEventProperty" c:type="GdkEventProperty*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="editable_copy_clipboard"
-              c:identifier="gtk_editable_copy_clipboard">
+    <glib:boxed c:type="SelectionData"
+                glib:name="SelectionData"
+                glib:type-name="GtkSelectionData"
+                glib:get-type="gtk_selection_data_get_type">
+      <constructor name="copy" c:identifier="gtk_selection_data_copy">
+        <return-value>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </return-value>
+        <parameters>
+          <parameter name="data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="free" c:identifier="gtk_selection_data_free">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <glib:boxed c:type="TargetList"
+                glib:name="TargetList"
+                glib:type-name="GtkTargetList"
+                glib:get-type="gtk_target_list_get_type">
+    </glib:boxed>
+    <callback name="GtkClipboardReceivedFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
+        <parameter name="clipboard">
+          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
+        </parameter>
+        <parameter name="selection_data">
+          <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="editable_paste_clipboard"
-              c:identifier="gtk_editable_paste_clipboard">
+    </callback>
+    <callback name="GtkClipboardTextReceivedFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
+        <parameter name="clipboard">
+          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
+        </parameter>
+        <parameter name="text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="editable_delete_selection"
-              c:identifier="gtk_editable_delete_selection">
+    </callback>
+    <callback name="GtkClipboardRichTextReceivedFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
+        <parameter name="clipboard">
+          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
+        </parameter>
+        <parameter name="format">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="text">
+          <type name="guint8*" c:type="guint8*"/>
+        </parameter>
+        <parameter name="length">
+          <type name="size" c:type="gsize"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="editable_set_position"
-              c:identifier="gtk_editable_set_position">
+    </callback>
+    <callback name="GtkClipboardImageReceivedFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
+        <parameter name="clipboard">
+          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
         </parameter>
-        <parameter name="position">
-          <type name="gint" c:type="gint"/>
+        <parameter name="pixbuf">
+          <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="editable_get_position"
-              c:identifier="gtk_editable_get_position">
+    </callback>
+    <callback name="GtkClipboardTargetsReceivedFunc">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
+        <parameter name="clipboard">
+          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
+        </parameter>
+        <parameter name="atoms">
+          <type name="GdkAtom*" c:type="GdkAtom*"/>
+        </parameter>
+        <parameter name="n_atoms">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="editable_set_editable"
-              c:identifier="gtk_editable_set_editable">
+    </callback>
+    <callback name="GtkClipboardGetFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
+        <parameter name="clipboard">
+          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
         </parameter>
-        <parameter name="is_editable">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="selection_data">
+          <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+        </parameter>
+        <parameter name="info">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="user_data_or_owner">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="editable_get_editable"
-              c:identifier="gtk_editable_get_editable">
+    </callback>
+    <callback name="GtkClipboardClearFunc">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
+        <parameter name="clipboard">
+          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
+        </parameter>
+        <parameter name="user_data_or_owner">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <class name="IMContext"
-           c:type="GtkIMContext"
+    </callback>
+    <class name="Clipboard"
+           c:type="GtkClipboard"
            parent="GLib.Object"
-           glib:type-name="GtkIMContext"
-           glib:get-type="gtk_im_context_get_type">
-      <constructor name="simple_new" c:identifier="gtk_im_context_simple_new">
-        <return-value>
-          <type name="IMContext" c:type="GtkIMContext*"/>
-        </return-value>
-      </constructor>
-      <method name="set_client_window"
-              c:identifier="gtk_im_context_set_client_window">
+           glib:type-name="GtkClipboard"
+           glib:get-type="gtk_clipboard_get_type">
+      <constructor name="get_for_display"
+                   c:identifier="gtk_clipboard_get_for_display">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Clipboard" c:type="GtkClipboard*"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="display">
+            <type name="Gdk.Display" c:type="GdkDisplay*"/>
           </parameter>
-          <parameter name="window">
-            <type name="Gdk.Window" c:type="GdkWindow*"/>
+          <parameter name="selection">
+            <type name="GdkAtom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_preedit_string"
-              c:identifier="gtk_im_context_get_preedit_string">
+      </constructor>
+      <constructor name="get" c:identifier="gtk_clipboard_get">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Clipboard" c:type="GtkClipboard*"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
-          </parameter>
-          <parameter name="str">
-            <type name="gchar" c:type="gchar**"/>
-          </parameter>
-          <parameter name="attrs">
-            <type name="PangoAttrList" c:type="PangoAttrList**"/>
+          <parameter name="selection">
+            <type name="GdkAtom" c:type="GdkAtom"/>
           </parameter>
-          <parameter name="cursor_pos">
-            <type name="gint" c:type="gint*"/>
+        </parameters>
+      </constructor>
+      <method name="get_display" c:identifier="gtk_clipboard_get_display">
+        <return-value>
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
+        </return-value>
+        <parameters>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="filter_keypress"
-              c:identifier="gtk_im_context_filter_keypress">
+      <method name="set_with_data" c:identifier="gtk_clipboard_set_with_data">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="event">
-            <type name="GdkEventKey" c:type="GdkEventKey*"/>
+          <parameter name="targets">
+            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+          </parameter>
+          <parameter name="n_targets">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="get_func">
+            <type name="GtkClipboardGetFunc" c:type="GtkClipboardGetFunc"/>
+          </parameter>
+          <parameter name="clear_func">
+            <type name="GtkClipboardClearFunc" c:type="GtkClipboardClearFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="focus_in" c:identifier="gtk_im_context_focus_in">
+      <method name="set_with_owner"
+              c:identifier="gtk_clipboard_set_with_owner">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+          <parameter name="targets">
+            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+          </parameter>
+          <parameter name="n_targets">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="get_func">
+            <type name="GtkClipboardGetFunc" c:type="GtkClipboardGetFunc"/>
+          </parameter>
+          <parameter name="clear_func">
+            <type name="GtkClipboardClearFunc" c:type="GtkClipboardClearFunc"/>
+          </parameter>
+          <parameter name="owner">
+            <type name="GLib.Object" c:type="GObject*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="focus_out" c:identifier="gtk_im_context_focus_out">
+      <method name="get_owner" c:identifier="gtk_clipboard_get_owner">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GLib.Object" c:type="GObject*"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="reset" c:identifier="gtk_im_context_reset">
+      <method name="clear" c:identifier="gtk_clipboard_clear">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_cursor_location"
-              c:identifier="gtk_im_context_set_cursor_location">
+      <method name="set_text" c:identifier="gtk_clipboard_set_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_preedit"
-              c:identifier="gtk_im_context_set_use_preedit">
+      <method name="set_image" c:identifier="gtk_clipboard_set_image">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="use_preedit">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_surrounding"
-              c:identifier="gtk_im_context_set_surrounding">
+      <method name="request_contents"
+              c:identifier="gtk_clipboard_request_contents">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="target">
+            <type name="GdkAtom" c:type="GdkAtom"/>
           </parameter>
-          <parameter name="len">
-            <type name="gint" c:type="gint"/>
+          <parameter name="callback">
+            <type name="GtkClipboardReceivedFunc"
+                  c:type="GtkClipboardReceivedFunc"/>
           </parameter>
-          <parameter name="cursor_index">
-            <type name="gint" c:type="gint"/>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_surrounding"
-              c:identifier="gtk_im_context_get_surrounding">
+      <method name="request_text" c:identifier="gtk_clipboard_request_text">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar**"/>
+          <parameter name="callback">
+            <type name="GtkClipboardTextReceivedFunc"
+                  c:type="GtkClipboardTextReceivedFunc"/>
           </parameter>
-          <parameter name="cursor_index">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="delete_surrounding"
-              c:identifier="gtk_im_context_delete_surrounding">
+      <method name="request_rich_text"
+              c:identifier="gtk_clipboard_request_rich_text">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="offset">
-            <type name="gint" c:type="gint"/>
+          <parameter name="buffer">
+            <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="n_chars">
-            <type name="gint" c:type="gint"/>
+          <parameter name="callback">
+            <type name="GtkClipboardRichTextReceivedFunc"
+                  c:type="GtkClipboardRichTextReceivedFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="preedit_start">
+      <method name="request_image" c:identifier="gtk_clipboard_request_image">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="preedit_end">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          <parameter name="callback">
+            <type name="GtkClipboardImageReceivedFunc"
+                  c:type="GtkClipboardImageReceivedFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="preedit_changed">
+      </method>
+      <method name="request_targets"
+              c:identifier="gtk_clipboard_request_targets">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkClipboardTargetsReceivedFunc"
+                  c:type="GtkClipboardTargetsReceivedFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="commit">
+      </method>
+      <method name="wait_for_contents"
+              c:identifier="gtk_clipboard_wait_for_contents">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="str">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="target">
+            <type name="GdkAtom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="retrieve_surrounding">
+      </method>
+      <method name="wait_for_text" c:identifier="gtk_clipboard_wait_for_text">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="delete_surrounding">
+      </method>
+      <method name="wait_for_rich_text"
+              c:identifier="gtk_clipboard_wait_for_rich_text">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="guint8" c:type="guint8*"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="offset">
-            <type name="gint" c:type="gint"/>
+          <parameter name="buffer">
+            <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="n_chars">
-            <type name="gint" c:type="gint"/>
+          <parameter name="format">
+            <type name="GdkAtom" c:type="GdkAtom*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="gsize" c:type="gsize*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_client_window">
+      </method>
+      <method name="wait_for_image"
+              c:identifier="gtk_clipboard_wait_for_image">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
-          </parameter>
-          <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_preedit_string">
+      </method>
+      <method name="wait_for_targets"
+              c:identifier="gtk_clipboard_wait_for_targets">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
-          </parameter>
-          <parameter name="str">
-            <type name="gchar**" c:type="gchar**"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="attrs">
-            <type name="PangoAttrList**" c:type="PangoAttrList**"/>
+          <parameter name="targets">
+            <type name="GdkAtom" c:type="GdkAtom**"/>
           </parameter>
-          <parameter name="cursor_pos">
-            <type name="gint*" c:type="gint*"/>
+          <parameter name="n_targets">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="filter_keypress">
+      </method>
+      <method name="wait_is_text_available"
+              c:identifier="gtk_clipboard_wait_is_text_available">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="GdkEventKey*" c:type="GdkEventKey*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="focus_in">
+      </method>
+      <method name="wait_is_rich_text_available"
+              c:identifier="gtk_clipboard_wait_is_rich_text_available">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+          <parameter name="buffer">
+            <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="focus_out">
+      </method>
+      <method name="wait_is_image_available"
+              c:identifier="gtk_clipboard_wait_is_image_available">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="reset">
+      </method>
+      <method name="wait_is_target_available"
+              c:identifier="gtk_clipboard_wait_is_target_available">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+          <parameter name="target">
+            <type name="GdkAtom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_cursor_location">
+      </method>
+      <method name="set_can_store" c:identifier="gtk_clipboard_set_can_store">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+          <parameter name="targets">
+            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+          </parameter>
+          <parameter name="n_targets">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_use_preedit">
+      </method>
+      <method name="store" c:identifier="gtk_clipboard_store">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
-          </parameter>
-          <parameter name="use_preedit">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_surrounding">
+      </method>
+      <glib:signal name="owner-change">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-          <parameter name="len">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="cursor_index">
-            <type name="gint" c:type="gint"/>
+          <parameter name="object">
+            <type name="GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_surrounding">
+      </glib:signal>
+    </class>
+    <function name="clipboard_handle_event"
+              c:identifier="_gtk_clipboard_handle_event">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="event">
+          <type name="GdkEventOwnerChange" c:type="GdkEventOwnerChange*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clipboard_store_all"
+              c:identifier="_gtk_clipboard_store_all">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <record name="GtkRangeLayout" c:type="GtkRangeLayout"/>
+    <record name="GtkRangeStepTimer" c:type="GtkRangeStepTimer"/>
+    <class name="Range"
+           c:type="GtkRange"
+           parent="Widget"
+           glib:type-name="GtkRange"
+           glib:get-type="gtk_range_get_type">
+      <method name="set_update_policy"
+              c:identifier="gtk_range_set_update_policy">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar**" c:type="gchar**"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
-          <parameter name="cursor_index">
-            <type name="gint*" c:type="gint*"/>
+          <parameter name="policy">
+            <type name="UpdateType" c:type="GtkUpdateType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved5">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved6">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="preedit-start">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="preedit-end">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="preedit-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="commit">
+      </method>
+      <method name="get_update_policy"
+              c:identifier="gtk_range_get_update_policy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="UpdateType" c:type="GtkUpdateType"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gchararray" c:type="gchararray"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="retrieve-surrounding">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="delete-surrounding">
+      </method>
+      <method name="set_adjustment" c:identifier="gtk_range_set_adjustment">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gint" c:type="gint"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <class name="ListStore"
-           c:type="GtkListStore"
-           parent="GLib.Object"
-           glib:type-name="GtkListStore"
-           glib:get-type="gtk_list_store_get_type">
-      <constructor name="new" c:identifier="gtk_list_store_new">
+      </method>
+      <method name="get_adjustment" c:identifier="gtk_range_get_adjustment">
         <return-value>
-          <type name="ListStore" c:type="GtkListStore*"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="n_columns">
-            <type name="gint" c:type="gint"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="newv" c:identifier="gtk_list_store_newv">
+      </method>
+      <method name="set_inverted" c:identifier="gtk_range_set_inverted">
         <return-value>
-          <type name="ListStore" c:type="GtkListStore*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="n_columns">
-            <type name="gint" c:type="gint"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
-          <parameter name="types">
-            <type name="GType" c:type="GType*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="set_column_types"
-              c:identifier="gtk_list_store_set_column_types">
+      </method>
+      <method name="get_inverted" c:identifier="gtk_range_get_inverted">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="n_columns">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="types">
-            <type name="GType" c:type="GType*"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_value" c:identifier="gtk_list_store_set_value">
+      <method name="set_lower_stepper_sensitivity"
+              c:identifier="gtk_range_set_lower_stepper_sensitivity">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
-          <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
+          <parameter name="sensitivity">
+            <type name="SensitivityType" c:type="GtkSensitivityType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set" c:identifier="gtk_list_store_set">
+      <method name="get_lower_stepper_sensitivity"
+              c:identifier="gtk_range_get_lower_stepper_sensitivity">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="SensitivityType" c:type="GtkSensitivityType"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_valuesv" c:identifier="gtk_list_store_set_valuesv">
+      <method name="set_upper_stepper_sensitivity"
+              c:identifier="gtk_range_set_upper_stepper_sensitivity">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="columns">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="values">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
-          <parameter name="n_values">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_valist" c:identifier="gtk_list_store_set_valist">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
-          <parameter name="var_args">
-            <type name="va_list" c:type="va_list"/>
+          <parameter name="sensitivity">
+            <type name="SensitivityType" c:type="GtkSensitivityType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove" c:identifier="gtk_list_store_remove">
+      <method name="get_upper_stepper_sensitivity"
+              c:identifier="gtk_range_get_upper_stepper_sensitivity">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="SensitivityType" c:type="GtkSensitivityType"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert" c:identifier="gtk_list_store_insert">
+      <method name="set_increments" c:identifier="gtk_range_set_increments">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="step">
+            <type name="double" c:type="gdouble"/>
           </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="page">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_before" c:identifier="gtk_list_store_insert_before">
+      <method name="set_range" c:identifier="gtk_range_set_range">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="min">
+            <type name="double" c:type="gdouble"/>
           </parameter>
-          <parameter name="sibling">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="max">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_after" c:identifier="gtk_list_store_insert_after">
+      <method name="set_value" c:identifier="gtk_range_set_value">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
-          <parameter name="sibling">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_with_values"
-              c:identifier="gtk_list_store_insert_with_values">
+      <method name="get_value" c:identifier="gtk_range_get_value">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_with_valuesv"
-              c:identifier="gtk_list_store_insert_with_valuesv">
+      <method name="set_show_fill_level"
+              c:identifier="gtk_range_set_show_fill_level">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="columns">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="values">
-            <type name="GValue" c:type="GValue*"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
-          <parameter name="n_values">
-            <type name="gint" c:type="gint"/>
+          <parameter name="show_fill_level">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prepend" c:identifier="gtk_list_store_prepend">
+      <method name="get_show_fill_level"
+              c:identifier="gtk_range_get_show_fill_level">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="append" c:identifier="gtk_list_store_append">
+      <method name="set_restrict_to_fill_level"
+              c:identifier="gtk_range_set_restrict_to_fill_level">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="restrict_to_fill_level">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clear" c:identifier="gtk_list_store_clear">
+      <method name="get_restrict_to_fill_level"
+              c:identifier="gtk_range_get_restrict_to_fill_level">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="iter_is_valid" c:identifier="gtk_list_store_iter_is_valid">
+      <method name="set_fill_level" c:identifier="gtk_range_set_fill_level">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="fill_level">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="reorder" c:identifier="gtk_list_store_reorder">
+      <method name="get_fill_level" c:identifier="gtk_range_get_fill_level">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="new_order">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="swap" c:identifier="gtk_list_store_swap">
+      <property name="update-policy">
+        <type name="GtkUpdateType" c:type="GtkUpdateType"/>
+      </property>
+      <property name="adjustment">
+        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="inverted">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="lower-stepper-sensitivity">
+        <type name="GtkSensitivityType" c:type="GtkSensitivityType"/>
+      </property>
+      <property name="upper-stepper-sensitivity">
+        <type name="GtkSensitivityType" c:type="GtkSensitivityType"/>
+      </property>
+      <property name="show-fill-level">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="restrict-to-fill-level">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="fill-level">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <field name="slider_detail">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="stepper_detail">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <callback name="value_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="a">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="b">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="range">
+            <type name="GtkRange*" c:type="GtkRange*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="move_after" c:identifier="gtk_list_store_move_after">
+      </callback>
+      <callback name="adjust_bounds">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="range">
+            <type name="GtkRange*" c:type="GtkRange*"/>
           </parameter>
-          <parameter name="position">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="new_value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="move_before" c:identifier="gtk_list_store_move_before">
+      </callback>
+      <callback name="move_slider">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="range">
+            <type name="GtkRange*" c:type="GtkRange*"/>
           </parameter>
-          <parameter name="position">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="scroll">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
-      </method>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
       </callback>
-    </class>
-    <callback name="GtkTreeModelFilterVisibleFunc">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkTreeModelFilterModifyFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-        </parameter>
-        <parameter name="value">
-          <type name="GValue*" c:type="GValue*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GtkTreeModelFilterPrivate"
-              c:type="GtkTreeModelFilterPrivate"/>
-    <class name="TreeModelFilter"
-           c:type="GtkTreeModelFilter"
-           parent="GLib.Object"
-           glib:type-name="GtkTreeModelFilter"
-           glib:get-type="gtk_tree_model_filter_get_type">
-      <method name="set_visible_func"
-              c:identifier="gtk_tree_model_filter_set_visible_func">
+      <callback name="get_range_border">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeModelFilterVisibleFunc"
-                    c:type="GtkTreeModelFilterVisibleFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="range">
+            <type name="GtkRange*" c:type="GtkRange*"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          <parameter name="border_">
+            <type name="GtkBorder*" c:type="GtkBorder*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_modify_func"
-              c:identifier="gtk_tree_model_filter_set_modify_func">
+      </callback>
+      <callback name="change_value">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-          <parameter name="n_columns">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="types">
-            <type name="GType" c:type="GType*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeModelFilterModifyFunc"
-                    c:type="GtkTreeModelFilterModifyFunc"/>
+          <parameter name="range">
+            <type name="GtkRange*" c:type="GtkRange*"/>
           </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="scroll">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          <parameter name="new_value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_visible_column"
-              c:identifier="gtk_tree_model_filter_set_visible_column">
+      </callback>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_model" c:identifier="gtk_tree_model_filter_get_model">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_child_iter_to_iter"
-              c:identifier="gtk_tree_model_filter_convert_child_iter_to_iter">
+      </callback>
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-          <parameter name="filter_iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="child_iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_iter_to_child_iter"
-              c:identifier="gtk_tree_model_filter_convert_iter_to_child_iter">
+      </callback>
+      <glib:signal name="value-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-          <parameter name="child_iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="filter_iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_child_path_to_path"
-              c:identifier="gtk_tree_model_filter_convert_child_path_to_path">
+      </glib:signal>
+      <glib:signal name="adjust-bounds">
         <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-          <parameter name="child_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="object">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="convert_path_to_child_path"
-              c:identifier="gtk_tree_model_filter_convert_path_to_child_path">
+      </glib:signal>
+      <glib:signal name="move-slider">
         <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-          <parameter name="filter_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="object">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="refilter" c:identifier="gtk_tree_model_filter_refilter">
+      </glib:signal>
+      <glib:signal name="change-value">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
+          <parameter name="object">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="clear_cache"
-              c:identifier="gtk_tree_model_filter_clear_cache">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
+          <parameter name="p0">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="child-model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
-      </property>
-      <property name="virtual-root">
-        <type name="GtkTreePath" c:type="GtkTreePath"/>
-      </property>
-      <callback name="_gtk_reserved0">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
+      </glib:signal>
+    </class>
+    <function name="range_get_wheel_delta"
+              c:identifier="_gtk_range_get_wheel_delta">
+      <return-value>
+        <type name="double" c:type="gdouble"/>
+      </return-value>
+      <parameters>
+        <parameter name="range">
+          <type name="Range" c:type="GtkRange*"/>
+        </parameter>
+        <parameter name="direction">
+          <type name="GdkScrollDirection" c:type="GdkScrollDirection"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Scrollbar"
+           c:type="GtkScrollbar"
+           parent="Range"
+           glib:type-name="GtkScrollbar"
+           glib:get-type="gtk_scrollbar_get_type">
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
-    <function name="tree_model_filter_new"
-              c:identifier="gtk_tree_model_filter_new">
+    <class name="HScrollbar"
+           c:type="GtkHScrollbar"
+           parent="Scrollbar"
+           glib:type-name="GtkHScrollbar"
+           glib:get-type="gtk_hscrollbar_get_type">
+    </class>
+    <function name="hscrollbar_new" c:identifier="gtk_hscrollbar_new">
       <return-value>
-        <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="child_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="root">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="adjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkEntryCompletionPrivate"
-              c:type="GtkEntryCompletionPrivate"/>
-    <callback name="GtkEntryCompletionMatchFunc">
+    <class name="VScrollbar"
+           c:type="GtkVScrollbar"
+           parent="Scrollbar"
+           glib:type-name="GtkVScrollbar"
+           glib:get-type="gtk_vscrollbar_get_type">
+    </class>
+    <function name="vscrollbar_new" c:identifier="gtk_vscrollbar_new">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="completion">
-          <type name="GtkEntryCompletion*" c:type="GtkEntryCompletion*"/>
-        </parameter>
-        <parameter name="key">
-          <type name="gchar*" c:type="gchar*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="adjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </parameter>
       </parameters>
-    </callback>
-    <class name="EntryCompletion"
-           c:type="GtkEntryCompletion"
-           parent="GLib.Object"
-           glib:type-name="GtkEntryCompletion"
-           glib:get-type="gtk_entry_completion_get_type">
-      <constructor name="new" c:identifier="gtk_entry_completion_new">
-        <return-value>
-          <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-        </return-value>
-      </constructor>
-      <method name="get_entry" c:identifier="gtk_entry_completion_get_entry">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_model" c:identifier="gtk_entry_completion_set_model">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_model" c:identifier="gtk_entry_completion_get_model">
-        <return-value>
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_match_func"
-              c:identifier="gtk_entry_completion_set_match_func">
+    </function>
+    <record name="GtkCList" c:type="GtkCList">
+      <field name="container">
+        <type name="GtkContainer" c:type="GtkContainer"/>
+      </field>
+      <field name="flags">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="reserved1">
+        <type name="any" c:type="gpointer"/>
+      </field>
+      <field name="reserved2">
+        <type name="any" c:type="gpointer"/>
+      </field>
+      <field name="freeze_count">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="internal_allocation">
+        <type name="GdkRectangle" c:type="GdkRectangle"/>
+      </field>
+      <field name="rows">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="row_height">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="row_list">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="row_list_end">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="columns">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="column_title_area">
+        <type name="GdkRectangle" c:type="GdkRectangle"/>
+      </field>
+      <field name="title_window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="column">
+        <type name="GtkCListColumn*" c:type="GtkCListColumn*"/>
+      </field>
+      <field name="clist_window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="clist_window_width">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="clist_window_height">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="hoffset">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="voffset">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="shadow_type">
+        <type name="GtkShadowType" c:type="GtkShadowType"/>
+      </field>
+      <field name="selection_mode">
+        <type name="GtkSelectionMode" c:type="GtkSelectionMode"/>
+      </field>
+      <field name="selection">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="selection_end">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="undo_selection">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="undo_unselection">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="undo_anchor">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="button_actions">
+        <type name="uint8" c:type="guint8"/>
+      </field>
+      <field name="drag_button">
+        <type name="uint8" c:type="guint8"/>
+      </field>
+      <field name="click_cell">
+        <type name="GtkCListCellInfo" c:type="GtkCListCellInfo"/>
+      </field>
+      <field name="hadjustment">
+        <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+      </field>
+      <field name="vadjustment">
+        <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+      </field>
+      <field name="xor_gc">
+        <type name="GdkGC*" c:type="GdkGC*"/>
+      </field>
+      <field name="fg_gc">
+        <type name="GdkGC*" c:type="GdkGC*"/>
+      </field>
+      <field name="bg_gc">
+        <type name="GdkGC*" c:type="GdkGC*"/>
+      </field>
+      <field name="cursor_drag">
+        <type name="GdkCursor*" c:type="GdkCursor*"/>
+      </field>
+      <field name="x_drag">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="focus_row">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="focus_header_column">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="anchor">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="anchor_state">
+        <type name="GtkStateType" c:type="GtkStateType"/>
+      </field>
+      <field name="drag_pos">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="htimer">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="vtimer">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="sort_type">
+        <type name="GtkSortType" c:type="GtkSortType"/>
+      </field>
+      <field name="compare">
+        <type name="GtkCListCompareFunc" c:type="GtkCListCompareFunc"/>
+      </field>
+      <field name="sort_column">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="drag_highlight_row">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="drag_highlight_pos">
+        <type name="GtkCListDragPos" c:type="GtkCListDragPos"/>
+      </field>
+      <callback name="set_scroll_adjustments">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkEntryCompletionMatchFunc"
-                    c:type="GtkEntryCompletionMatchFunc"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="func_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="hadjustment">
+            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
           </parameter>
-          <parameter name="func_notify">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="vadjustment">
+            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_minimum_key_length"
-              c:identifier="gtk_entry_completion_set_minimum_key_length">
+      </callback>
+      <callback name="refresh">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="gint" c:type="gint"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_minimum_key_length"
-              c:identifier="gtk_entry_completion_get_minimum_key_length">
+      </callback>
+      <callback name="select_row">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="complete" c:identifier="gtk_entry_completion_complete">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="row">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="event">
+            <type name="GdkEvent*" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="insert_prefix"
-              c:identifier="gtk_entry_completion_insert_prefix">
+      </callback>
+      <callback name="unselect_row">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="event">
+            <type name="GdkEvent*" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="insert_action_text"
-              c:identifier="gtk_entry_completion_insert_action_text">
+      </callback>
+      <callback name="row_move">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="index_">
-            <type name="gint" c:type="gint"/>
+          <parameter name="source_row">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="dest_row">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="insert_action_markup"
-              c:identifier="gtk_entry_completion_insert_action_markup">
+      </callback>
+      <callback name="click_column">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="index_">
-            <type name="gint" c:type="gint"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="markup">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="delete_action"
-              c:identifier="gtk_entry_completion_delete_action">
+      </callback>
+      <callback name="resize_column">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="index_">
-            <type name="gint" c:type="gint"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="width">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_inline_completion"
-              c:identifier="gtk_entry_completion_set_inline_completion">
+      </callback>
+      <callback name="toggle_focus_row">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="inline_completion">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_inline_completion"
-              c:identifier="gtk_entry_completion_get_inline_completion">
+      </callback>
+      <callback name="select_all">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_inline_selection"
-              c:identifier="gtk_entry_completion_set_inline_selection">
+      </callback>
+      <callback name="unselect_all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="inline_selection">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_inline_selection"
-              c:identifier="gtk_entry_completion_get_inline_selection">
+      </callback>
+      <callback name="undo_selection">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_popup_completion"
-              c:identifier="gtk_entry_completion_set_popup_completion">
+      </callback>
+      <callback name="start_selection">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="popup_completion">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_popup_completion"
-              c:identifier="gtk_entry_completion_get_popup_completion">
+      </callback>
+      <callback name="end_selection">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_popup_set_width"
-              c:identifier="gtk_entry_completion_set_popup_set_width">
+      </callback>
+      <callback name="extend_selection">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="popup_set_width">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="scroll_type">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="auto_start_selection">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_popup_set_width"
-              c:identifier="gtk_entry_completion_get_popup_set_width">
+      </callback>
+      <callback name="scroll_horizontal">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="scroll_type">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_popup_single_match"
-              c:identifier="gtk_entry_completion_set_popup_single_match">
+      </callback>
+      <callback name="scroll_vertical">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="popup_single_match">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="scroll_type">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_popup_single_match"
-              c:identifier="gtk_entry_completion_get_popup_single_match">
+      </callback>
+      <callback name="toggle_add_mode">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_completion_prefix"
-              c:identifier="gtk_entry_completion_get_completion_prefix">
+      </callback>
+      <callback name="abort_column_resize">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_text_column"
-              c:identifier="gtk_entry_completion_set_text_column">
+      </callback>
+      <callback name="resync_selection">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
+          <parameter name="event">
+            <type name="GdkEvent*" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_text_column"
-              c:identifier="gtk_entry_completion_get_text_column">
+      </callback>
+      <callback name="selection_find">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="GList*" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row_number">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="row_list_element">
+            <type name="GList*" c:type="GList*"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
-      </property>
-      <property name="minimum-key-length">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="text-column">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="inline-completion">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="popup-completion">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="popup-set-width">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="popup-single-match">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="inline-selection">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <callback name="match_selected">
+      </callback>
+      <callback name="draw_row">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="GtkEntryCompletion*" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          <parameter name="area">
+            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          <parameter name="row">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="clist_row">
+            <type name="GtkCListRow*" c:type="GtkCListRow*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="action_activated">
+      <callback name="draw_drag_highlight">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="GtkEntryCompletion*" c:type="GtkEntryCompletion*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="index_">
-            <type name="gint" c:type="gint"/>
+          <parameter name="target_row">
+            <type name="GtkCListRow*" c:type="GtkCListRow*"/>
+          </parameter>
+          <parameter name="target_row_number">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="drag_pos">
+            <type name="GtkCListDragPos" c:type="GtkCListDragPos"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="insert_prefix">
+      <callback name="clear">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="GtkEntryCompletion*" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="prefix">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="cursor_on_match">
+      <callback name="fake_unselect_all">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="GtkEntryCompletion*" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          <parameter name="row">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved0">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="insert-prefix">
+      <callback name="sort_list">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gchararray" c:type="gchararray"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="match-selected">
+      </callback>
+      <callback name="insert_row">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+          <parameter name="row">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="cursor-on-match">
+      </callback>
+      <callback name="remove_row">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+          <parameter name="row">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="action-activated">
+      </callback>
+      <callback name="set_cell_contents">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gint" c:type="gint"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <class name="Entry"
-           c:type="GtkEntry"
-           parent="Widget"
-           glib:type-name="GtkEntry"
-           glib:get-type="gtk_entry_get_type">
-      <method name="set_visibility" c:identifier="gtk_entry_set_visibility">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="visible">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_visibility" c:identifier="gtk_entry_get_visibility">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_invisible_char"
-              c:identifier="gtk_entry_set_invisible_char">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="ch">
-            <type name="gunichar" c:type="gunichar"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_invisible_char"
-              c:identifier="gtk_entry_get_invisible_char">
-        <return-value>
-          <type name="gunichar" c:type="gunichar"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_has_frame" c:identifier="gtk_entry_set_has_frame">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_has_frame" c:identifier="gtk_entry_get_has_frame">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_inner_border" c:identifier="gtk_entry_set_inner_border">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="border">
-            <type name="Border" c:type="GtkBorder*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_inner_border" c:identifier="gtk_entry_get_inner_border">
-        <return-value>
-          <type name="Border" c:type="GtkBorder*"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_max_length" c:identifier="gtk_entry_set_max_length">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="max">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_max_length" c:identifier="gtk_entry_get_max_length">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_activates_default"
-              c:identifier="gtk_entry_set_activates_default">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_activates_default"
-              c:identifier="gtk_entry_get_activates_default">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_width_chars" c:identifier="gtk_entry_set_width_chars">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="n_chars">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_width_chars" c:identifier="gtk_entry_get_width_chars">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_text" c:identifier="gtk_entry_set_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_text" c:identifier="gtk_entry_get_text">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_layout" c:identifier="gtk_entry_get_layout">
-        <return-value>
-          <type name="Pango.Layout" c:type="PangoLayout*"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_layout_offsets"
-              c:identifier="gtk_entry_get_layout_offsets">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_alignment" c:identifier="gtk_entry_set_alignment">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="xalign">
-            <type name="gfloat" c:type="gfloat"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_alignment" c:identifier="gtk_entry_get_alignment">
-        <return-value>
-          <type name="gfloat" c:type="gfloat"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_completion" c:identifier="gtk_entry_set_completion">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_completion" c:identifier="gtk_entry_get_completion">
-        <return-value>
-          <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="layout_index_to_text_index"
-              c:identifier="gtk_entry_layout_index_to_text_index">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="layout_index">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="text_index_to_layout_index"
-              c:identifier="gtk_entry_text_index_to_layout_index">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="text_index">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_cursor_hadjustment"
-              c:identifier="gtk_entry_set_cursor_hadjustment">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_cursor_hadjustment"
-              c:identifier="gtk_entry_get_cursor_hadjustment">
-        <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="append_text" c:identifier="gtk_entry_append_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="prepend_text" c:identifier="gtk_entry_prepend_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_position" c:identifier="gtk_entry_set_position">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="select_region" c:identifier="gtk_entry_select_region">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="end">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_editable" c:identifier="gtk_entry_set_editable">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="editable">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="cursor-position">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="selection-bound">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="editable">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="max-length">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="visibility">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="has-frame">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="inner-border">
-        <type name="GtkBorder" c:type="GtkBorder"/>
-      </property>
-      <property name="invisible-char">
-        <type name="guint" c:type="guint"/>
-      </property>
-      <property name="activates-default">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="width-chars">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="scroll-offset">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="text">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="xalign">
-        <type name="gfloat" c:type="gfloat"/>
-      </property>
-      <property name="truncate-multiline">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="shadow-type">
-        <type name="GtkShadowType" c:type="GtkShadowType"/>
-      </property>
-      <callback name="populate_popup">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="menu">
-            <type name="GtkMenu*" c:type="GtkMenu*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="activate">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="move_cursor">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="step">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="extend_selection">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="insert_at_cursor">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="str">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="clist_row">
+            <type name="GtkCListRow*" c:type="GtkCListRow*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="delete_from_cursor">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="type">
-            <type name="GtkDeleteType" c:type="GtkDeleteType"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="backspace">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+            <type name="GtkCellType" c:type="GtkCellType"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="cut_clipboard">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="copy_clipboard">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+          <parameter name="spacing">
+            <type name="uint8" c:type="guint8"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="paste_clipboard">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+          <parameter name="pixmap">
+            <type name="GdkPixmap*" c:type="GdkPixmap*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="toggle_overwrite">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+          <parameter name="mask">
+            <type name="GdkBitmap*" c:type="GdkBitmap*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_text_area_size">
+      <callback name="cell_size_request">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint*" c:type="gint*"/>
+          <parameter name="clist">
+            <type name="GtkCList*" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="y">
-            <type name="gint*" c:type="gint*"/>
+          <parameter name="clist_row">
+            <type name="GtkCListRow*" c:type="GtkCListRow*"/>
           </parameter>
-          <parameter name="width">
-            <type name="gint*" c:type="gint*"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="height">
-            <type name="gint*" c:type="gint*"/>
+          <parameter name="requisition">
+            <type name="GtkRequisition*" c:type="GtkRequisition*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="move-cursor">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="copy-clipboard">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="populate-popup">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkMenu" c:type="GtkMenu"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="activate">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="insert-at-cursor">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gchararray" c:type="gchararray"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="delete-from-cursor">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkDeleteType" c:type="GtkDeleteType"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="backspace">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="cut-clipboard">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="paste-clipboard">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="toggle-overwrite">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="entry_new" c:identifier="gtk_entry_new">
+    </record>
+    <record name="GtkCListColumn" c:type="GtkCListColumn">
+      <field name="title">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="area">
+        <type name="GdkRectangle" c:type="GdkRectangle"/>
+      </field>
+      <field name="button">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="window">
+        <type name="GdkWindow*" c:type="GdkWindow*"/>
+      </field>
+      <field name="width">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="min_width">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="max_width">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="justification">
+        <type name="GtkJustification" c:type="GtkJustification"/>
+      </field>
+      <field name="visible">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="width_set">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="resizeable">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="auto_resize">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="button_passive">
+        <type name="guint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="GtkCListRow" c:type="GtkCListRow">
+      <field name="cell">
+        <type name="GtkCell*" c:type="GtkCell*"/>
+      </field>
+      <field name="state">
+        <type name="GtkStateType" c:type="GtkStateType"/>
+      </field>
+      <field name="foreground">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </field>
+      <field name="background">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </field>
+      <field name="style">
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </field>
+      <field name="data">
+        <type name="any" c:type="gpointer"/>
+      </field>
+      <field name="destroy">
+        <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+      </field>
+      <field name="fg_set">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="bg_set">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="selectable">
+        <type name="guint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="GtkCell" c:type="GtkCell">
+      <field name="type">
+        <type name="GtkCellType" c:type="GtkCellType"/>
+      </field>
+      <field name="vertical">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="horizontal">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="style">
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </field>
+      <field name="u">
+        <type name="???" c:type="???"/>
+      </field>
+    </record>
+    <record name="GtkCellText" c:type="GtkCellText">
+      <field name="type">
+        <type name="GtkCellType" c:type="GtkCellType"/>
+      </field>
+      <field name="vertical">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="horizontal">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="style">
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </field>
+      <field name="text">
+        <type name="string" c:type="gchar*"/>
+      </field>
+    </record>
+    <record name="GtkCellPixmap" c:type="GtkCellPixmap">
+      <field name="type">
+        <type name="GtkCellType" c:type="GtkCellType"/>
+      </field>
+      <field name="vertical">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="horizontal">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="style">
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </field>
+      <field name="pixmap">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="mask">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
+    </record>
+    <record name="GtkCellPixText" c:type="GtkCellPixText">
+      <field name="type">
+        <type name="GtkCellType" c:type="GtkCellType"/>
+      </field>
+      <field name="vertical">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="horizontal">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="style">
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </field>
+      <field name="text">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="spacing">
+        <type name="uint8" c:type="guint8"/>
+      </field>
+      <field name="pixmap">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="mask">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
+    </record>
+    <record name="GtkCellWidget" c:type="GtkCellWidget">
+      <field name="type">
+        <type name="GtkCellType" c:type="GtkCellType"/>
+      </field>
+      <field name="vertical">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="horizontal">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="style">
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </field>
+      <field name="widget">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+    </record>
+    <callback name="GtkCListCompareFunc">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList*" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="ptr1">
+          <type name="gconstpointer" c:type="gconstpointer"/>
+        </parameter>
+        <parameter name="ptr2">
+          <type name="gconstpointer" c:type="gconstpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <record name="GtkCListCellInfo" c:type="GtkCListCellInfo">
+      <field name="row">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="column">
+        <type name="int32" c:type="gint"/>
+      </field>
+    </record>
+    <record name="GtkCListDestInfo" c:type="GtkCListDestInfo">
+      <field name="cell">
+        <type name="GtkCListCellInfo" c:type="GtkCListCellInfo"/>
+      </field>
+      <field name="insert_pos">
+        <type name="GtkCListDragPos" c:type="GtkCListDragPos"/>
+      </field>
+    </record>
+    <function name="clist_get_type" c:identifier="gtk_clist_get_type">
+      <return-value>
+        <type name="GtkType" c:type="GtkType"/>
+      </return-value>
+    </function>
+    <function name="clist_new" c:identifier="gtk_clist_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
+      <parameters>
+        <parameter name="columns">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="entry_new_with_max_length"
-              c:identifier="gtk_entry_new_with_max_length">
+    <function name="clist_new_with_titles"
+              c:identifier="gtk_clist_new_with_titles">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="max">
-          <type name="gint" c:type="gint"/>
+        <parameter name="columns">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="titles">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkTreeViewPrivate" c:type="GtkTreeViewPrivate"/>
-    <callback name="GtkTreeViewColumnDropFunc">
+    <function name="clist_set_hadjustment"
+              c:identifier="gtk_clist_set_hadjustment">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="tree_view">
-          <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
-        <parameter name="column">
-          <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+        <parameter name="adjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </parameter>
-        <parameter name="prev_column">
-          <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+      </parameters>
+    </function>
+    <function name="clist_set_vadjustment"
+              c:identifier="gtk_clist_set_vadjustment">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
-        <parameter name="next_column">
-          <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+        <parameter name="adjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="clist_get_hadjustment"
+              c:identifier="gtk_clist_get_hadjustment">
+      <return-value>
+        <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
       </parameters>
-    </callback>
-    <callback name="GtkTreeViewMappingFunc">
+    </function>
+    <function name="clist_get_vadjustment"
+              c:identifier="gtk_clist_get_vadjustment">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
       </return-value>
       <parameters>
-        <parameter name="tree_view">
-          <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
-        <parameter name="path">
-          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+      </parameters>
+    </function>
+    <function name="clist_set_shadow_type"
+              c:identifier="gtk_clist_set_shadow_type">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
       </parameters>
-    </callback>
-    <callback name="GtkTreeViewSearchEqualFunc">
+    </function>
+    <function name="clist_set_selection_mode"
+              c:identifier="gtk_clist_set_selection_mode">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="mode">
+          <type name="SelectionMode" c:type="GtkSelectionMode"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_reorderable"
+              c:identifier="gtk_clist_set_reorderable">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="reorderable">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_use_drag_icons"
+              c:identifier="gtk_clist_set_use_drag_icons">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="use_icons">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_button_actions"
+              c:identifier="gtk_clist_set_button_actions">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="button">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="button_actions">
+          <type name="uint8" c:type="guint8"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_freeze" c:identifier="gtk_clist_freeze">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_thaw" c:identifier="gtk_clist_thaw">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_column_titles_show"
+              c:identifier="gtk_clist_column_titles_show">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_column_titles_hide"
+              c:identifier="gtk_clist_column_titles_hide">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_column_title_active"
+              c:identifier="gtk_clist_column_title_active">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
         <parameter name="column">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="key">
-          <type name="gchar*" c:type="gchar*"/>
+      </parameters>
+    </function>
+    <function name="clist_column_title_passive"
+              c:identifier="gtk_clist_column_title_passive">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="search_data">
-          <type name="gpointer" c:type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="clist_column_titles_active"
+              c:identifier="gtk_clist_column_titles_active">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
       </parameters>
-    </callback>
-    <callback name="GtkTreeViewRowSeparatorFunc">
+    </function>
+    <function name="clist_column_titles_passive"
+              c:identifier="gtk_clist_column_titles_passive">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+      </parameters>
+    </function>
+    <function name="clist_set_column_title"
+              c:identifier="gtk_clist_set_column_title">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="title">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
-    </callback>
-    <callback name="GtkTreeViewSearchPositionFunc">
+    </function>
+    <function name="clist_get_column_title"
+              c:identifier="gtk_clist_get_column_title">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="tree_view">
-          <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
-        <parameter name="search_dialog">
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="clist_set_column_widget"
+              c:identifier="gtk_clist_set_column_widget">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
-    </callback>
-    <class name="TreeView"
-           c:type="GtkTreeView"
-           parent="Container"
-           glib:type-name="GtkTreeView"
-           glib:get-type="gtk_tree_view_get_type">
-      <method name="get_model" c:identifier="gtk_tree_view_get_model">
-        <return-value>
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_model" c:identifier="gtk_tree_view_set_model">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_selection" c:identifier="gtk_tree_view_get_selection">
-        <return-value>
-          <type name="GtkTreeSelection" c:type="GtkTreeSelection*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_hadjustment"
-              c:identifier="gtk_tree_view_get_hadjustment">
-        <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_hadjustment"
-              c:identifier="gtk_tree_view_set_hadjustment">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_vadjustment"
-              c:identifier="gtk_tree_view_get_vadjustment">
-        <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_vadjustment"
-              c:identifier="gtk_tree_view_set_vadjustment">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_headers_visible"
-              c:identifier="gtk_tree_view_get_headers_visible">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_headers_visible"
-              c:identifier="gtk_tree_view_set_headers_visible">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="headers_visible">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="columns_autosize"
-              c:identifier="gtk_tree_view_columns_autosize">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_headers_clickable"
-              c:identifier="gtk_tree_view_get_headers_clickable">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_headers_clickable"
-              c:identifier="gtk_tree_view_set_headers_clickable">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_rules_hint" c:identifier="gtk_tree_view_set_rules_hint">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_rules_hint" c:identifier="gtk_tree_view_get_rules_hint">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="append_column" c:identifier="gtk_tree_view_append_column">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove_column" c:identifier="gtk_tree_view_remove_column">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="insert_column" c:identifier="gtk_tree_view_insert_column">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="insert_column_with_attributes"
-              c:identifier="gtk_tree_view_insert_column_with_attributes">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="title">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="insert_column_with_data_func"
-              c:identifier="gtk_tree_view_insert_column_with_data_func">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="title">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeCellDataFunc" c:type="GtkTreeCellDataFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="dnotify">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_column" c:identifier="gtk_tree_view_get_column">
-        <return-value>
-          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="n">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_columns" c:identifier="gtk_tree_view_get_columns">
-        <return-value>
-          <type name="GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="move_column_after"
-              c:identifier="gtk_tree_view_move_column_after">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="base_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_expander_column"
-              c:identifier="gtk_tree_view_set_expander_column">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_expander_column"
-              c:identifier="gtk_tree_view_get_expander_column">
-        <return-value>
-          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_column_drag_function"
-              c:identifier="gtk_tree_view_set_column_drag_function">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeViewColumnDropFunc"
-                    c:type="GtkTreeViewColumnDropFunc"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="scroll_to_point"
-              c:identifier="gtk_tree_view_scroll_to_point">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="tree_x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="tree_y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="scroll_to_cell" c:identifier="gtk_tree_view_scroll_to_cell">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="use_align">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="row_align">
-            <type name="gfloat" c:type="gfloat"/>
-          </parameter>
-          <parameter name="col_align">
-            <type name="gfloat" c:type="gfloat"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="row_activated" c:identifier="gtk_tree_view_row_activated">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="expand_all" c:identifier="gtk_tree_view_expand_all">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="collapse_all" c:identifier="gtk_tree_view_collapse_all">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="expand_to_path" c:identifier="gtk_tree_view_expand_to_path">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="expand_row" c:identifier="gtk_tree_view_expand_row">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="open_all">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="collapse_row" c:identifier="gtk_tree_view_collapse_row">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="map_expanded_rows"
-              c:identifier="gtk_tree_view_map_expanded_rows">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeViewMappingFunc"
-                    c:type="GtkTreeViewMappingFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="row_expanded" c:identifier="gtk_tree_view_row_expanded">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_reorderable"
-              c:identifier="gtk_tree_view_set_reorderable">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="reorderable">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_reorderable"
-              c:identifier="gtk_tree_view_get_reorderable">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_cursor" c:identifier="gtk_tree_view_set_cursor">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="focus_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="start_editing">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_cursor_on_cell"
-              c:identifier="gtk_tree_view_set_cursor_on_cell">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="focus_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="focus_cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="start_editing">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_cursor" c:identifier="gtk_tree_view_get_cursor">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="focus_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn**"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_bin_window" c:identifier="gtk_tree_view_get_bin_window">
-        <return-value>
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_path_at_pos"
-              c:identifier="gtk_tree_view_get_path_at_pos">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn**"/>
-          </parameter>
-          <parameter name="cell_x">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="cell_y">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_cell_area" c:identifier="gtk_tree_view_get_cell_area">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_background_area"
-              c:identifier="gtk_tree_view_get_background_area">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_visible_rect"
-              c:identifier="gtk_tree_view_get_visible_rect">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="visible_rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="widget_to_tree_coords"
-              c:identifier="gtk_tree_view_widget_to_tree_coords">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="wx">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="wy">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="tx">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="ty">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="tree_to_widget_coords"
-              c:identifier="gtk_tree_view_tree_to_widget_coords">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="tx">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="ty">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="wx">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="wy">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_visible_range"
-              c:identifier="gtk_tree_view_get_visible_range">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="start_path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="end_path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="enable_model_drag_source"
-              c:identifier="gtk_tree_view_enable_model_drag_source">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="start_button_mask">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="actions">
-            <type name="GdkDragAction" c:type="GdkDragAction"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="enable_model_drag_dest"
-              c:identifier="gtk_tree_view_enable_model_drag_dest">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="actions">
-            <type name="GdkDragAction" c:type="GdkDragAction"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unset_rows_drag_source"
-              c:identifier="gtk_tree_view_unset_rows_drag_source">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unset_rows_drag_dest"
-              c:identifier="gtk_tree_view_unset_rows_drag_dest">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_drag_dest_row"
-              c:identifier="gtk_tree_view_set_drag_dest_row">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="pos">
-            <type name="TreeViewDropPosition"
-                    c:type="GtkTreeViewDropPosition"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_drag_dest_row"
-              c:identifier="gtk_tree_view_get_drag_dest_row">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="pos">
-            <type name="TreeViewDropPosition"
-                    c:type="GtkTreeViewDropPosition*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_dest_row_at_pos"
-              c:identifier="gtk_tree_view_get_dest_row_at_pos">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="drag_x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="drag_y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="pos">
-            <type name="TreeViewDropPosition"
-                    c:type="GtkTreeViewDropPosition*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="create_row_drag_icon"
-              c:identifier="gtk_tree_view_create_row_drag_icon">
-        <return-value>
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_enable_search"
-              c:identifier="gtk_tree_view_set_enable_search">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="enable_search">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_enable_search"
-              c:identifier="gtk_tree_view_get_enable_search">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_search_column"
-              c:identifier="gtk_tree_view_get_search_column">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_search_column"
-              c:identifier="gtk_tree_view_set_search_column">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_search_equal_func"
-              c:identifier="gtk_tree_view_get_search_equal_func">
-        <return-value>
-          <type name="GtkTreeViewSearchEqualFunc"
-                  c:type="GtkTreeViewSearchEqualFunc"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_search_equal_func"
-              c:identifier="gtk_tree_view_set_search_equal_func">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="search_equal_func">
-            <type name="GtkTreeViewSearchEqualFunc"
-                    c:type="GtkTreeViewSearchEqualFunc"/>
-          </parameter>
-          <parameter name="search_user_data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="search_destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_search_entry"
-              c:identifier="gtk_tree_view_get_search_entry">
-        <return-value>
-          <type name="Entry" c:type="GtkEntry*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_search_entry"
-              c:identifier="gtk_tree_view_set_search_entry">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_search_position_func"
-              c:identifier="gtk_tree_view_get_search_position_func">
-        <return-value>
-          <type name="GtkTreeViewSearchPositionFunc"
-                  c:type="GtkTreeViewSearchPositionFunc"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_search_position_func"
-              c:identifier="gtk_tree_view_set_search_position_func">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeViewSearchPositionFunc"
-                    c:type="GtkTreeViewSearchPositionFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_widget_to_tree_coords"
-              c:identifier="gtk_tree_view_convert_widget_to_tree_coords">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="wx">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="wy">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="tx">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="ty">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_tree_to_widget_coords"
-              c:identifier="gtk_tree_view_convert_tree_to_widget_coords">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="tx">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="ty">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="wx">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="wy">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_widget_to_bin_window_coords"
-              c:identifier="gtk_tree_view_convert_widget_to_bin_window_coords">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="wx">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="wy">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="bx">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="by">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_bin_window_to_widget_coords"
-              c:identifier="gtk_tree_view_convert_bin_window_to_widget_coords">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="bx">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="by">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="wx">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="wy">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_tree_to_bin_window_coords"
-              c:identifier="gtk_tree_view_convert_tree_to_bin_window_coords">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="tx">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="ty">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="bx">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="by">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_bin_window_to_tree_coords"
-              c:identifier="gtk_tree_view_convert_bin_window_to_tree_coords">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="bx">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="by">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="tx">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="ty">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_destroy_count_func"
-              c:identifier="gtk_tree_view_set_destroy_count_func">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeDestroyCountFunc"
-                    c:type="GtkTreeDestroyCountFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_fixed_height_mode"
-              c:identifier="gtk_tree_view_set_fixed_height_mode">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="enable">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_fixed_height_mode"
-              c:identifier="gtk_tree_view_get_fixed_height_mode">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_hover_selection"
-              c:identifier="gtk_tree_view_set_hover_selection">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="hover">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_hover_selection"
-              c:identifier="gtk_tree_view_get_hover_selection">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_hover_expand"
-              c:identifier="gtk_tree_view_set_hover_expand">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="expand">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_hover_expand"
-              c:identifier="gtk_tree_view_get_hover_expand">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_rubber_banding"
-              c:identifier="gtk_tree_view_set_rubber_banding">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="enable">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_rubber_banding"
-              c:identifier="gtk_tree_view_get_rubber_banding">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="is_rubber_banding_active"
-              c:identifier="gtk_tree_view_is_rubber_banding_active">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_row_separator_func"
-              c:identifier="gtk_tree_view_get_row_separator_func">
-        <return-value>
-          <type name="GtkTreeViewRowSeparatorFunc"
-                  c:type="GtkTreeViewRowSeparatorFunc"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_row_separator_func"
-              c:identifier="gtk_tree_view_set_row_separator_func">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeViewRowSeparatorFunc"
-                    c:type="GtkTreeViewRowSeparatorFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_grid_lines" c:identifier="gtk_tree_view_get_grid_lines">
-        <return-value>
-          <type name="TreeViewGridLines" c:type="GtkTreeViewGridLines"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_grid_lines" c:identifier="gtk_tree_view_set_grid_lines">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="grid_lines">
-            <type name="TreeViewGridLines" c:type="GtkTreeViewGridLines"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_enable_tree_lines"
-              c:identifier="gtk_tree_view_get_enable_tree_lines">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_enable_tree_lines"
-              c:identifier="gtk_tree_view_set_enable_tree_lines">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="enabled">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_show_expanders"
-              c:identifier="gtk_tree_view_set_show_expanders">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="enabled">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_show_expanders"
-              c:identifier="gtk_tree_view_get_show_expanders">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_level_indentation"
-              c:identifier="gtk_tree_view_set_level_indentation">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="indentation">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_level_indentation"
-              c:identifier="gtk_tree_view_get_level_indentation">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_tooltip_row"
-              c:identifier="gtk_tree_view_set_tooltip_row">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="tooltip">
-            <type name="GtkTooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_tooltip_cell"
-              c:identifier="gtk_tree_view_set_tooltip_cell">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="tooltip">
-            <type name="GtkTooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_tooltip_context"
-              c:identifier="gtk_tree_view_get_tooltip_context">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="keyboard_tip">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel**"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_tooltip_column"
-              c:identifier="gtk_tree_view_set_tooltip_column">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_tooltip_column"
-              c:identifier="gtk_tree_view_get_tooltip_column">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
-      </property>
-      <property name="hadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="vadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="headers-visible">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="headers-clickable">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="expander-column">
-        <type name="GtkTreeViewColumn" c:type="GtkTreeViewColumn"/>
-      </property>
-      <property name="reorderable">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="rules-hint">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="enable-search">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="search-column">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="fixed-height-mode">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="hover-selection">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="hover-expand">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="show-expanders">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="level-indentation">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="rubber-banding">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="enable-grid-lines">
-        <type name="GtkTreeViewGridLines" c:type="GtkTreeViewGridLines"/>
-      </property>
-      <property name="enable-tree-lines">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="tooltip-column">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <callback name="set_scroll_adjustments">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="hadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
-          </parameter>
-          <parameter name="vadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="row_activated">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="test_expand_row">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="test_collapse_row">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="row_expanded">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="row_collapsed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="columns_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="cursor_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="move_cursor">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="step">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_all">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="unselect_all">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_cursor_row">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="start_editing">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="toggle_cursor_row">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="expand_collapse_cursor_row">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="logical">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="expand">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="open_all">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_cursor_parent">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="start_interactive_search">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved0">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="move-cursor">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="set-scroll-adjustments">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="row-activated">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkTreeViewColumn" c:type="GtkTreeViewColumn"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="test-expand-row">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="test-collapse-row">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="row-expanded">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="row-collapsed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="columns-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="cursor-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="select-all">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="unselect-all">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="select-cursor-row">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="toggle-cursor-row">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="expand-collapse-cursor-row">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="select-cursor-parent">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="start-interactive-search">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="tree_view_new" c:identifier="gtk_tree_view_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="tree_view_new_with_model"
-              c:identifier="gtk_tree_view_new_with_model">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <callback name="GtkTreeDestroyCountFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_view">
-          <type name="GtkTreeView*" c:type="GtkTreeView*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-        </parameter>
-        <parameter name="children">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GtkComboBoxPrivate" c:type="GtkComboBoxPrivate"/>
-    <class name="ComboBox"
-           c:type="GtkComboBox"
-           parent="Bin"
-           glib:type-name="GtkComboBox"
-           glib:get-type="gtk_combo_box_get_type">
-      <method name="get_wrap_width" c:identifier="gtk_combo_box_get_wrap_width">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_wrap_width" c:identifier="gtk_combo_box_set_wrap_width">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_row_span_column"
-              c:identifier="gtk_combo_box_get_row_span_column">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_row_span_column"
-              c:identifier="gtk_combo_box_set_row_span_column">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="row_span">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_column_span_column"
-              c:identifier="gtk_combo_box_get_column_span_column">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_column_span_column"
-              c:identifier="gtk_combo_box_set_column_span_column">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="column_span">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_add_tearoffs"
-              c:identifier="gtk_combo_box_get_add_tearoffs">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_add_tearoffs"
-              c:identifier="gtk_combo_box_set_add_tearoffs">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="add_tearoffs">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_title" c:identifier="gtk_combo_box_get_title">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_title" c:identifier="gtk_combo_box_set_title">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="title">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_focus_on_click"
-              c:identifier="gtk_combo_box_get_focus_on_click">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_focus_on_click"
-              c:identifier="gtk_combo_box_set_focus_on_click">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="focus_on_click">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_active" c:identifier="gtk_combo_box_get_active">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_active" c:identifier="gtk_combo_box_set_active">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="index_">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_active_iter"
-              c:identifier="gtk_combo_box_get_active_iter">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_active_iter"
-              c:identifier="gtk_combo_box_set_active_iter">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_model" c:identifier="gtk_combo_box_set_model">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_model" c:identifier="gtk_combo_box_get_model">
-        <return-value>
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_row_separator_func"
-              c:identifier="gtk_combo_box_get_row_separator_func">
-        <return-value>
-          <type name="GtkTreeViewRowSeparatorFunc"
-                  c:type="GtkTreeViewRowSeparatorFunc"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_row_separator_func"
-              c:identifier="gtk_combo_box_set_row_separator_func">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeViewRowSeparatorFunc"
-                    c:type="GtkTreeViewRowSeparatorFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="append_text" c:identifier="gtk_combo_box_append_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="insert_text" c:identifier="gtk_combo_box_insert_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="prepend_text" c:identifier="gtk_combo_box_prepend_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove_text" c:identifier="gtk_combo_box_remove_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_active_text"
-              c:identifier="gtk_combo_box_get_active_text">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="popup" c:identifier="gtk_combo_box_popup">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="popdown" c:identifier="gtk_combo_box_popdown">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_popup_accessible"
-              c:identifier="gtk_combo_box_get_popup_accessible">
-        <return-value>
-          <type name="Atk.Object" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
-      </property>
-      <property name="wrap-width">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="row-span-column">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="column-span-column">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="active">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="add-tearoffs">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="tearoff-title">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="has-frame">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="focus-on-click">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="popup-shown">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <callback name="changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="GtkComboBox*" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_active_text">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="GtkComboBox*" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved0">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="move-active">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="popup">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="popdown">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="combo_box_new" c:identifier="gtk_combo_box_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="combo_box_new_with_model"
-              c:identifier="gtk_combo_box_new_with_model">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="combo_box_new_text" c:identifier="gtk_combo_box_new_text">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="combo_box_editing_canceled"
-              c:identifier="_gtk_combo_box_editing_canceled">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="combo_box">
-          <type name="ComboBox" c:type="GtkComboBox*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkComboBoxEntryPrivate" c:type="GtkComboBoxEntryPrivate"/>
-    <class name="ComboBoxEntry"
-           c:type="GtkComboBoxEntry"
-           parent="ComboBox"
-           glib:type-name="GtkComboBoxEntry"
-           glib:get-type="gtk_combo_box_entry_get_type">
-      <method name="set_text_column"
-              c:identifier="gtk_combo_box_entry_set_text_column">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry_box">
-            <type name="ComboBoxEntry" c:type="GtkComboBoxEntry*"/>
-          </parameter>
-          <parameter name="text_column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_text_column"
-              c:identifier="gtk_combo_box_entry_get_text_column">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry_box">
-            <type name="ComboBoxEntry" c:type="GtkComboBoxEntry*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="text-column">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <callback name="_gtk_reserved0">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <function name="combo_box_entry_new" c:identifier="gtk_combo_box_entry_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="combo_box_entry_new_with_model"
-              c:identifier="gtk_combo_box_entry_new_with_model">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="text_column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="combo_box_entry_new_text"
-              c:identifier="gtk_combo_box_entry_new_text">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="DrawingArea"
-           c:type="GtkDrawingArea"
-           parent="Widget"
-           glib:type-name="GtkDrawingArea"
-           glib:get-type="gtk_drawing_area_get_type">
-      <method name="size" c:identifier="gtk_drawing_area_size">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="darea">
-            <type name="DrawingArea" c:type="GtkDrawingArea*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="height">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <function name="drawing_area_new" c:identifier="gtk_drawing_area_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="Curve"
-           c:type="GtkCurve"
-           parent="DrawingArea"
-           glib:type-name="GtkCurve"
-           glib:get-type="gtk_curve_get_type">
-      <method name="reset" c:identifier="gtk_curve_reset">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="curve">
-            <type name="Curve" c:type="GtkCurve*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_gamma" c:identifier="gtk_curve_set_gamma">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="curve">
-            <type name="Curve" c:type="GtkCurve*"/>
-          </parameter>
-          <parameter name="gamma_">
-            <type name="gfloat" c:type="gfloat"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_range" c:identifier="gtk_curve_set_range">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="curve">
-            <type name="Curve" c:type="GtkCurve*"/>
-          </parameter>
-          <parameter name="min_x">
-            <type name="gfloat" c:type="gfloat"/>
-          </parameter>
-          <parameter name="max_x">
-            <type name="gfloat" c:type="gfloat"/>
-          </parameter>
-          <parameter name="min_y">
-            <type name="gfloat" c:type="gfloat"/>
-          </parameter>
-          <parameter name="max_y">
-            <type name="gfloat" c:type="gfloat"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_vector" c:identifier="gtk_curve_get_vector">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="curve">
-            <type name="Curve" c:type="GtkCurve*"/>
-          </parameter>
-          <parameter name="veclen">
-            <type name="int" c:type="int"/>
-          </parameter>
-          <parameter name="vector">
-            <type name="gfloat" c:type="gfloat"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_vector" c:identifier="gtk_curve_set_vector">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="curve">
-            <type name="Curve" c:type="GtkCurve*"/>
-          </parameter>
-          <parameter name="veclen">
-            <type name="int" c:type="int"/>
-          </parameter>
-          <parameter name="vector">
-            <type name="gfloat" c:type="gfloat"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_curve_type" c:identifier="gtk_curve_set_curve_type">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="curve">
-            <type name="Curve" c:type="GtkCurve*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="CurveType" c:type="GtkCurveType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="curve-type">
-        <type name="GtkCurveType" c:type="GtkCurveType"/>
-      </property>
-      <property name="min-x">
-        <type name="gfloat" c:type="gfloat"/>
-      </property>
-      <property name="max-x">
-        <type name="gfloat" c:type="gfloat"/>
-      </property>
-      <property name="min-y">
-        <type name="gfloat" c:type="gfloat"/>
-      </property>
-      <property name="max-y">
-        <type name="gfloat" c:type="gfloat"/>
-      </property>
-      <callback name="curve_type_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="curve">
-            <type name="GtkCurve*" c:type="GtkCurve*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="curve-type-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="curve_new" c:identifier="gtk_curve_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="EventBox"
-           c:type="GtkEventBox"
-           parent="Bin"
-           glib:type-name="GtkEventBox"
-           glib:get-type="gtk_event_box_get_type">
-      <method name="get_visible_window"
-              c:identifier="gtk_event_box_get_visible_window">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="event_box">
-            <type name="EventBox" c:type="GtkEventBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_visible_window"
-              c:identifier="gtk_event_box_set_visible_window">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="event_box">
-            <type name="EventBox" c:type="GtkEventBox*"/>
-          </parameter>
-          <parameter name="visible_window">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_above_child"
-              c:identifier="gtk_event_box_get_above_child">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="event_box">
-            <type name="EventBox" c:type="GtkEventBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_above_child"
-              c:identifier="gtk_event_box_set_above_child">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="event_box">
-            <type name="EventBox" c:type="GtkEventBox*"/>
-          </parameter>
-          <parameter name="above_child">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="visible-window">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="above-child">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-    </class>
-    <function name="event_box_new" c:identifier="gtk_event_box_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <record name="GtkExpanderPrivate" c:type="GtkExpanderPrivate"/>
-    <class name="Expander"
-           c:type="GtkExpander"
-           parent="Bin"
-           glib:type-name="GtkExpander"
-           glib:get-type="gtk_expander_get_type">
-      <method name="set_expanded" c:identifier="gtk_expander_set_expanded">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
-          </parameter>
-          <parameter name="expanded">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_expanded" c:identifier="gtk_expander_get_expanded">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_spacing" c:identifier="gtk_expander_set_spacing">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
-          </parameter>
-          <parameter name="spacing">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_spacing" c:identifier="gtk_expander_get_spacing">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_label" c:identifier="gtk_expander_set_label">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
-          </parameter>
-          <parameter name="label">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_label" c:identifier="gtk_expander_get_label">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_use_underline"
-              c:identifier="gtk_expander_set_use_underline">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
-          </parameter>
-          <parameter name="use_underline">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_use_underline"
-              c:identifier="gtk_expander_get_use_underline">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_use_markup" c:identifier="gtk_expander_set_use_markup">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
-          </parameter>
-          <parameter name="use_markup">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_use_markup" c:identifier="gtk_expander_get_use_markup">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_label_widget"
-              c:identifier="gtk_expander_set_label_widget">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
-          </parameter>
-          <parameter name="label_widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_label_widget"
-              c:identifier="gtk_expander_get_label_widget">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="expanded">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="label">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="use-underline">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="use-markup">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="spacing">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="label-widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
-      </property>
-      <callback name="activate">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="expander">
-            <type name="GtkExpander*" c:type="GtkExpander*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <glib:signal name="activate">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="expander_new" c:identifier="gtk_expander_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="expander_new_with_mnemonic"
-              c:identifier="gtk_expander_new_with_mnemonic">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkFixedChild" c:type="GtkFixedChild">
-      <field name="widget">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </field>
-      <field name="x">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="y">
-        <type name="gint" c:type="gint"/>
-      </field>
-    </record>
-    <class name="Fixed"
-           c:type="GtkFixed"
-           parent="Container"
-           glib:type-name="GtkFixed"
-           glib:get-type="gtk_fixed_get_type">
-      <method name="put" c:identifier="gtk_fixed_put">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="fixed">
-            <type name="Fixed" c:type="GtkFixed*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="move" c:identifier="gtk_fixed_move">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="fixed">
-            <type name="Fixed" c:type="GtkFixed*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_has_window" c:identifier="gtk_fixed_set_has_window">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="fixed">
-            <type name="Fixed" c:type="GtkFixed*"/>
-          </parameter>
-          <parameter name="has_window">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_has_window" c:identifier="gtk_fixed_get_has_window">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="fixed">
-            <type name="Fixed" c:type="GtkFixed*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </class>
-    <function name="fixed_new" c:identifier="gtk_fixed_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <record name="GtkFileFilterInfo" c:type="GtkFileFilterInfo">
-      <field name="contains">
-        <type name="GtkFileFilterFlags" c:type="GtkFileFilterFlags"/>
-      </field>
-      <field name="filename">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="uri">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="display_name">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="mime_type">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-    </record>
-    <callback name="GtkFileFilterFunc">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="filter_info">
-          <type name="GtkFileFilterInfo*" c:type="GtkFileFilterInfo*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="FileFilter"
-           c:type="GtkFileFilter"
-           parent="GtkObject"
-           glib:type-name="GtkFileFilter"
-           glib:get-type="gtk_file_filter_get_type">
-      <constructor name="new" c:identifier="gtk_file_filter_new">
-        <return-value>
-          <type name="FileFilter" c:type="GtkFileFilter*"/>
-        </return-value>
-      </constructor>
-      <method name="set_name" c:identifier="gtk_file_filter_set_name">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_name" c:identifier="gtk_file_filter_get_name">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_mime_type" c:identifier="gtk_file_filter_add_mime_type">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
-          </parameter>
-          <parameter name="mime_type">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_pattern" c:identifier="gtk_file_filter_add_pattern">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
-          </parameter>
-          <parameter name="pattern">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_pixbuf_formats"
-              c:identifier="gtk_file_filter_add_pixbuf_formats">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_custom" c:identifier="gtk_file_filter_add_custom">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
-          </parameter>
-          <parameter name="needed">
-            <type name="FileFilterFlags" c:type="GtkFileFilterFlags"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkFileFilterFunc" c:type="GtkFileFilterFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="notify">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_needed" c:identifier="gtk_file_filter_get_needed">
-        <return-value>
-          <type name="FileFilterFlags" c:type="GtkFileFilterFlags"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="filter" c:identifier="gtk_file_filter_filter">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
-          </parameter>
-          <parameter name="filter_info">
-            <type name="GtkFileFilterInfo" c:type="GtkFileFilterInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </class>
-    <record name="GtkFileChooser" c:type="GtkFileChooser"/>
-    <interface name="FileChooser"
-               c:type="GtkFileChooser"
-               glib:type-name="GtkFileChooser"
-               glib:get-type="gtk_file_chooser_get_type">
-      <property name="select-multiple">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="use-preview-label">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="file-system-backend">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="local-only">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="filter">
-        <type name="GtkFileFilter" c:type="GtkFileFilter"/>
-      </property>
-      <property name="extra-widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
-      </property>
-      <property name="action">
-        <type name="GtkFileChooserAction" c:type="GtkFileChooserAction"/>
-      </property>
-      <property name="preview-widget-active">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="do-overwrite-confirmation">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="preview-widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
-      </property>
-      <property name="show-hidden">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <glib:signal name="current-folder-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="selection-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="update-preview">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="file-activated">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="confirm-overwrite">
-        <return-value>
-          <type name="GtkFileChooserConfirmation"
-                  c:type="GtkFileChooserConfirmation"/>
-        </return-value>
-      </glib:signal>
-    </interface>
-    <function name="file_chooser_error_quark"
-              c:identifier="gtk_file_chooser_error_quark">
-      <return-value>
-        <type name="GQuark" c:type="GQuark"/>
-      </return-value>
-    </function>
-    <function name="file_chooser_set_action"
-              c:identifier="gtk_file_chooser_set_action">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="action">
-          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_action"
-              c:identifier="gtk_file_chooser_get_action">
-      <return-value>
-        <type name="GtkFileChooserAction" c:type="GtkFileChooserAction"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_local_only"
-              c:identifier="gtk_file_chooser_set_local_only">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="local_only">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_local_only"
-              c:identifier="gtk_file_chooser_get_local_only">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_select_multiple"
-              c:identifier="gtk_file_chooser_set_select_multiple">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="select_multiple">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_select_multiple"
-              c:identifier="gtk_file_chooser_get_select_multiple">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_show_hidden"
-              c:identifier="gtk_file_chooser_set_show_hidden">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="show_hidden">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_show_hidden"
-              c:identifier="gtk_file_chooser_get_show_hidden">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_do_overwrite_confirmation"
-              c:identifier="gtk_file_chooser_set_do_overwrite_confirmation">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="do_overwrite_confirmation">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_do_overwrite_confirmation"
-              c:identifier="gtk_file_chooser_get_do_overwrite_confirmation">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_current_name"
-              c:identifier="gtk_file_chooser_set_current_name">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_filename"
-              c:identifier="gtk_file_chooser_get_filename">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_filename"
-              c:identifier="gtk_file_chooser_set_filename">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="filename">
-          <type name="char" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_select_filename"
-              c:identifier="gtk_file_chooser_select_filename">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="filename">
-          <type name="char" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_unselect_filename"
-              c:identifier="gtk_file_chooser_unselect_filename">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="filename">
-          <type name="char" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_select_all"
-              c:identifier="gtk_file_chooser_select_all">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_unselect_all"
-              c:identifier="gtk_file_chooser_unselect_all">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_filenames"
-              c:identifier="gtk_file_chooser_get_filenames">
-      <return-value>
-        <type name="GSList*" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_current_folder"
-              c:identifier="gtk_file_chooser_set_current_folder">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="filename">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_current_folder"
-              c:identifier="gtk_file_chooser_get_current_folder">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_uri"
-              c:identifier="gtk_file_chooser_get_uri">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_uri"
-              c:identifier="gtk_file_chooser_set_uri">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="char" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_select_uri"
-              c:identifier="gtk_file_chooser_select_uri">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="char" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_unselect_uri"
-              c:identifier="gtk_file_chooser_unselect_uri">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="char" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_uris"
-              c:identifier="gtk_file_chooser_get_uris">
-      <return-value>
-        <type name="GSList*" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_current_folder_uri"
-              c:identifier="gtk_file_chooser_set_current_folder_uri">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_current_folder_uri"
-              c:identifier="gtk_file_chooser_get_current_folder_uri">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_preview_widget"
-              c:identifier="gtk_file_chooser_set_preview_widget">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="preview_widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_preview_widget"
-              c:identifier="gtk_file_chooser_get_preview_widget">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_preview_widget_active"
-              c:identifier="gtk_file_chooser_set_preview_widget_active">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="active">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_preview_widget_active"
-              c:identifier="gtk_file_chooser_get_preview_widget_active">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_use_preview_label"
-              c:identifier="gtk_file_chooser_set_use_preview_label">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="use_label">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_use_preview_label"
-              c:identifier="gtk_file_chooser_get_use_preview_label">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_preview_filename"
-              c:identifier="gtk_file_chooser_get_preview_filename">
-      <return-value>
-        <type name="char*" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_preview_uri"
-              c:identifier="gtk_file_chooser_get_preview_uri">
-      <return-value>
-        <type name="char*" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_extra_widget"
-              c:identifier="gtk_file_chooser_set_extra_widget">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="extra_widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_extra_widget"
-              c:identifier="gtk_file_chooser_get_extra_widget">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_add_filter"
-              c:identifier="gtk_file_chooser_add_filter">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="filter">
-          <type name="FileFilter" c:type="GtkFileFilter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_remove_filter"
-              c:identifier="gtk_file_chooser_remove_filter">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="filter">
-          <type name="FileFilter" c:type="GtkFileFilter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_list_filters"
-              c:identifier="gtk_file_chooser_list_filters">
-      <return-value>
-        <type name="GSList*" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_filter"
-              c:identifier="gtk_file_chooser_set_filter">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="filter">
-          <type name="FileFilter" c:type="GtkFileFilter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_filter"
-              c:identifier="gtk_file_chooser_get_filter">
-      <return-value>
-        <type name="GtkFileFilter*" c:type="GtkFileFilter*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_add_shortcut_folder"
-              c:identifier="gtk_file_chooser_add_shortcut_folder">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="folder">
-          <type name="char" c:type="char*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_remove_shortcut_folder"
-              c:identifier="gtk_file_chooser_remove_shortcut_folder">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="folder">
-          <type name="char" c:type="char*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_list_shortcut_folders"
-              c:identifier="gtk_file_chooser_list_shortcut_folders">
-      <return-value>
-        <type name="GSList*" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_add_shortcut_folder_uri"
-              c:identifier="gtk_file_chooser_add_shortcut_folder_uri">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="char" c:type="char*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_remove_shortcut_folder_uri"
-              c:identifier="gtk_file_chooser_remove_shortcut_folder_uri">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="char" c:type="char*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_list_shortcut_folder_uris"
-              c:identifier="gtk_file_chooser_list_shortcut_folder_uris">
-      <return-value>
-        <type name="GSList*" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="HBox"
-           c:type="GtkHBox"
-           parent="Box"
-           glib:type-name="GtkHBox"
-           glib:get-type="gtk_hbox_get_type">
-    </class>
-    <function name="hbox_new" c:identifier="gtk_hbox_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="homogeneous">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkFileChooserButtonPrivate"
-              c:type="GtkFileChooserButtonPrivate"/>
-    <class name="FileChooserButton"
-           c:type="GtkFileChooserButton"
-           parent="HBox"
-           glib:type-name="GtkFileChooserButton"
-           glib:get-type="gtk_file_chooser_button_get_type">
-      <method name="get_title" c:identifier="gtk_file_chooser_button_get_title">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_title" c:identifier="gtk_file_chooser_button_set_title">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
-          </parameter>
-          <parameter name="title">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_width_chars"
-              c:identifier="gtk_file_chooser_button_get_width_chars">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_width_chars"
-              c:identifier="gtk_file_chooser_button_set_width_chars">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
-          </parameter>
-          <parameter name="n_chars">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_focus_on_click"
-              c:identifier="gtk_file_chooser_button_get_focus_on_click">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_focus_on_click"
-              c:identifier="gtk_file_chooser_button_set_focus_on_click">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
-          </parameter>
-          <parameter name="focus_on_click">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="dialog">
-        <type name="GtkFileChooser" c:type="GtkFileChooser"/>
-      </property>
-      <property name="focus-on-click">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="title">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="width-chars">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <callback name="file_set">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="fc">
-            <type name="GtkFileChooserButton*" c:type="GtkFileChooserButton*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <field name="__gtk_reserved1">
-        <type name="void*" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved2">
-        <type name="void*" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved3">
-        <type name="void*" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved4">
-        <type name="void*" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved5">
-        <type name="void*" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved6">
-        <type name="void*" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved7">
-        <type name="void*" c:type="void*"/>
-      </field>
-      <glib:signal name="file-set">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="file_chooser_button_new"
-              c:identifier="gtk_file_chooser_button_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="title">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="action">
-          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_button_new_with_backend"
-              c:identifier="gtk_file_chooser_button_new_with_backend">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="title">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="action">
-          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
-        </parameter>
-        <parameter name="backend">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_button_new_with_dialog"
-              c:identifier="gtk_file_chooser_button_new_with_dialog">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="dialog">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkFileChooserDialogPrivate"
-              c:type="GtkFileChooserDialogPrivate"/>
-    <class name="FileChooserDialog"
-           c:type="GtkFileChooserDialog"
-           parent="Dialog"
-           glib:type-name="GtkFileChooserDialog"
-           glib:get-type="gtk_file_chooser_dialog_get_type">
-    </class>
-    <function name="file_chooser_dialog_new"
-              c:identifier="gtk_file_chooser_dialog_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="title">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="action">
-          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
-        </parameter>
-        <parameter name="first_button_text">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_dialog_new_with_backend"
-              c:identifier="gtk_file_chooser_dialog_new_with_backend">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="title">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="action">
-          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
-        </parameter>
-        <parameter name="backend">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="first_button_text">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkFileChooserWidgetPrivate"
-              c:type="GtkFileChooserWidgetPrivate"/>
-    <class name="FileChooserWidget"
-           c:type="GtkFileChooserWidget"
-           parent="VBox"
-           glib:type-name="GtkFileChooserWidget"
-           glib:get-type="gtk_file_chooser_widget_get_type">
-    </class>
-    <function name="file_chooser_widget_new"
-              c:identifier="gtk_file_chooser_widget_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_widget_new_with_backend"
-              c:identifier="gtk_file_chooser_widget_new_with_backend">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
-        </parameter>
-        <parameter name="backend">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkFontButtonPrivate" c:type="GtkFontButtonPrivate"/>
-    <class name="FontButton"
-           c:type="GtkFontButton"
-           parent="Button"
-           glib:type-name="GtkFontButton"
-           glib:get-type="gtk_font_button_get_type">
-      <method name="get_title" c:identifier="gtk_font_button_get_title">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_title" c:identifier="gtk_font_button_set_title">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-          <parameter name="title">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_use_font" c:identifier="gtk_font_button_get_use_font">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_use_font" c:identifier="gtk_font_button_set_use_font">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-          <parameter name="use_font">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_use_size" c:identifier="gtk_font_button_get_use_size">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_use_size" c:identifier="gtk_font_button_set_use_size">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-          <parameter name="use_size">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_font_name" c:identifier="gtk_font_button_get_font_name">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_font_name" c:identifier="gtk_font_button_set_font_name">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-          <parameter name="fontname">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_show_style"
-              c:identifier="gtk_font_button_get_show_style">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_show_style"
-              c:identifier="gtk_font_button_set_show_style">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-          <parameter name="show_style">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_show_size" c:identifier="gtk_font_button_get_show_size">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_show_size" c:identifier="gtk_font_button_set_show_size">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-          <parameter name="show_size">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="title">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="font-name">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="use-font">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="use-size">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="show-style">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="show-size">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <callback name="font_set">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="gfp">
-            <type name="GtkFontButton*" c:type="GtkFontButton*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="font-set">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="font_button_new" c:identifier="gtk_font_button_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="font_button_new_with_font"
-              c:identifier="gtk_font_button_new_with_font">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="fontname">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="FontSelection"
-           c:type="GtkFontSelection"
-           parent="VBox"
-           glib:type-name="GtkFontSelection"
-           glib:get-type="gtk_font_selection_get_type">
-      <method name="get_font_name"
-              c:identifier="gtk_font_selection_get_font_name">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="fontsel">
-            <type name="FontSelection" c:type="GtkFontSelection*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_font" c:identifier="gtk_font_selection_get_font">
-        <return-value>
-          <type name="GdkFont" c:type="GdkFont*"/>
-        </return-value>
-        <parameters>
-          <parameter name="fontsel">
-            <type name="FontSelection" c:type="GtkFontSelection*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_font_name"
-              c:identifier="gtk_font_selection_set_font_name">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="fontsel">
-            <type name="FontSelection" c:type="GtkFontSelection*"/>
-          </parameter>
-          <parameter name="fontname">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_preview_text"
-              c:identifier="gtk_font_selection_get_preview_text">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="fontsel">
-            <type name="FontSelection" c:type="GtkFontSelection*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_preview_text"
-              c:identifier="gtk_font_selection_set_preview_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="fontsel">
-            <type name="FontSelection" c:type="GtkFontSelection*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="font-name">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="font">
-        <type name="GdkFont" c:type="GdkFont"/>
-      </property>
-      <property name="preview-text">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <function name="font_selection_new" c:identifier="gtk_font_selection_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="FontSelectionDialog"
-           c:type="GtkFontSelectionDialog"
-           parent="Dialog"
-           glib:type-name="GtkFontSelectionDialog"
-           glib:get-type="gtk_font_selection_dialog_get_type">
-      <method name="get_font_name"
-              c:identifier="gtk_font_selection_dialog_get_font_name">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_font" c:identifier="gtk_font_selection_dialog_get_font">
-        <return-value>
-          <type name="GdkFont" c:type="GdkFont*"/>
-        </return-value>
-        <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_font_name"
-              c:identifier="gtk_font_selection_dialog_set_font_name">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
-          </parameter>
-          <parameter name="fontname">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_preview_text"
-              c:identifier="gtk_font_selection_dialog_get_preview_text">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_preview_text"
-              c:identifier="gtk_font_selection_dialog_set_preview_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <function name="font_selection_dialog_new"
-              c:identifier="gtk_font_selection_dialog_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="title">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="GammaCurve"
-           c:type="GtkGammaCurve"
-           parent="VBox"
-           glib:type-name="GtkGammaCurve"
-           glib:get-type="gtk_gamma_curve_get_type">
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <function name="gamma_curve_new" c:identifier="gtk_gamma_curve_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="gc_get" c:identifier="gtk_gc_get">
-      <return-value>
-        <type name="GdkGC*" c:type="GdkGC*"/>
-      </return-value>
-      <parameters>
-        <parameter name="depth">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="colormap">
-          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
-        </parameter>
-        <parameter name="values">
-          <type name="GdkGCValues" c:type="GdkGCValues*"/>
-        </parameter>
-        <parameter name="values_mask">
-          <type name="GdkGCValuesMask" c:type="GdkGCValuesMask"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="gc_release" c:identifier="gtk_gc_release">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="gc">
-          <type name="Gdk.GC" c:type="GdkGC*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="HandleBox"
-           c:type="GtkHandleBox"
-           parent="Bin"
-           glib:type-name="GtkHandleBox"
-           glib:get-type="gtk_handle_box_get_type">
-      <method name="set_shadow_type"
-              c:identifier="gtk_handle_box_set_shadow_type">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="ShadowType" c:type="GtkShadowType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_shadow_type"
-              c:identifier="gtk_handle_box_get_shadow_type">
-        <return-value>
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </return-value>
-        <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_handle_position"
-              c:identifier="gtk_handle_box_set_handle_position">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="PositionType" c:type="GtkPositionType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_handle_position"
-              c:identifier="gtk_handle_box_get_handle_position">
-        <return-value>
-          <type name="PositionType" c:type="GtkPositionType"/>
-        </return-value>
-        <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_snap_edge" c:identifier="gtk_handle_box_set_snap_edge">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
-          </parameter>
-          <parameter name="edge">
-            <type name="PositionType" c:type="GtkPositionType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_snap_edge" c:identifier="gtk_handle_box_get_snap_edge">
-        <return-value>
-          <type name="PositionType" c:type="GtkPositionType"/>
-        </return-value>
-        <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="shadow">
-        <type name="GtkShadowType" c:type="GtkShadowType"/>
-      </property>
-      <property name="shadow-type">
-        <type name="GtkShadowType" c:type="GtkShadowType"/>
-      </property>
-      <property name="handle-position">
-        <type name="GtkPositionType" c:type="GtkPositionType"/>
-      </property>
-      <property name="snap-edge">
-        <type name="GtkPositionType" c:type="GtkPositionType"/>
-      </property>
-      <property name="snap-edge-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <callback name="child_attached">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="handle_box">
-            <type name="GtkHandleBox*" c:type="GtkHandleBox*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="child_detached">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="handle_box">
-            <type name="GtkHandleBox*" c:type="GtkHandleBox*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="child-attached">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="child-detached">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <function name="handle_box_new" c:identifier="gtk_handle_box_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="HButtonBox"
-           c:type="GtkHButtonBox"
-           parent="ButtonBox"
-           glib:type-name="GtkHButtonBox"
-           glib:get-type="gtk_hbutton_box_get_type">
-    </class>
-    <function name="hbutton_box_new" c:identifier="gtk_hbutton_box_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="hbutton_box_get_spacing_default"
-              c:identifier="gtk_hbutton_box_get_spacing_default">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-    </function>
-    <function name="hbutton_box_get_layout_default"
-              c:identifier="gtk_hbutton_box_get_layout_default">
-      <return-value>
-        <type name="GtkButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
-      </return-value>
-    </function>
-    <function name="hbutton_box_set_spacing_default"
-              c:identifier="gtk_hbutton_box_set_spacing_default">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="spacing">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="hbutton_box_set_layout_default"
-              c:identifier="gtk_hbutton_box_set_layout_default">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="layout">
-          <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkPanedPrivate" c:type="GtkPanedPrivate"/>
-    <class name="Paned"
-           c:type="GtkPaned"
-           parent="Container"
-           glib:type-name="GtkPaned"
-           glib:get-type="gtk_paned_get_type">
-      <method name="add1" c:identifier="gtk_paned_add1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add2" c:identifier="gtk_paned_add2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="pack1" c:identifier="gtk_paned_pack1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="resize">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="shrink">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="pack2" c:identifier="gtk_paned_pack2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="resize">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="shrink">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_position" c:identifier="gtk_paned_get_position">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_position" c:identifier="gtk_paned_set_position">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_child1" c:identifier="gtk_paned_get_child1">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_child2" c:identifier="gtk_paned_get_child2">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="compute_position" c:identifier="gtk_paned_compute_position">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
-          </parameter>
-          <parameter name="allocation">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="child1_req">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="child2_req">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="position">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="position-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="min-position">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="max-position">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <callback name="cycle_child_focus">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="paned">
-            <type name="GtkPaned*" c:type="GtkPaned*"/>
-          </parameter>
-          <parameter name="reverse">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="toggle_handle_focus">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="paned">
-            <type name="GtkPaned*" c:type="GtkPaned*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="move_handle">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="paned">
-            <type name="GtkPaned*" c:type="GtkPaned*"/>
-          </parameter>
-          <parameter name="scroll">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="cycle_handle_focus">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="paned">
-            <type name="GtkPaned*" c:type="GtkPaned*"/>
-          </parameter>
-          <parameter name="reverse">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="accept_position">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="paned">
-            <type name="GtkPaned*" c:type="GtkPaned*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="cancel_position">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="paned">
-            <type name="GtkPaned*" c:type="GtkPaned*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="cycle-child-focus">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="toggle-handle-focus">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="move-handle">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="cycle-handle-focus">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="accept-position">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="cancel-position">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <class name="HPaned"
-           c:type="GtkHPaned"
-           parent="Paned"
-           glib:type-name="GtkHPaned"
-           glib:get-type="gtk_hpaned_get_type">
-    </class>
-    <function name="hpaned_new" c:identifier="gtk_hpaned_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <record name="GtkRulerMetric" c:type="GtkRulerMetric">
-      <field name="metric_name">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="abbrev">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="pixels_per_unit">
-        <type name="gdouble" c:type="gdouble"/>
-      </field>
-      <field name="ruler_scale">
-        <type name="gdouble" c:type="gdouble"/>
-      </field>
-      <field name="subdivide">
-        <type name="gint" c:type="gint"/>
-      </field>
-    </record>
-    <class name="Ruler"
-           c:type="GtkRuler"
-           parent="Widget"
-           glib:type-name="GtkRuler"
-           glib:get-type="gtk_ruler_get_type">
-      <method name="set_metric" c:identifier="gtk_ruler_set_metric">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
-          </parameter>
-          <parameter name="metric">
-            <type name="MetricType" c:type="GtkMetricType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_range" c:identifier="gtk_ruler_set_range">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
-          </parameter>
-          <parameter name="lower">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-          <parameter name="upper">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-          <parameter name="max_size">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="draw_ticks" c:identifier="gtk_ruler_draw_ticks">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="draw_pos" c:identifier="gtk_ruler_draw_pos">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_metric" c:identifier="gtk_ruler_get_metric">
-        <return-value>
-          <type name="MetricType" c:type="GtkMetricType"/>
-        </return-value>
-        <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_range" c:identifier="gtk_ruler_get_range">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
-          </parameter>
-          <parameter name="lower">
-            <type name="gdouble" c:type="gdouble*"/>
-          </parameter>
-          <parameter name="upper">
-            <type name="gdouble" c:type="gdouble*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gdouble" c:type="gdouble*"/>
-          </parameter>
-          <parameter name="max_size">
-            <type name="gdouble" c:type="gdouble*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="lower">
-        <type name="gdouble" c:type="gdouble"/>
-      </property>
-      <property name="upper">
-        <type name="gdouble" c:type="gdouble"/>
-      </property>
-      <property name="position">
-        <type name="gdouble" c:type="gdouble"/>
-      </property>
-      <property name="max-size">
-        <type name="gdouble" c:type="gdouble"/>
-      </property>
-      <property name="metric">
-        <type name="GtkMetricType" c:type="GtkMetricType"/>
-      </property>
-      <callback name="draw_ticks">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="ruler">
-            <type name="GtkRuler*" c:type="GtkRuler*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_pos">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="ruler">
-            <type name="GtkRuler*" c:type="GtkRuler*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <class name="HRuler"
-           c:type="GtkHRuler"
-           parent="Ruler"
-           glib:type-name="GtkHRuler"
-           glib:get-type="gtk_hruler_get_type">
-    </class>
-    <function name="hruler_new" c:identifier="gtk_hruler_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <record name="GtkRangeLayout" c:type="GtkRangeLayout"/>
-    <record name="GtkRangeStepTimer" c:type="GtkRangeStepTimer"/>
-    <class name="Range"
-           c:type="GtkRange"
-           parent="Widget"
-           glib:type-name="GtkRange"
-           glib:get-type="gtk_range_get_type">
-      <method name="set_update_policy"
-              c:identifier="gtk_range_set_update_policy">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="policy">
-            <type name="UpdateType" c:type="GtkUpdateType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_update_policy"
-              c:identifier="gtk_range_get_update_policy">
-        <return-value>
-          <type name="UpdateType" c:type="GtkUpdateType"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_adjustment" c:identifier="gtk_range_set_adjustment">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_adjustment" c:identifier="gtk_range_get_adjustment">
-        <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_inverted" c:identifier="gtk_range_set_inverted">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_inverted" c:identifier="gtk_range_get_inverted">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_lower_stepper_sensitivity"
-              c:identifier="gtk_range_set_lower_stepper_sensitivity">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="sensitivity">
-            <type name="SensitivityType" c:type="GtkSensitivityType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_lower_stepper_sensitivity"
-              c:identifier="gtk_range_get_lower_stepper_sensitivity">
-        <return-value>
-          <type name="SensitivityType" c:type="GtkSensitivityType"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_upper_stepper_sensitivity"
-              c:identifier="gtk_range_set_upper_stepper_sensitivity">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="sensitivity">
-            <type name="SensitivityType" c:type="GtkSensitivityType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_upper_stepper_sensitivity"
-              c:identifier="gtk_range_get_upper_stepper_sensitivity">
-        <return-value>
-          <type name="SensitivityType" c:type="GtkSensitivityType"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_increments" c:identifier="gtk_range_set_increments">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="step">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-          <parameter name="page">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_range" c:identifier="gtk_range_set_range">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="min">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-          <parameter name="max">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_value" c:identifier="gtk_range_set_value">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_value" c:identifier="gtk_range_get_value">
-        <return-value>
-          <type name="gdouble" c:type="gdouble"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_show_fill_level"
-              c:identifier="gtk_range_set_show_fill_level">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="show_fill_level">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_show_fill_level"
-              c:identifier="gtk_range_get_show_fill_level">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_restrict_to_fill_level"
-              c:identifier="gtk_range_set_restrict_to_fill_level">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="restrict_to_fill_level">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_restrict_to_fill_level"
-              c:identifier="gtk_range_get_restrict_to_fill_level">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_fill_level" c:identifier="gtk_range_set_fill_level">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="fill_level">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_fill_level" c:identifier="gtk_range_get_fill_level">
-        <return-value>
-          <type name="gdouble" c:type="gdouble"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="update-policy">
-        <type name="GtkUpdateType" c:type="GtkUpdateType"/>
-      </property>
-      <property name="adjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="inverted">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="lower-stepper-sensitivity">
-        <type name="GtkSensitivityType" c:type="GtkSensitivityType"/>
-      </property>
-      <property name="upper-stepper-sensitivity">
-        <type name="GtkSensitivityType" c:type="GtkSensitivityType"/>
-      </property>
-      <property name="show-fill-level">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="restrict-to-fill-level">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="fill-level">
-        <type name="gdouble" c:type="gdouble"/>
-      </property>
-      <field name="slider_detail">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="stepper_detail">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <callback name="value_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="GtkRange*" c:type="GtkRange*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="adjust_bounds">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="GtkRange*" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="new_value">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="move_slider">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="GtkRange*" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="scroll">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_range_border">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="GtkRange*" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="border_">
-            <type name="GtkBorder*" c:type="GtkBorder*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="change_value">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="GtkRange*" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="scroll">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
-          </parameter>
-          <parameter name="new_value">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="value-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="adjust-bounds">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="move-slider">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="change-value">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <function name="range_get_wheel_delta"
-              c:identifier="_gtk_range_get_wheel_delta">
-      <return-value>
-        <type name="gdouble" c:type="gdouble"/>
-      </return-value>
-      <parameters>
-        <parameter name="range">
-          <type name="Range" c:type="GtkRange*"/>
-        </parameter>
-        <parameter name="direction">
-          <type name="GdkScrollDirection" c:type="GdkScrollDirection"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Scale"
-           c:type="GtkScale"
-           parent="Range"
-           glib:type-name="GtkScale"
-           glib:get-type="gtk_scale_get_type">
-      <method name="set_digits" c:identifier="gtk_scale_set_digits">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
-          </parameter>
-          <parameter name="digits">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_digits" c:identifier="gtk_scale_get_digits">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_draw_value" c:identifier="gtk_scale_set_draw_value">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
-          </parameter>
-          <parameter name="draw_value">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_draw_value" c:identifier="gtk_scale_get_draw_value">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_value_pos" c:identifier="gtk_scale_set_value_pos">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
-          </parameter>
-          <parameter name="pos">
-            <type name="PositionType" c:type="GtkPositionType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_value_pos" c:identifier="gtk_scale_get_value_pos">
-        <return-value>
-          <type name="PositionType" c:type="GtkPositionType"/>
-        </return-value>
-        <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_layout" c:identifier="gtk_scale_get_layout">
-        <return-value>
-          <type name="Pango.Layout" c:type="PangoLayout*"/>
-        </return-value>
-        <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_layout_offsets"
-              c:identifier="gtk_scale_get_layout_offsets">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="digits">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="draw-value">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="value-pos">
-        <type name="GtkPositionType" c:type="GtkPositionType"/>
-      </property>
-      <callback name="format_value">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="scale">
-            <type name="GtkScale*" c:type="GtkScale*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_value">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="scale">
-            <type name="GtkScale*" c:type="GtkScale*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_layout_offsets">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="scale">
-            <type name="GtkScale*" c:type="GtkScale*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="format-value">
-        <return-value>
-          <type name="gchararray" c:type="gchararray"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <function name="scale_clear_layout" c:identifier="_gtk_scale_clear_layout">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="scale">
-          <type name="Scale" c:type="GtkScale*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="scale_get_value_size"
-              c:identifier="_gtk_scale_get_value_size">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="scale">
-          <type name="Scale" c:type="GtkScale*"/>
-        </parameter>
-        <parameter name="width">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="height">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="scale_format_value" c:identifier="_gtk_scale_format_value">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="scale">
-          <type name="Scale" c:type="GtkScale*"/>
-        </parameter>
-        <parameter name="value">
-          <type name="gdouble" c:type="gdouble"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="HScale"
-           c:type="GtkHScale"
-           parent="Scale"
-           glib:type-name="GtkHScale"
-           glib:get-type="gtk_hscale_get_type">
-    </class>
-    <function name="hscale_new" c:identifier="gtk_hscale_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="adjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="hscale_new_with_range"
-              c:identifier="gtk_hscale_new_with_range">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="min">
-          <type name="gdouble" c:type="gdouble"/>
-        </parameter>
-        <parameter name="max">
-          <type name="gdouble" c:type="gdouble"/>
-        </parameter>
-        <parameter name="step">
-          <type name="gdouble" c:type="gdouble"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Scrollbar"
-           c:type="GtkScrollbar"
-           parent="Range"
-           glib:type-name="GtkScrollbar"
-           glib:get-type="gtk_scrollbar_get_type">
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <class name="HScrollbar"
-           c:type="GtkHScrollbar"
-           parent="Scrollbar"
-           glib:type-name="GtkHScrollbar"
-           glib:get-type="gtk_hscrollbar_get_type">
-    </class>
-    <function name="hscrollbar_new" c:identifier="gtk_hscrollbar_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="adjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Separator"
-           c:type="GtkSeparator"
-           parent="Widget"
-           glib:type-name="GtkSeparator"
-           glib:get-type="gtk_separator_get_type">
-    </class>
-    <class name="HSeparator"
-           c:type="GtkHSeparator"
-           parent="Separator"
-           glib:type-name="GtkHSeparator"
-           glib:get-type="gtk_hseparator_get_type">
-    </class>
-    <function name="hseparator_new" c:identifier="gtk_hseparator_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="IconFactory"
-           c:type="GtkIconFactory"
-           parent="GLib.Object"
-           glib:type-name="GtkIconFactory"
-           glib:get-type="gtk_icon_factory_get_type">
-      <constructor name="new" c:identifier="gtk_icon_factory_new">
-        <return-value>
-          <type name="IconFactory" c:type="GtkIconFactory*"/>
-        </return-value>
-      </constructor>
-      <method name="add" c:identifier="gtk_icon_factory_add">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="factory">
-            <type name="IconFactory" c:type="GtkIconFactory*"/>
-          </parameter>
-          <parameter name="stock_id">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="icon_set">
-            <type name="GtkIconSet" c:type="GtkIconSet*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="lookup" c:identifier="gtk_icon_factory_lookup">
-        <return-value>
-          <type name="GtkIconSet" c:type="GtkIconSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="factory">
-            <type name="IconFactory" c:type="GtkIconFactory*"/>
-          </parameter>
-          <parameter name="stock_id">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_default" c:identifier="gtk_icon_factory_add_default">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="factory">
-            <type name="IconFactory" c:type="GtkIconFactory*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove_default"
-              c:identifier="gtk_icon_factory_remove_default">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="factory">
-            <type name="IconFactory" c:type="GtkIconFactory*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <function name="icon_factory_lookup_default"
-              c:identifier="gtk_icon_factory_lookup_default">
-      <return-value>
-        <type name="GtkIconSet*" c:type="GtkIconSet*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stock_id">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="icon_size_lookup" c:identifier="gtk_icon_size_lookup">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="size">
-          <type name="IconSize" c:type="GtkIconSize"/>
-        </parameter>
-        <parameter name="width">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="height">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="icon_size_lookup_for_settings"
-              c:identifier="gtk_icon_size_lookup_for_settings">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="settings">
-          <type name="Settings" c:type="GtkSettings*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="IconSize" c:type="GtkIconSize"/>
-        </parameter>
-        <parameter name="width">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="height">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="icon_size_register" c:identifier="gtk_icon_size_register">
-      <return-value>
-        <type name="GtkIconSize" c:type="GtkIconSize"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="width">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="icon_size_register_alias"
-              c:identifier="gtk_icon_size_register_alias">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="alias">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="target">
-          <type name="IconSize" c:type="GtkIconSize"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="icon_size_from_name" c:identifier="gtk_icon_size_from_name">
-      <return-value>
-        <type name="GtkIconSize" c:type="GtkIconSize"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="icon_size_get_name" c:identifier="gtk_icon_size_get_name">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="size">
-          <type name="IconSize" c:type="GtkIconSize"/>
-        </parameter>
-      </parameters>
-    </function>
-    <glib:boxed c:type="IconSet"
-                glib:name="IconSet"
-                glib:type-name="GtkIconSet"
-                glib:get-type="gtk_icon_set_get_type">
-      <constructor name="new" c:identifier="gtk_icon_set_new">
-        <return-value>
-          <type name="IconSet" c:type="GtkIconSet*"/>
-        </return-value>
-      </constructor>
-      <constructor name="new_from_pixbuf"
-                   c:identifier="gtk_icon_set_new_from_pixbuf">
-        <return-value>
-          <type name="IconSet" c:type="GtkIconSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="ref" c:identifier="gtk_icon_set_ref">
-        <return-value>
-          <type name="IconSet" c:type="GtkIconSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_icon_set_copy">
-        <return-value>
-          <type name="IconSet" c:type="GtkIconSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="unref" c:identifier="gtk_icon_set_unref">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="render_icon" c:identifier="gtk_icon_set_render_icon">
-        <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
-          </parameter>
-          <parameter name="style">
-            <type name="Style" c:type="GtkStyle*"/>
-          </parameter>
-          <parameter name="direction">
-            <type name="TextDirection" c:type="GtkTextDirection"/>
-          </parameter>
-          <parameter name="state">
-            <type name="StateType" c:type="GtkStateType"/>
-          </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="detail">
-            <type name="char" c:type="char*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_source" c:identifier="gtk_icon_set_add_source">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
-          </parameter>
-          <parameter name="source">
-            <type name="GtkIconSource" c:type="GtkIconSource*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_sizes" c:identifier="gtk_icon_set_get_sizes">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
-          </parameter>
-          <parameter name="sizes">
-            <type name="IconSize" c:type="GtkIconSize**"/>
-          </parameter>
-          <parameter name="n_sizes">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </glib:boxed>
-    <glib:boxed c:type="IconSource"
-                glib:name="IconSource"
-                glib:type-name="GtkIconSource"
-                glib:get-type="gtk_icon_source_get_type">
-      <constructor name="new" c:identifier="gtk_icon_source_new">
-        <return-value>
-          <type name="IconSource" c:type="GtkIconSource*"/>
-        </return-value>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_icon_source_copy">
-        <return-value>
-          <type name="IconSource" c:type="GtkIconSource*"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_icon_source_free">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_filename" c:identifier="gtk_icon_source_set_filename">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-          <parameter name="filename">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_icon_name" c:identifier="gtk_icon_source_set_icon_name">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-          <parameter name="icon_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_pixbuf" c:identifier="gtk_icon_source_set_pixbuf">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_filename" c:identifier="gtk_icon_source_get_filename">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_icon_name" c:identifier="gtk_icon_source_get_icon_name">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_pixbuf" c:identifier="gtk_icon_source_get_pixbuf">
-        <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_direction_wildcarded"
-              c:identifier="gtk_icon_source_set_direction_wildcarded">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_state_wildcarded"
-              c:identifier="gtk_icon_source_set_state_wildcarded">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_size_wildcarded"
-              c:identifier="gtk_icon_source_set_size_wildcarded">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_size_wildcarded"
-              c:identifier="gtk_icon_source_get_size_wildcarded">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_state_wildcarded"
-              c:identifier="gtk_icon_source_get_state_wildcarded">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_direction_wildcarded"
-              c:identifier="gtk_icon_source_get_direction_wildcarded">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_direction" c:identifier="gtk_icon_source_set_direction">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-          <parameter name="direction">
-            <type name="TextDirection" c:type="GtkTextDirection"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_state" c:identifier="gtk_icon_source_set_state">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-          <parameter name="state">
-            <type name="StateType" c:type="GtkStateType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_size" c:identifier="gtk_icon_source_set_size">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_direction" c:identifier="gtk_icon_source_get_direction">
-        <return-value>
-          <type name="TextDirection" c:type="GtkTextDirection"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_state" c:identifier="gtk_icon_source_get_state">
-        <return-value>
-          <type name="StateType" c:type="GtkStateType"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_size" c:identifier="gtk_icon_source_get_size">
-        <return-value>
-          <type name="IconSize" c:type="GtkIconSize"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </glib:boxed>
-    <function name="icon_set_invalidate_caches"
-              c:identifier="_gtk_icon_set_invalidate_caches">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="icon_factory_list_ids"
-              c:identifier="_gtk_icon_factory_list_ids">
-      <return-value>
-        <type name="GList*" c:type="GList*"/>
-      </return-value>
-    </function>
-    <function name="icon_factory_ensure_default_icons"
-              c:identifier="_gtk_icon_factory_ensure_default_icons">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-    </function>
-    <record name="GtkIconThemePrivate" c:type="GtkIconThemePrivate"/>
-    <function name="icon_theme_error_quark"
-              c:identifier="gtk_icon_theme_error_quark">
-      <return-value>
-        <type name="GQuark" c:type="GQuark"/>
-      </return-value>
-    </function>
-    <class name="IconTheme"
-           c:type="GtkIconTheme"
-           parent="GLib.Object"
-           glib:type-name="GtkIconTheme"
-           glib:get-type="gtk_icon_theme_get_type">
-      <constructor name="new" c:identifier="gtk_icon_theme_new">
-        <return-value>
-          <type name="IconTheme" c:type="GtkIconTheme*"/>
-        </return-value>
-      </constructor>
-      <constructor name="get_default" c:identifier="gtk_icon_theme_get_default">
-        <return-value>
-          <type name="IconTheme" c:type="GtkIconTheme*"/>
-        </return-value>
-      </constructor>
-      <constructor name="get_for_screen"
-                   c:identifier="gtk_icon_theme_get_for_screen">
-        <return-value>
-          <type name="IconTheme" c:type="GtkIconTheme*"/>
-        </return-value>
-        <parameters>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="set_screen" c:identifier="gtk_icon_theme_set_screen">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_search_path"
-              c:identifier="gtk_icon_theme_set_search_path">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="n_elements">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_search_path"
-              c:identifier="gtk_icon_theme_get_search_path">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="gchar" c:type="gchar**"/>
-          </parameter>
-          <parameter name="n_elements">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="append_search_path"
-              c:identifier="gtk_icon_theme_append_search_path">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="prepend_search_path"
-              c:identifier="gtk_icon_theme_prepend_search_path">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_custom_theme"
-              c:identifier="gtk_icon_theme_set_custom_theme">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="theme_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="has_icon" c:identifier="gtk_icon_theme_has_icon">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="icon_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_icon_sizes"
-              c:identifier="gtk_icon_theme_get_icon_sizes">
-        <return-value>
-          <type name="gint" c:type="gint*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="icon_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="lookup_icon" c:identifier="gtk_icon_theme_lookup_icon">
-        <return-value>
-          <type name="GtkIconInfo" c:type="GtkIconInfo*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="icon_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="choose_icon" c:identifier="gtk_icon_theme_choose_icon">
-        <return-value>
-          <type name="GtkIconInfo" c:type="GtkIconInfo*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="icon_names">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="load_icon" c:identifier="gtk_icon_theme_load_icon">
-        <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="icon_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="lookup_by_gicon"
-              c:identifier="gtk_icon_theme_lookup_by_gicon">
-        <return-value>
-          <type name="GtkIconInfo" c:type="GtkIconInfo*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="icon">
-            <type name="GIcon" c:type="GIcon*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="list_icons" c:identifier="gtk_icon_theme_list_icons">
-        <return-value>
-          <type name="GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="context">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="list_contexts" c:identifier="gtk_icon_theme_list_contexts">
-        <return-value>
-          <type name="GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_example_icon_name"
-              c:identifier="gtk_icon_theme_get_example_icon_name">
-        <return-value>
-          <type name="char" c:type="char*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="rescan_if_needed"
-              c:identifier="gtk_icon_theme_rescan_if_needed">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <callback name="changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="GtkIconTheme*" c:type="GtkIconTheme*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <glib:signal name="changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="icon_theme_add_builtin_icon"
-              c:identifier="gtk_icon_theme_add_builtin_icon">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon_name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="pixbuf">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <glib:boxed c:type="IconInfo"
-                glib:name="IconInfo"
-                glib:type-name="GtkIconInfo"
-                glib:get-type="gtk_icon_info_get_type">
-      <constructor name="copy" c:identifier="gtk_icon_info_copy">
-        <return-value>
-          <type name="IconInfo" c:type="GtkIconInfo*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="new_for_pixbuf"
-                   c:identifier="gtk_icon_info_new_for_pixbuf">
-        <return-value>
-          <type name="IconInfo" c:type="GtkIconInfo*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_icon_info_free">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_base_size" c:identifier="gtk_icon_info_get_base_size">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_filename" c:identifier="gtk_icon_info_get_filename">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_builtin_pixbuf"
-              c:identifier="gtk_icon_info_get_builtin_pixbuf">
-        <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="load_icon" c:identifier="gtk_icon_info_load_icon">
-        <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_raw_coordinates"
-              c:identifier="gtk_icon_info_set_raw_coordinates">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
-          </parameter>
-          <parameter name="raw_coordinates">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_embedded_rect"
-              c:identifier="gtk_icon_info_get_embedded_rect">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
-          </parameter>
-          <parameter name="rectangle">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_attach_points"
-              c:identifier="gtk_icon_info_get_attach_points">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
-          </parameter>
-          <parameter name="points">
-            <type name="GdkPoint" c:type="GdkPoint**"/>
-          </parameter>
-          <parameter name="n_points">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_display_name"
-              c:identifier="gtk_icon_info_get_display_name">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </glib:boxed>
-    <function name="icon_theme_check_reload"
-              c:identifier="_gtk_icon_theme_check_reload">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="display">
-          <type name="Gdk.Display" c:type="GdkDisplay*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="icon_theme_ensure_builtin_cache"
-              c:identifier="_gtk_icon_theme_ensure_builtin_cache">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-    </function>
-    <class name="Tooltip"
-           c:type="GtkTooltip"
-           parent="GLib.Object"
-           glib:type-name="GtkTooltip"
-           glib:get-type="gtk_tooltip_get_type">
-      <method name="set_markup" c:identifier="gtk_tooltip_set_markup">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="markup">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_text" c:identifier="gtk_tooltip_set_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_icon" c:identifier="gtk_tooltip_set_icon">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_icon_from_stock"
-              c:identifier="gtk_tooltip_set_icon_from_stock">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="stock_id">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_icon_from_icon_name"
-              c:identifier="gtk_tooltip_set_icon_from_icon_name">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="icon_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_custom" c:identifier="gtk_tooltip_set_custom">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="custom_widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_tip_area" c:identifier="gtk_tooltip_set_tip_area">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </class>
-    <function name="tooltip_trigger_tooltip_query"
-              c:identifier="gtk_tooltip_trigger_tooltip_query">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="display">
-          <type name="Gdk.Display" c:type="GdkDisplay*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tooltip_focus_in" c:identifier="_gtk_tooltip_focus_in">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tooltip_focus_out" c:identifier="_gtk_tooltip_focus_out">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tooltip_toggle_keyboard_mode"
-              c:identifier="_gtk_tooltip_toggle_keyboard_mode">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tooltip_handle_event"
-              c:identifier="_gtk_tooltip_handle_event">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="event">
-          <type name="GdkEvent" c:type="GdkEvent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tooltip_hide" c:identifier="_gtk_tooltip_hide">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkIconViewPrivate" c:type="GtkIconViewPrivate"/>
-    <callback name="GtkIconViewForeachFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon_view">
-          <type name="GtkIconView*" c:type="GtkIconView*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="IconView"
-           c:type="GtkIconView"
-           parent="Container"
-           glib:type-name="GtkIconView"
-           glib:get-type="gtk_icon_view_get_type">
-      <method name="set_model" c:identifier="gtk_icon_view_set_model">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_model" c:identifier="gtk_icon_view_get_model">
-        <return-value>
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_text_column"
-              c:identifier="gtk_icon_view_set_text_column">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_text_column"
-              c:identifier="gtk_icon_view_get_text_column">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_markup_column"
-              c:identifier="gtk_icon_view_set_markup_column">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_markup_column"
-              c:identifier="gtk_icon_view_get_markup_column">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_pixbuf_column"
-              c:identifier="gtk_icon_view_set_pixbuf_column">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_pixbuf_column"
-              c:identifier="gtk_icon_view_get_pixbuf_column">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_orientation"
-              c:identifier="gtk_icon_view_set_orientation">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="orientation">
-            <type name="Orientation" c:type="GtkOrientation"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_orientation"
-              c:identifier="gtk_icon_view_get_orientation">
-        <return-value>
-          <type name="Orientation" c:type="GtkOrientation"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_columns" c:identifier="gtk_icon_view_set_columns">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="columns">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_columns" c:identifier="gtk_icon_view_get_columns">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_item_width" c:identifier="gtk_icon_view_set_item_width">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="item_width">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_item_width" c:identifier="gtk_icon_view_get_item_width">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_spacing" c:identifier="gtk_icon_view_set_spacing">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="spacing">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_spacing" c:identifier="gtk_icon_view_get_spacing">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_row_spacing"
-              c:identifier="gtk_icon_view_set_row_spacing">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="row_spacing">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_row_spacing"
-              c:identifier="gtk_icon_view_get_row_spacing">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_column_spacing"
-              c:identifier="gtk_icon_view_set_column_spacing">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="column_spacing">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_column_spacing"
-              c:identifier="gtk_icon_view_get_column_spacing">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_margin" c:identifier="gtk_icon_view_set_margin">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="margin">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_margin" c:identifier="gtk_icon_view_get_margin">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_path_at_pos"
-              c:identifier="gtk_icon_view_get_path_at_pos">
-        <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_item_at_pos"
-              c:identifier="gtk_icon_view_get_item_at_pos">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer**"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_visible_range"
-              c:identifier="gtk_icon_view_get_visible_range">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="start_path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="end_path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="selected_foreach"
-              c:identifier="gtk_icon_view_selected_foreach">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkIconViewForeachFunc"
-                    c:type="GtkIconViewForeachFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_selection_mode"
-              c:identifier="gtk_icon_view_set_selection_mode">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="mode">
-            <type name="SelectionMode" c:type="GtkSelectionMode"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_selection_mode"
-              c:identifier="gtk_icon_view_get_selection_mode">
-        <return-value>
-          <type name="SelectionMode" c:type="GtkSelectionMode"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="select_path" c:identifier="gtk_icon_view_select_path">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unselect_path" c:identifier="gtk_icon_view_unselect_path">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="path_is_selected"
-              c:identifier="gtk_icon_view_path_is_selected">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_selected_items"
-              c:identifier="gtk_icon_view_get_selected_items">
-        <return-value>
-          <type name="GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="select_all" c:identifier="gtk_icon_view_select_all">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unselect_all" c:identifier="gtk_icon_view_unselect_all">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="item_activated" c:identifier="gtk_icon_view_item_activated">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_cursor" c:identifier="gtk_icon_view_set_cursor">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="start_editing">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_cursor" c:identifier="gtk_icon_view_get_cursor">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer**"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="scroll_to_path" c:identifier="gtk_icon_view_scroll_to_path">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="use_align">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="row_align">
-            <type name="gfloat" c:type="gfloat"/>
-          </parameter>
-          <parameter name="col_align">
-            <type name="gfloat" c:type="gfloat"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="enable_model_drag_source"
-              c:identifier="gtk_icon_view_enable_model_drag_source">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="start_button_mask">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="actions">
-            <type name="GdkDragAction" c:type="GdkDragAction"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="enable_model_drag_dest"
-              c:identifier="gtk_icon_view_enable_model_drag_dest">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="actions">
-            <type name="GdkDragAction" c:type="GdkDragAction"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unset_model_drag_source"
-              c:identifier="gtk_icon_view_unset_model_drag_source">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unset_model_drag_dest"
-              c:identifier="gtk_icon_view_unset_model_drag_dest">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_reorderable"
-              c:identifier="gtk_icon_view_set_reorderable">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="reorderable">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_reorderable"
-              c:identifier="gtk_icon_view_get_reorderable">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_drag_dest_item"
-              c:identifier="gtk_icon_view_set_drag_dest_item">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="pos">
-            <type name="IconViewDropPosition"
-                    c:type="GtkIconViewDropPosition"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_drag_dest_item"
-              c:identifier="gtk_icon_view_get_drag_dest_item">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="pos">
-            <type name="IconViewDropPosition"
-                    c:type="GtkIconViewDropPosition*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_dest_item_at_pos"
-              c:identifier="gtk_icon_view_get_dest_item_at_pos">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="drag_x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="drag_y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="pos">
-            <type name="IconViewDropPosition"
-                    c:type="GtkIconViewDropPosition*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="create_drag_icon"
-              c:identifier="gtk_icon_view_create_drag_icon">
-        <return-value>
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_widget_to_bin_window_coords"
-              c:identifier="gtk_icon_view_convert_widget_to_bin_window_coords">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="wx">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="wy">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="bx">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="by">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_tooltip_item"
-              c:identifier="gtk_icon_view_set_tooltip_item">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_tooltip_cell"
-              c:identifier="gtk_icon_view_set_tooltip_cell">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_tooltip_context"
-              c:identifier="gtk_icon_view_get_tooltip_context">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="keyboard_tip">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel**"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_tooltip_column"
-              c:identifier="gtk_icon_view_set_tooltip_column">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_tooltip_column"
-              c:identifier="gtk_icon_view_get_tooltip_column">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="pixbuf-column">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="text-column">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="markup-column">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="selection-mode">
-        <type name="GtkSelectionMode" c:type="GtkSelectionMode"/>
-      </property>
-      <property name="orientation">
-        <type name="GtkOrientation" c:type="GtkOrientation"/>
-      </property>
-      <property name="model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
-      </property>
-      <property name="columns">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="item-width">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="spacing">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="row-spacing">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="column-spacing">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="margin">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="reorderable">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="tooltip-column">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <callback name="set_scroll_adjustments">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="hadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
-          </parameter>
-          <parameter name="vadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="item_activated">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="selection_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_all">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="unselect_all">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_cursor_item">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="toggle_cursor_item">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="move_cursor">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="step">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="activate_cursor_item">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <glib:signal name="move-cursor">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="set-scroll-adjustments">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="select-all">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="unselect-all">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="selection-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="item-activated">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="select-cursor-item">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="toggle-cursor-item">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="activate-cursor-item">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="icon_view_new" c:identifier="gtk_icon_view_new">
+    </function>
+    <function name="clist_get_column_widget"
+              c:identifier="gtk_clist_get_column_widget">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_column_justification"
+              c:identifier="gtk_clist_set_column_justification">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="justification">
+          <type name="Justification" c:type="GtkJustification"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_column_visibility"
+              c:identifier="gtk_clist_set_column_visibility">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="visible">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_column_resizeable"
+              c:identifier="gtk_clist_set_column_resizeable">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="resizeable">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_column_auto_resize"
+              c:identifier="gtk_clist_set_column_auto_resize">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="auto_resize">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_columns_autosize"
+              c:identifier="gtk_clist_columns_autosize">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_optimal_column_width"
+              c:identifier="gtk_clist_optimal_column_width">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_column_width"
+              c:identifier="gtk_clist_set_column_width">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_column_min_width"
+              c:identifier="gtk_clist_set_column_min_width">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="min_width">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_column_max_width"
+              c:identifier="gtk_clist_set_column_max_width">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="max_width">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_row_height"
+              c:identifier="gtk_clist_set_row_height">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="height">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_moveto" c:identifier="gtk_clist_moveto">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="row_align">
+          <type name="float" c:type="gfloat"/>
+        </parameter>
+        <parameter name="col_align">
+          <type name="float" c:type="gfloat"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_row_is_visible"
+              c:identifier="gtk_clist_row_is_visible">
+      <return-value>
+        <type name="GtkVisibility" c:type="GtkVisibility"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_get_cell_type"
+              c:identifier="gtk_clist_get_cell_type">
+      <return-value>
+        <type name="GtkCellType" c:type="GtkCellType"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_text" c:identifier="gtk_clist_set_text">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_get_text" c:identifier="gtk_clist_get_text">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="text">
+          <type name="gchar" c:type="gchar**"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="icon_view_new_with_model"
-              c:identifier="gtk_icon_view_new_with_model">
+    <function name="clist_set_pixmap" c:identifier="gtk_clist_set_pixmap">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        </parameter>
+        <parameter name="mask" allow-none="1">
+          <type name="GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="ImageMenuItem"
-           c:type="GtkImageMenuItem"
-           parent="MenuItem"
-           glib:type-name="GtkImageMenuItem"
-           glib:get-type="gtk_image_menu_item_get_type">
-      <method name="set_image" c:identifier="gtk_image_menu_item_set_image">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="image_menu_item">
-            <type name="ImageMenuItem" c:type="GtkImageMenuItem*"/>
-          </parameter>
-          <parameter name="image">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_image" c:identifier="gtk_image_menu_item_get_image">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="image_menu_item">
-            <type name="ImageMenuItem" c:type="GtkImageMenuItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="image">
-        <type name="GtkWidget" c:type="GtkWidget"/>
-      </property>
-    </class>
-    <function name="image_menu_item_new" c:identifier="gtk_image_menu_item_new">
+    <function name="clist_get_pixmap" c:identifier="gtk_clist_get_pixmap">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
+        </parameter>
+        <parameter name="mask">
+          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="image_menu_item_new_with_label"
-              c:identifier="gtk_image_menu_item_new_with_label">
+    <function name="clist_set_pixtext" c:identifier="gtk_clist_set_pixtext">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="spacing">
+          <type name="uint8" c:type="guint8"/>
+        </parameter>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        </parameter>
+        <parameter name="mask">
+          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_get_pixtext" c:identifier="gtk_clist_get_pixtext">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="text">
+          <type name="gchar" c:type="gchar**"/>
+        </parameter>
+        <parameter name="spacing">
+          <type name="guint8" c:type="guint8*"/>
+        </parameter>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
+        </parameter>
+        <parameter name="mask">
+          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_foreground"
+              c:identifier="gtk_clist_set_foreground">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="color">
+          <type name="GdkColor" c:type="GdkColor*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_background"
+              c:identifier="gtk_clist_set_background">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="color">
+          <type name="GdkColor" c:type="GdkColor*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_cell_style"
+              c:identifier="gtk_clist_set_cell_style">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_get_cell_style"
+              c:identifier="gtk_clist_get_cell_style">
+      <return-value>
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_row_style"
+              c:identifier="gtk_clist_set_row_style">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_get_row_style"
+              c:identifier="gtk_clist_get_row_style">
+      <return-value>
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_shift" c:identifier="gtk_clist_set_shift">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="vertical">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="horizontal">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_selectable"
+              c:identifier="gtk_clist_set_selectable">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="selectable">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_get_selectable"
+              c:identifier="gtk_clist_get_selectable">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_prepend" c:identifier="gtk_clist_prepend">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_append" c:identifier="gtk_clist_append">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_insert" c:identifier="gtk_clist_insert">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_remove" c:identifier="gtk_clist_remove">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_row_data" c:identifier="gtk_clist_set_row_data">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_row_data_full"
+              c:identifier="gtk_clist_set_row_data_full">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_get_row_data" c:identifier="gtk_clist_get_row_data">
+      <return-value>
+        <type name="any" c:type="gpointer"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_find_row_from_data"
+              c:identifier="gtk_clist_find_row_from_data">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_select_row" c:identifier="gtk_clist_select_row">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_unselect_row" c:identifier="gtk_clist_unselect_row">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_undo_selection"
+              c:identifier="gtk_clist_undo_selection">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_clear" c:identifier="gtk_clist_clear">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_get_selection_info"
+              c:identifier="gtk_clist_get_selection_info">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="row">
+          <type name="gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="gint" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_select_all" c:identifier="gtk_clist_select_all">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_unselect_all" c:identifier="gtk_clist_unselect_all">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_swap_rows" c:identifier="gtk_clist_swap_rows">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="row1">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="row2">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_row_move" c:identifier="gtk_clist_row_move">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="source_row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="dest_row">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_compare_func"
+              c:identifier="gtk_clist_set_compare_func">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="cmp_func">
+          <type name="GtkCListCompareFunc" c:type="GtkCListCompareFunc"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_sort_column"
+              c:identifier="gtk_clist_set_sort_column">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_set_sort_type"
+              c:identifier="gtk_clist_set_sort_type">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="sort_type">
+          <type name="SortType" c:type="GtkSortType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_sort" c:identifier="gtk_clist_sort">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="image_menu_item_new_with_mnemonic"
-              c:identifier="gtk_image_menu_item_new_with_mnemonic">
+    <function name="clist_set_auto_sort"
+              c:identifier="gtk_clist_set_auto_sort">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="auto_sort">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="image_menu_item_new_from_stock"
-              c:identifier="gtk_image_menu_item_new_from_stock">
+    <function name="clist_create_cell_layout"
+              c:identifier="_gtk_clist_create_cell_layout">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="PangoLayout*" c:type="PangoLayout*"/>
       </return-value>
       <parameters>
-        <parameter name="stock_id">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="clist">
+          <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
-        <parameter name="accel_group">
-          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+        <parameter name="clist_row">
+          <type name="GtkCListRow" c:type="GtkCListRow*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <class name="IMContextSimple"
-           c:type="GtkIMContextSimple"
-           parent="IMContext"
-           glib:type-name="GtkIMContextSimple"
-           glib:get-type="gtk_im_context_simple_get_type">
-      <method name="add_table" c:identifier="gtk_im_context_simple_add_table">
+    <record name="GtkColorButtonPrivate" c:type="GtkColorButtonPrivate"/>
+    <class name="ColorButton"
+           c:type="GtkColorButton"
+           parent="Button"
+           glib:type-name="GtkColorButton"
+           glib:get-type="gtk_color_button_get_type">
+      <method name="set_color" c:identifier="gtk_color_button_set_color">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context_simple">
-            <type name="IMContextSimple" c:type="GtkIMContextSimple*"/>
-          </parameter>
-          <parameter name="data">
-            <type name="guint16" c:type="guint16*"/>
-          </parameter>
-          <parameter name="max_seq_len">
-            <type name="gint" c:type="gint"/>
+          <parameter name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
-          <parameter name="n_seqs">
-            <type name="gint" c:type="gint"/>
+          <parameter name="color">
+            <type name="GdkColor" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-    </class>
-    <record name="GtkIMMulticontextPrivate" c:type="GtkIMMulticontextPrivate"/>
-    <class name="IMMulticontext"
-           c:type="GtkIMMulticontext"
-           parent="IMContext"
-           glib:type-name="GtkIMMulticontext"
-           glib:get-type="gtk_im_multicontext_get_type">
-      <method name="append_menuitems"
-              c:identifier="gtk_im_multicontext_append_menuitems">
+      <method name="set_alpha" c:identifier="gtk_color_button_set_alpha">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMMulticontext" c:type="GtkIMMulticontext*"/>
+          <parameter name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
-          <parameter name="menushell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="alpha">
+            <type name="uint16" c:type="guint16"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <function name="im_multicontext_new" c:identifier="gtk_im_multicontext_new">
-      <return-value>
-        <type name="GtkIMContext*" c:type="GtkIMContext*"/>
-      </return-value>
-    </function>
-    <class name="InputDialog"
-           c:type="GtkInputDialog"
-           parent="Dialog"
-           glib:type-name="GtkInputDialog"
-           glib:get-type="gtk_input_dialog_get_type">
-      <callback name="enable_device">
+      <method name="get_color" c:identifier="gtk_color_button_get_color">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="inputd">
-            <type name="GtkInputDialog*" c:type="GtkInputDialog*"/>
+          <parameter name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
-          <parameter name="device">
-            <type name="GdkDevice*" c:type="GdkDevice*"/>
+          <parameter name="color">
+            <type name="GdkColor" c:type="GdkColor*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="disable_device">
+      </method>
+      <method name="get_alpha" c:identifier="gtk_color_button_get_alpha">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="uint16" c:type="guint16"/>
         </return-value>
         <parameters>
-          <parameter name="inputd">
-            <type name="GtkInputDialog*" c:type="GtkInputDialog*"/>
-          </parameter>
-          <parameter name="device">
-            <type name="GdkDevice*" c:type="GdkDevice*"/>
+          <parameter name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="enable-device">
+      </method>
+      <method name="set_use_alpha"
+              c:identifier="gtk_color_button_set_use_alpha">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GdkDevice" c:type="GdkDevice"/>
+          <parameter name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
+          </parameter>
+          <parameter name="use_alpha">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="disable-device">
+      </method>
+      <method name="get_use_alpha"
+              c:identifier="gtk_color_button_get_use_alpha">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GdkDevice" c:type="GdkDevice"/>
+          <parameter name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="input_dialog_new" c:identifier="gtk_input_dialog_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="Invisible"
-           c:type="GtkInvisible"
-           parent="Widget"
-           glib:type-name="GtkInvisible"
-           glib:get-type="gtk_invisible_get_type">
-      <method name="set_screen" c:identifier="gtk_invisible_set_screen">
+      </method>
+      <method name="set_title" c:identifier="gtk_color_button_set_title">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="invisible">
-            <type name="Invisible" c:type="GtkInvisible*"/>
+          <parameter name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_screen" c:identifier="gtk_invisible_get_screen">
+      <method name="get_title" c:identifier="gtk_color_button_get_title">
         <return-value>
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="invisible">
-            <type name="Invisible" c:type="GtkInvisible*"/>
+          <parameter name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="screen">
-        <type name="GdkScreen" c:type="GdkScreen"/>
+      <property name="use-alpha">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="title">
+        <type name="string" c:type="gchararray"/>
       </property>
+      <property name="color">
+        <type name="GdkColor" c:type="GdkColor"/>
+      </property>
+      <property name="alpha">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <callback name="color_set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="cp">
+            <type name="GtkColorButton*" c:type="GtkColorButton*"/>
+          </parameter>
+        </parameters>
+      </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
+      <glib:signal name="color-set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
     </class>
-    <function name="invisible_new" c:identifier="gtk_invisible_new">
+    <function name="color_button_new" c:identifier="gtk_color_button_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
     </function>
-    <function name="invisible_new_for_screen"
-              c:identifier="gtk_invisible_new_for_screen">
+    <function name="color_button_new_with_color"
+              c:identifier="gtk_color_button_new_with_color">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="screen">
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+        <parameter name="color">
+          <type name="GdkColor" c:type="GdkColor*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="Layout"
-           c:type="GtkLayout"
-           parent="Container"
-           glib:type-name="GtkLayout"
-           glib:get-type="gtk_layout_get_type">
-      <method name="put" c:identifier="gtk_layout_put">
+    <class name="VBox"
+           c:type="GtkVBox"
+           parent="Box"
+           glib:type-name="GtkVBox"
+           glib:get-type="gtk_vbox_get_type">
+    </class>
+    <function name="vbox_new" c:identifier="gtk_vbox_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="homogeneous">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="spacing">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <callback name="GtkColorSelectionChangePaletteFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="colors">
+          <type name="GdkColor*" c:type="GdkColor*"/>
+        </parameter>
+        <parameter name="n_colors">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GtkColorSelectionChangePaletteWithScreenFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="screen">
+          <type name="GdkScreen*" c:type="GdkScreen*"/>
+        </parameter>
+        <parameter name="colors">
+          <type name="GdkColor*" c:type="GdkColor*"/>
+        </parameter>
+        <parameter name="n_colors">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="ColorSelection"
+           c:type="GtkColorSelection"
+           parent="VBox"
+           glib:type-name="GtkColorSelection"
+           glib:get-type="gtk_color_selection_get_type">
+      <method name="get_has_opacity_control"
+              c:identifier="gtk_color_selection_get_has_opacity_control">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="child_widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+        </parameters>
+      </method>
+      <method name="set_has_opacity_control"
+              c:identifier="gtk_color_selection_set_has_opacity_control">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
+          <parameter name="has_opacity">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
+        </parameters>
+      </method>
+      <method name="get_has_palette"
+              c:identifier="gtk_color_selection_get_has_palette">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move" c:identifier="gtk_layout_move">
+      <method name="set_has_palette"
+              c:identifier="gtk_color_selection_set_has_palette">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="child_widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="has_palette">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
+        </parameters>
+      </method>
+      <method name="set_current_color"
+              c:identifier="gtk_color_selection_set_current_color">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
+          <parameter name="color">
+            <type name="GdkColor" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_size" c:identifier="gtk_layout_set_size">
+      <method name="set_current_alpha"
+              c:identifier="gtk_color_selection_set_current_alpha">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="width">
-            <type name="guint" c:type="guint"/>
+          <parameter name="alpha">
+            <type name="uint16" c:type="guint16"/>
           </parameter>
-          <parameter name="height">
-            <type name="guint" c:type="guint"/>
+        </parameters>
+      </method>
+      <method name="get_current_color"
+              c:identifier="gtk_color_selection_get_current_color">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          </parameter>
+          <parameter name="color">
+            <type name="GdkColor" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size" c:identifier="gtk_layout_get_size">
+      <method name="get_current_alpha"
+              c:identifier="gtk_color_selection_get_current_alpha">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="uint16" c:type="guint16"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="width">
-            <type name="guint" c:type="guint*"/>
+        </parameters>
+      </method>
+      <method name="set_previous_color"
+              c:identifier="gtk_color_selection_set_previous_color">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="height">
-            <type name="guint" c:type="guint*"/>
+          <parameter name="color">
+            <type name="GdkColor" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_hadjustment" c:identifier="gtk_layout_get_hadjustment">
+      <method name="set_previous_alpha"
+              c:identifier="gtk_color_selection_set_previous_alpha">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          </parameter>
+          <parameter name="alpha">
+            <type name="uint16" c:type="guint16"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_vadjustment" c:identifier="gtk_layout_get_vadjustment">
+      <method name="get_previous_color"
+              c:identifier="gtk_color_selection_get_previous_color">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          </parameter>
+          <parameter name="color">
+            <type name="GdkColor" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_hadjustment" c:identifier="gtk_layout_set_hadjustment">
+      <method name="get_previous_alpha"
+              c:identifier="gtk_color_selection_get_previous_alpha">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="uint16" c:type="guint16"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameters>
+      </method>
+      <method name="is_adjusting"
+              c:identifier="gtk_color_selection_is_adjusting">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_vadjustment" c:identifier="gtk_layout_set_vadjustment">
+      <method name="set_color" c:identifier="gtk_color_selection_set_color">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="color">
+            <type name="gdouble" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="freeze" c:identifier="gtk_layout_freeze">
+      <method name="get_color" c:identifier="gtk_color_selection_get_color">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          </parameter>
+          <parameter name="color">
+            <type name="gdouble" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="thaw" c:identifier="gtk_layout_thaw">
+      <method name="set_update_policy"
+              c:identifier="gtk_color_selection_set_update_policy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          </parameter>
+          <parameter name="policy">
+            <type name="UpdateType" c:type="GtkUpdateType"/>
           </parameter>
         </parameters>
       </method>
-      <property name="hadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+      <property name="has-palette">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="vadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+      <property name="has-opacity-control">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="width">
-        <type name="guint" c:type="guint"/>
+      <property name="current-color">
+        <type name="GdkColor" c:type="GdkColor"/>
       </property>
-      <property name="height">
+      <property name="current-alpha">
         <type name="guint" c:type="guint"/>
       </property>
-      <callback name="set_scroll_adjustments">
+      <callback name="color_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="GtkLayout*" c:type="GtkLayout*"/>
-          </parameter>
-          <parameter name="hadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
-          </parameter>
-          <parameter name="vadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+          <parameter name="color_selection">
+            <type name="GtkColorSelection*" c:type="GtkColorSelection*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="set-scroll-adjustments">
+      <glib:signal name="color-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-          </parameter>
-        </parameters>
       </glib:signal>
     </class>
-    <function name="layout_new" c:identifier="gtk_layout_new">
+    <function name="color_selection_new"
+              c:identifier="gtk_color_selection_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
+    </function>
+    <function name="color_selection_palette_from_string"
+              c:identifier="gtk_color_selection_palette_from_string">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
       <parameters>
-        <parameter name="hadjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="str">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="vadjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="colors">
+          <type name="GdkColor" c:type="GdkColor**"/>
+        </parameter>
+        <parameter name="n_colors">
+          <type name="gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkLinkButtonPrivate" c:type="GtkLinkButtonPrivate"/>
-    <callback name="GtkLinkButtonUriFunc">
+    <function name="color_selection_palette_to_string"
+              c:identifier="gtk_color_selection_palette_to_string">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="button">
-          <type name="GtkLinkButton*" c:type="GtkLinkButton*"/>
+        <parameter name="colors">
+          <type name="GdkColor" c:type="GdkColor*"/>
         </parameter>
-        <parameter name="link_">
-          <type name="gchar*" c:type="gchar*"/>
+        <parameter name="n_colors">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="color_selection_set_change_palette_hook"
+              c:identifier="gtk_color_selection_set_change_palette_hook">
+      <return-value>
+        <type name="GtkColorSelectionChangePaletteFunc"
+              c:type="GtkColorSelectionChangePaletteFunc"/>
+      </return-value>
+      <parameters>
+        <parameter name="func">
+          <type name="GtkColorSelectionChangePaletteFunc"
+                c:type="GtkColorSelectionChangePaletteFunc"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="color_selection_set_change_palette_with_screen_hook"
+              c:identifier="gtk_color_selection_set_change_palette_with_screen_hook">
+      <return-value>
+        <type name="GtkColorSelectionChangePaletteWithScreenFunc"
+              c:type="GtkColorSelectionChangePaletteWithScreenFunc"/>
+      </return-value>
+      <parameters>
+        <parameter name="func">
+          <type name="GtkColorSelectionChangePaletteWithScreenFunc"
+                c:type="GtkColorSelectionChangePaletteWithScreenFunc"/>
         </parameter>
       </parameters>
-    </callback>
-    <class name="LinkButton"
-           c:type="GtkLinkButton"
-           parent="Button"
-           glib:type-name="GtkLinkButton"
-           glib:get-type="gtk_link_button_get_type">
-      <method name="get_uri" c:identifier="gtk_link_button_get_uri">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_button">
-            <type name="LinkButton" c:type="GtkLinkButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_uri" c:identifier="gtk_link_button_set_uri">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_button">
-            <type name="LinkButton" c:type="GtkLinkButton*"/>
-          </parameter>
-          <parameter name="uri">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="uri">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <callback name="_gtk_padding1">
+    </function>
+    <class name="ColorSelectionDialog"
+           c:type="GtkColorSelectionDialog"
+           parent="Dialog"
+           glib:type-name="GtkColorSelectionDialog"
+           glib:get-type="gtk_color_selection_dialog_get_type">
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_padding2">
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_padding3">
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_padding4">
+      <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
-    <function name="link_button_new" c:identifier="gtk_link_button_new">
+    <function name="color_selection_dialog_new"
+              c:identifier="gtk_color_selection_dialog_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="uri">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="title">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="link_button_new_with_label"
-              c:identifier="gtk_link_button_new_with_label">
+    <function name="drag_get_data" c:identifier="gtk_drag_get_data">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="uri">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="link_button_set_uri_hook"
-              c:identifier="gtk_link_button_set_uri_hook">
-      <return-value>
-        <type name="GtkLinkButtonUriFunc" c:type="GtkLinkButtonUriFunc"/>
-      </return-value>
-      <parameters>
-        <parameter name="func">
-          <type name="GtkLinkButtonUriFunc" c:type="GtkLinkButtonUriFunc"/>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="target">
+          <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
-        <parameter name="destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GtkKeySnoopFunc">
+    <function name="drag_finish" c:identifier="gtk_drag_finish">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="grab_widget">
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
         </parameter>
-        <parameter name="event">
-          <type name="GdkEventKey*" c:type="GdkEventKey*"/>
+        <parameter name="success">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
-        <parameter name="func_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="del">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
-    </callback>
-    <function name="check_version" c:identifier="gtk_check_version">
+    </function>
+    <function name="drag_get_source_widget"
+              c:identifier="gtk_drag_get_source_widget">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="required_major">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="required_minor">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="required_micro">
-          <type name="guint" c:type="guint"/>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="parse_args" c:identifier="gtk_parse_args">
+    <function name="drag_highlight" c:identifier="gtk_drag_highlight">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="argc">
-          <type name="int" c:type="int*"/>
-        </parameter>
-        <parameter name="argv">
-          <type name="char" c:type="char***"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="init" c:identifier="gtk_init">
+    <function name="drag_unhighlight" c:identifier="gtk_drag_unhighlight">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="argc">
-          <type name="int" c:type="int*"/>
-        </parameter>
-        <parameter name="argv">
-          <type name="char" c:type="char***"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="init_check" c:identifier="gtk_init_check">
+    <function name="drag_dest_set" c:identifier="gtk_drag_dest_set">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="argc">
-          <type name="int" c:type="int*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="argv">
-          <type name="char" c:type="char***"/>
+        <parameter name="flags">
+          <type name="DestDefaults" c:type="GtkDestDefaults"/>
+        </parameter>
+        <parameter name="targets">
+          <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+        </parameter>
+        <parameter name="n_targets">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="actions">
+          <type name="GdkDragAction" c:type="GdkDragAction"/>
         </parameter>
       </parameters>
     </function>
-    <function name="init_with_args" c:identifier="gtk_init_with_args">
+    <function name="drag_dest_set_proxy"
+              c:identifier="gtk_drag_dest_set_proxy">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="argc">
-          <type name="int" c:type="int*"/>
-        </parameter>
-        <parameter name="argv">
-          <type name="char" c:type="char***"/>
-        </parameter>
-        <parameter name="parameter_string">
-          <type name="char" c:type="char*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="entries">
-          <type name="GOptionEntry" c:type="GOptionEntry*"/>
+        <parameter name="proxy_window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
-        <parameter name="translation_domain">
-          <type name="char" c:type="char*"/>
+        <parameter name="protocol">
+          <type name="GdkDragProtocol" c:type="GdkDragProtocol"/>
         </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+        <parameter name="use_coordinates">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="get_option_group" c:identifier="gtk_get_option_group">
+    <function name="drag_dest_unset" c:identifier="gtk_drag_dest_unset">
       <return-value>
-        <type name="GOptionGroup*" c:type="GOptionGroup*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="open_default_display">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="exit" c:identifier="gtk_exit">
+    <function name="drag_dest_find_target"
+              c:identifier="gtk_drag_dest_find_target">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GdkAtom" c:type="GdkAtom"/>
       </return-value>
       <parameters>
-        <parameter name="error_code">
-          <type name="gint" c:type="gint"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="target_list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="disable_setlocale" c:identifier="gtk_disable_setlocale">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="set_locale" c:identifier="gtk_set_locale">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-    </function>
-    <function name="get_default_language"
-              c:identifier="gtk_get_default_language">
-      <return-value>
-        <type name="PangoLanguage*" c:type="PangoLanguage*"/>
-      </return-value>
-    </function>
-    <function name="events_pending" c:identifier="gtk_events_pending">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-    </function>
-    <function name="main_do_event" c:identifier="gtk_main_do_event">
+    <function name="drag_dest_get_target_list"
+              c:identifier="gtk_drag_dest_get_target_list">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkTargetList*" c:type="GtkTargetList*"/>
       </return-value>
       <parameters>
-        <parameter name="event">
-          <type name="GdkEvent" c:type="GdkEvent*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="main" c:identifier="gtk_main">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="main_level" c:identifier="gtk_main_level">
-      <return-value>
-        <type name="guint" c:type="guint"/>
-      </return-value>
-    </function>
-    <function name="main_quit" c:identifier="gtk_main_quit">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="main_iteration" c:identifier="gtk_main_iteration">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-    </function>
-    <function name="main_iteration_do" c:identifier="gtk_main_iteration_do">
+    <function name="drag_dest_set_target_list"
+              c:identifier="gtk_drag_dest_set_target_list">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="blocking">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="target_list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="true" c:identifier="gtk_true">
+    <function name="drag_dest_add_text_targets"
+              c:identifier="gtk_drag_dest_add_text_targets">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="false" c:identifier="gtk_false">
+    <function name="drag_dest_add_image_targets"
+              c:identifier="gtk_drag_dest_add_image_targets">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="grab_add" c:identifier="gtk_grab_add">
+    <function name="drag_dest_add_uri_targets"
+              c:identifier="gtk_drag_dest_add_uri_targets">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="widget">
@@ -41072,14 +32893,24 @@
         </parameter>
       </parameters>
     </function>
-    <function name="grab_get_current" c:identifier="gtk_grab_get_current">
+    <function name="drag_dest_set_track_motion"
+              c:identifier="gtk_drag_dest_set_track_motion">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="track_motion">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="grab_remove" c:identifier="gtk_grab_remove">
+    <function name="drag_dest_get_track_motion"
+              c:identifier="gtk_drag_dest_get_track_motion">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="widget">
@@ -41087,305 +32918,340 @@
         </parameter>
       </parameters>
     </function>
-    <function name="init_add" c:identifier="gtk_init_add">
+    <function name="drag_source_set" c:identifier="gtk_drag_source_set">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="start_button_mask">
+          <type name="GdkModifierType" c:type="GdkModifierType"/>
+        </parameter>
+        <parameter name="targets">
+          <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+        </parameter>
+        <parameter name="n_targets">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="actions">
+          <type name="GdkDragAction" c:type="GdkDragAction"/>
         </parameter>
       </parameters>
     </function>
-    <function name="quit_add_destroy" c:identifier="gtk_quit_add_destroy">
+    <function name="drag_source_unset" c:identifier="gtk_drag_source_unset">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="main_level">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="quit_add" c:identifier="gtk_quit_add">
+    <function name="drag_source_get_target_list"
+              c:identifier="gtk_drag_source_get_target_list">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="GtkTargetList*" c:type="GtkTargetList*"/>
       </return-value>
       <parameters>
-        <parameter name="main_level">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="quit_add_full" c:identifier="gtk_quit_add_full">
+    <function name="drag_source_set_target_list"
+              c:identifier="gtk_drag_source_set_target_list">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="main_level">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
-        </parameter>
-        <parameter name="marshal">
-          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        <parameter name="target_list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="quit_remove" c:identifier="gtk_quit_remove">
+    <function name="drag_source_add_text_targets"
+              c:identifier="gtk_drag_source_add_text_targets">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="quit_handler_id">
-          <type name="guint" c:type="guint"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="quit_remove_by_data" c:identifier="gtk_quit_remove_by_data">
+    <function name="drag_source_add_image_targets"
+              c:identifier="gtk_drag_source_add_image_targets">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="timeout_add" c:identifier="gtk_timeout_add">
+    <function name="drag_source_add_uri_targets"
+              c:identifier="gtk_drag_source_add_uri_targets">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="interval">
-          <type name="guint32" c:type="guint32"/>
-        </parameter>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="timeout_add_full" c:identifier="gtk_timeout_add_full">
+    <function name="drag_source_set_icon"
+              c:identifier="gtk_drag_source_set_icon">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="interval">
-          <type name="guint32" c:type="guint32"/>
-        </parameter>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="marshal">
-          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
+        <parameter name="colormap">
+          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        <parameter name="mask" allow-none="1">
+          <type name="GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="timeout_remove" c:identifier="gtk_timeout_remove">
+    <function name="drag_source_set_icon_pixbuf"
+              c:identifier="gtk_drag_source_set_icon_pixbuf">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="timeout_handler_id">
-          <type name="guint" c:type="guint"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="pixbuf">
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="idle_add" c:identifier="gtk_idle_add">
+    <function name="drag_source_set_icon_stock"
+              c:identifier="gtk_drag_source_set_icon_stock">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="idle_add_priority" c:identifier="gtk_idle_add_priority">
+    <function name="drag_source_set_icon_name"
+              c:identifier="gtk_drag_source_set_icon_name">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="priority">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="icon_name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="idle_add_full" c:identifier="gtk_idle_add_full">
+    <function name="drag_begin" c:identifier="gtk_drag_begin">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="GdkDragContext*" c:type="GdkDragContext*"/>
       </return-value>
       <parameters>
-        <parameter name="priority">
-          <type name="gint" c:type="gint"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
+        <parameter name="targets">
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
-        <parameter name="marshal">
-          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
+        <parameter name="actions">
+          <type name="GdkDragAction" c:type="GdkDragAction"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="button">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        <parameter name="event">
+          <type name="GdkEvent" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="idle_remove" c:identifier="gtk_idle_remove">
+    <function name="drag_set_icon_widget"
+              c:identifier="gtk_drag_set_icon_widget">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="idle_handler_id">
-          <type name="guint" c:type="guint"/>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="idle_remove_by_data" c:identifier="gtk_idle_remove_by_data">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="hot_x">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="hot_y">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="input_add_full" c:identifier="gtk_input_add_full">
+    <function name="drag_set_icon_pixmap"
+              c:identifier="gtk_drag_set_icon_pixmap">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="source">
-          <type name="gint" c:type="gint"/>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
         </parameter>
-        <parameter name="condition">
-          <type name="GdkInputCondition" c:type="GdkInputCondition"/>
+        <parameter name="colormap">
+          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
         </parameter>
-        <parameter name="function">
-          <type name="GdkInputFunction" c:type="GdkInputFunction"/>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
-        <parameter name="marshal">
-          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
+        <parameter name="mask">
+          <type name="GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="hot_x">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        <parameter name="hot_y">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="input_remove" c:identifier="gtk_input_remove">
+    <function name="drag_set_icon_pixbuf"
+              c:identifier="gtk_drag_set_icon_pixbuf">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="input_handler_id">
-          <type name="guint" c:type="guint"/>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="pixbuf">
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+        </parameter>
+        <parameter name="hot_x">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="hot_y">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="key_snooper_install" c:identifier="gtk_key_snooper_install">
+    <function name="drag_set_icon_stock"
+              c:identifier="gtk_drag_set_icon_stock">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="snooper">
-          <type name="GtkKeySnoopFunc" c:type="GtkKeySnoopFunc"/>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
         </parameter>
-        <parameter name="func_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="hot_x">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="hot_y">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="key_snooper_remove" c:identifier="gtk_key_snooper_remove">
+    <function name="drag_set_icon_name" c:identifier="gtk_drag_set_icon_name">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="snooper_handler_id">
-          <type name="guint" c:type="guint"/>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="icon_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="hot_x">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="hot_y">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="get_current_event" c:identifier="gtk_get_current_event">
-      <return-value>
-        <type name="GdkEvent*" c:type="GdkEvent*"/>
-      </return-value>
-    </function>
-    <function name="get_current_event_time"
-              c:identifier="gtk_get_current_event_time">
+    <function name="drag_set_icon_default"
+              c:identifier="gtk_drag_set_icon_default">
       <return-value>
-        <type name="guint32" c:type="guint32"/>
+        <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="get_current_event_state"
-              c:identifier="gtk_get_current_event_state">
+    <function name="drag_check_threshold"
+              c:identifier="gtk_drag_check_threshold">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="state">
-          <type name="GdkModifierType" c:type="GdkModifierType*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="start_x">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="start_y">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="current_x">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="current_y">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="get_event_widget" c:identifier="gtk_get_event_widget">
+    <function name="drag_source_handle_event"
+              c:identifier="_gtk_drag_source_handle_event">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
         <parameter name="event">
           <type name="GdkEvent" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="propagate_event" c:identifier="gtk_propagate_event">
+    <function name="drag_dest_handle_event"
+              c:identifier="_gtk_drag_dest_handle_event">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
+        <parameter name="toplevel">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="event">
@@ -41393,13196 +33259,16087 @@
         </parameter>
       </parameters>
     </function>
-    <function name="boolean_handled_accumulator"
-              c:identifier="_gtk_boolean_handled_accumulator">
+    <function name="drag_set_default_icon"
+              c:identifier="gtk_drag_set_default_icon">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ihint">
-          <type name="GSignalInvocationHint" c:type="GSignalInvocationHint*"/>
+        <parameter name="colormap">
+          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
         </parameter>
-        <parameter name="return_accu">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
-        <parameter name="handler_return">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="mask">
+          <type name="GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
-        <parameter name="dummy">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="hot_x">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="hot_y">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="get_lc_ctype" c:identifier="_gtk_get_lc_ctype">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-    </function>
-    <class name="MenuBar"
-           c:type="GtkMenuBar"
-           parent="MenuShell"
-           glib:type-name="GtkMenuBar"
-           glib:get-type="gtk_menu_bar_get_type">
-      <method name="get_pack_direction"
-              c:identifier="gtk_menu_bar_get_pack_direction">
+    <record name="GtkEditable" c:type="GtkEditable"/>
+    <interface name="Editable"
+               c:type="GtkEditable"
+               glib:type-name="GtkEditable"
+               glib:get-type="gtk_editable_get_type">
+      <callback name="insert_text">
         <return-value>
-          <type name="PackDirection" c:type="GtkPackDirection"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menubar">
-            <type name="MenuBar" c:type="GtkMenuBar*"/>
+          <parameter name="editable">
+            <type name="GtkEditable*" c:type="GtkEditable*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="position">
+            <type name="gint*" c:type="gint*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_pack_direction"
-              c:identifier="gtk_menu_bar_set_pack_direction">
+      </callback>
+      <callback name="delete_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menubar">
-            <type name="MenuBar" c:type="GtkMenuBar*"/>
+          <parameter name="editable">
+            <type name="GtkEditable*" c:type="GtkEditable*"/>
           </parameter>
-          <parameter name="pack_dir">
-            <type name="PackDirection" c:type="GtkPackDirection"/>
+          <parameter name="start_pos">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="end_pos">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_child_pack_direction"
-              c:identifier="gtk_menu_bar_get_child_pack_direction">
+      </callback>
+      <callback name="changed">
         <return-value>
-          <type name="PackDirection" c:type="GtkPackDirection"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menubar">
-            <type name="MenuBar" c:type="GtkMenuBar*"/>
+          <parameter name="editable">
+            <type name="GtkEditable*" c:type="GtkEditable*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_child_pack_direction"
-              c:identifier="gtk_menu_bar_set_child_pack_direction">
+      </callback>
+      <callback name="do_insert_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menubar">
-            <type name="MenuBar" c:type="GtkMenuBar*"/>
+          <parameter name="editable">
+            <type name="GtkEditable*" c:type="GtkEditable*"/>
           </parameter>
-          <parameter name="child_pack_dir">
-            <type name="PackDirection" c:type="GtkPackDirection"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="position">
+            <type name="gint*" c:type="gint*"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="pack-direction">
-        <type name="GtkPackDirection" c:type="GtkPackDirection"/>
-      </property>
-      <property name="child-pack-direction">
-        <type name="GtkPackDirection" c:type="GtkPackDirection"/>
-      </property>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
       </callback>
-    </class>
-    <function name="menu_bar_new" c:identifier="gtk_menu_bar_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="menu_bar_cycle_focus"
-              c:identifier="_gtk_menu_bar_cycle_focus">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="menubar">
-          <type name="MenuBar" c:type="GtkMenuBar*"/>
-        </parameter>
-        <parameter name="dir">
-          <type name="DirectionType" c:type="GtkDirectionType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkTooltipsData" c:type="GtkTooltipsData">
-      <field name="tooltips">
-        <type name="GtkTooltips*" c:type="GtkTooltips*"/>
-      </field>
-      <field name="widget">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </field>
-      <field name="tip_text">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="tip_private">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-    </record>
-    <class name="Tooltips"
-           c:type="GtkTooltips"
-           parent="GtkObject"
-           glib:type-name="GtkTooltips"
-           glib:get-type="gtk_tooltips_get_type">
-      <constructor name="new" c:identifier="gtk_tooltips_new">
-        <return-value>
-          <type name="Tooltips" c:type="GtkTooltips*"/>
-        </return-value>
-      </constructor>
-      <method name="enable" c:identifier="gtk_tooltips_enable">
+      <callback name="do_delete_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
+          <parameter name="editable">
+            <type name="GtkEditable*" c:type="GtkEditable*"/>
+          </parameter>
+          <parameter name="start_pos">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="end_pos">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="disable" c:identifier="gtk_tooltips_disable">
+      </callback>
+      <callback name="get_chars">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
+          <parameter name="editable">
+            <type name="GtkEditable*" c:type="GtkEditable*"/>
+          </parameter>
+          <parameter name="start_pos">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="end_pos">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_delay" c:identifier="gtk_tooltips_set_delay">
+      </callback>
+      <callback name="set_selection_bounds">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
+          <parameter name="editable">
+            <type name="GtkEditable*" c:type="GtkEditable*"/>
           </parameter>
-          <parameter name="delay">
-            <type name="guint" c:type="guint"/>
+          <parameter name="start_pos">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="end_pos">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_tip" c:identifier="gtk_tooltips_set_tip">
+      </callback>
+      <callback name="get_selection_bounds">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="editable">
+            <type name="GtkEditable*" c:type="GtkEditable*"/>
           </parameter>
-          <parameter name="tip_text">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="start_pos">
+            <type name="gint*" c:type="gint*"/>
           </parameter>
-          <parameter name="tip_private">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="end_pos">
+            <type name="gint*" c:type="gint*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="force_window" c:identifier="gtk_tooltips_force_window">
+      </callback>
+      <callback name="set_position">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
+          <parameter name="editable">
+            <type name="GtkEditable*" c:type="GtkEditable*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <callback name="_gtk_reserved1">
+      </callback>
+      <callback name="get_position">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
+        <parameters>
+          <parameter name="editable">
+            <type name="GtkEditable*" c:type="GtkEditable*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved2">
+      <glib:signal name="changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+      </glib:signal>
+      <glib:signal name="insert-text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="delete-text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-    </class>
-    <function name="tooltips_data_get" c:identifier="gtk_tooltips_data_get">
+        <parameters>
+          <parameter name="object">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </interface>
+    <function name="editable_select_region"
+              c:identifier="gtk_editable_select_region">
       <return-value>
-        <type name="GtkTooltipsData*" c:type="GtkTooltipsData*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+        <parameter name="start">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="end">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tooltips_get_info_from_tip_window"
-              c:identifier="gtk_tooltips_get_info_from_tip_window">
+    <function name="editable_get_selection_bounds"
+              c:identifier="gtk_editable_get_selection_bounds">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="tip_window">
-          <type name="Window" c:type="GtkWindow*"/>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
         </parameter>
-        <parameter name="tooltips">
-          <type name="Tooltips" c:type="GtkTooltips**"/>
+        <parameter name="start">
+          <type name="gint" c:type="gint*"/>
         </parameter>
-        <parameter name="current_widget">
-          <type name="Widget" c:type="GtkWidget**"/>
+        <parameter name="end">
+          <type name="gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkToolItemPrivate" c:type="GtkToolItemPrivate"/>
-    <class name="ToolItem"
-           c:type="GtkToolItem"
-           parent="Bin"
-           glib:type-name="GtkToolItem"
-           glib:get-type="gtk_tool_item_get_type">
-      <constructor name="new" c:identifier="gtk_tool_item_new">
+    <function name="editable_insert_text"
+              c:identifier="gtk_editable_insert_text">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+        <parameter name="new_text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="new_text_length">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="position" direction="inout">
+          <type name="gint" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_delete_text"
+              c:identifier="gtk_editable_delete_text">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+        <parameter name="start_pos">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="end_pos">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_get_chars" c:identifier="gtk_editable_get_chars">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+        <parameter name="start_pos">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="end_pos">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_cut_clipboard"
+              c:identifier="gtk_editable_cut_clipboard">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_copy_clipboard"
+              c:identifier="gtk_editable_copy_clipboard">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_paste_clipboard"
+              c:identifier="gtk_editable_paste_clipboard">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_delete_selection"
+              c:identifier="gtk_editable_delete_selection">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_set_position"
+              c:identifier="gtk_editable_set_position">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+        <parameter name="position">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_get_position"
+              c:identifier="gtk_editable_get_position">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_set_editable"
+              c:identifier="gtk_editable_set_editable">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+        <parameter name="is_editable">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_get_editable"
+              c:identifier="gtk_editable_get_editable">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="IMContext"
+           c:type="GtkIMContext"
+           parent="GLib.Object"
+           glib:type-name="GtkIMContext"
+           glib:get-type="gtk_im_context_get_type">
+      <constructor name="simple_new" c:identifier="gtk_im_context_simple_new">
         <return-value>
-          <type name="ToolItem" c:type="GtkToolItem*"/>
+          <type name="IMContext" c:type="GtkIMContext*"/>
         </return-value>
       </constructor>
-      <method name="set_homogeneous"
-              c:identifier="gtk_tool_item_set_homogeneous">
+      <method name="set_client_window"
+              c:identifier="gtk_im_context_set_client_window">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="homogeneous">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_homogeneous"
-              c:identifier="gtk_tool_item_get_homogeneous">
+      <method name="get_preedit_string"
+              c:identifier="gtk_im_context_get_preedit_string">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="set_expand" c:identifier="gtk_tool_item_set_expand">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="str">
+            <type name="gchar" c:type="gchar**"/>
           </parameter>
-          <parameter name="expand">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="attrs">
+            <type name="PangoAttrList" c:type="PangoAttrList**"/>
+          </parameter>
+          <parameter name="cursor_pos">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_expand" c:identifier="gtk_tool_item_get_expand">
+      <method name="filter_keypress"
+              c:identifier="gtk_im_context_filter_keypress">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="GdkEventKey" c:type="GdkEventKey*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip" c:identifier="gtk_tool_item_set_tooltip">
+      <method name="focus_in" c:identifier="gtk_im_context_focus_in">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
-          </parameter>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
-          </parameter>
-          <parameter name="tip_text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="tip_private">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip_text"
-              c:identifier="gtk_tool_item_set_tooltip_text">
+      <method name="focus_out" c:identifier="gtk_im_context_focus_out">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip_markup"
-              c:identifier="gtk_tool_item_set_tooltip_markup">
+      <method name="reset" c:identifier="gtk_im_context_reset">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
-          </parameter>
-          <parameter name="markup">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_drag_window"
-              c:identifier="gtk_tool_item_set_use_drag_window">
+      <method name="set_cursor_location"
+              c:identifier="gtk_im_context_set_cursor_location">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="use_drag_window">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="area">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_use_drag_window"
-              c:identifier="gtk_tool_item_get_use_drag_window">
+      <method name="set_use_preedit"
+              c:identifier="gtk_im_context_set_use_preedit">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="use_preedit">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_visible_horizontal"
-              c:identifier="gtk_tool_item_set_visible_horizontal">
+      <method name="set_surrounding"
+              c:identifier="gtk_im_context_set_surrounding">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="visible_horizontal">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="cursor_index">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visible_horizontal"
-              c:identifier="gtk_tool_item_get_visible_horizontal">
+      <method name="get_surrounding"
+              c:identifier="gtk_im_context_get_surrounding">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="gchar" c:type="gchar**"/>
+          </parameter>
+          <parameter name="cursor_index">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_visible_vertical"
-              c:identifier="gtk_tool_item_set_visible_vertical">
+      <method name="delete_surrounding"
+              c:identifier="gtk_im_context_delete_surrounding">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="visible_vertical">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="offset">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="n_chars">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visible_vertical"
-              c:identifier="gtk_tool_item_get_visible_vertical">
+      <callback name="preedit_start">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_is_important"
-              c:identifier="gtk_tool_item_get_is_important">
+      </callback>
+      <callback name="preedit_end">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_is_important"
-              c:identifier="gtk_tool_item_set_is_important">
+      </callback>
+      <callback name="preedit_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
-          </parameter>
-          <parameter name="is_important">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_icon_size" c:identifier="gtk_tool_item_get_icon_size">
+      </callback>
+      <callback name="commit">
         <return-value>
-          <type name="IconSize" c:type="GtkIconSize"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_orientation"
-              c:identifier="gtk_tool_item_get_orientation">
+      </callback>
+      <callback name="retrieve_surrounding">
         <return-value>
-          <type name="Orientation" c:type="GtkOrientation"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_toolbar_style"
-              c:identifier="gtk_tool_item_get_toolbar_style">
+      </callback>
+      <callback name="delete_surrounding">
         <return-value>
-          <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="n_chars">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_relief_style"
-              c:identifier="gtk_tool_item_get_relief_style">
+      </callback>
+      <callback name="set_client_window">
         <return-value>
-          <type name="ReliefStyle" c:type="GtkReliefStyle"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="window">
+            <type name="GdkWindow*" c:type="GdkWindow*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="retrieve_proxy_menu_item"
-              c:identifier="gtk_tool_item_retrieve_proxy_menu_item">
+      </callback>
+      <callback name="get_preedit_string">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="gchar**" c:type="gchar**"/>
+          </parameter>
+          <parameter name="attrs">
+            <type name="PangoAttrList**" c:type="PangoAttrList**"/>
+          </parameter>
+          <parameter name="cursor_pos">
+            <type name="gint*" c:type="gint*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_proxy_menu_item"
-              c:identifier="gtk_tool_item_get_proxy_menu_item">
+      </callback>
+      <callback name="filter_keypress">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="menu_item_id">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="event">
+            <type name="GdkEventKey*" c:type="GdkEventKey*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_proxy_menu_item"
-              c:identifier="gtk_tool_item_set_proxy_menu_item">
+      </callback>
+      <callback name="focus_in">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
-          </parameter>
-          <parameter name="menu_item_id">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="menu_item">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="rebuild_menu" c:identifier="gtk_tool_item_rebuild_menu">
+      </callback>
+      <callback name="focus_out">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="toolbar_reconfigured"
-              c:identifier="gtk_tool_item_toolbar_reconfigured">
+      </callback>
+      <callback name="reset">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="visible-horizontal">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="visible-vertical">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="is-important">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <callback name="create_menu_proxy">
+      </callback>
+      <callback name="set_cursor_location">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="area">
+            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="toolbar_reconfigured">
+      <callback name="set_use_preedit">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="use_preedit">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_tooltip">
+      <callback name="set_surrounding">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="tooltips">
-            <type name="GtkTooltips*" c:type="GtkTooltips*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="tip_text">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="tip_private">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="cursor_index">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_surrounding">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="gchar**" c:type="gchar**"/>
+          </parameter>
+          <parameter name="cursor_index">
+            <type name="gint*" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="create-menu-proxy">
+      <callback name="_gtk_reserved5">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="toolbar-reconfigured">
+      </callback>
+      <callback name="_gtk_reserved6">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="set-tooltip">
+      </callback>
+      <glib:signal name="preedit-start">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkTooltips" c:type="GtkTooltips"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gchararray" c:type="gchararray"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="gchararray" c:type="gchararray"/>
-          </parameter>
-        </parameters>
       </glib:signal>
-    </class>
-    <record name="GtkToolButtonPrivate" c:type="GtkToolButtonPrivate"/>
-    <class name="ToolButton"
-           c:type="GtkToolButton"
-           parent="ToolItem"
-           glib:type-name="GtkToolButton"
-           glib:get-type="gtk_tool_button_get_type">
-      <method name="set_label" c:identifier="gtk_tool_button_set_label">
+      <glib:signal name="preedit-end">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
-          </parameter>
-          <parameter name="label">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_label" c:identifier="gtk_tool_button_get_label">
+      </glib:signal>
+      <glib:signal name="preedit-changed">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_use_underline"
-              c:identifier="gtk_tool_button_set_use_underline">
+      </glib:signal>
+      <glib:signal name="commit">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
-          </parameter>
-          <parameter name="use_underline">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_use_underline"
-              c:identifier="gtk_tool_button_get_use_underline">
+      </glib:signal>
+      <glib:signal name="retrieve-surrounding">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_stock_id" c:identifier="gtk_tool_button_set_stock_id">
+      </glib:signal>
+      <glib:signal name="delete-surrounding">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
+          <parameter name="object">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="stock_id">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_stock_id" c:identifier="gtk_tool_button_get_stock_id">
+      </glib:signal>
+    </class>
+    <class name="ListStore"
+           c:type="GtkListStore"
+           parent="GLib.Object"
+           glib:type-name="GtkListStore"
+           glib:get-type="gtk_list_store_get_type">
+      <constructor name="new" c:identifier="gtk_list_store_new">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="ListStore" c:type="GtkListStore*"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
+          <parameter name="n_columns">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_icon_name" c:identifier="gtk_tool_button_set_icon_name">
+      </constructor>
+      <constructor name="newv" c:identifier="gtk_list_store_newv">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="ListStore" c:type="GtkListStore*"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
+          <parameter name="n_columns">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="icon_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="types">
+            <type name="GType" c:type="GType*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_icon_name" c:identifier="gtk_tool_button_get_icon_name">
+      </constructor>
+      <method name="set_column_types"
+              c:identifier="gtk_list_store_set_column_types">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="set_icon_widget"
-              c:identifier="gtk_tool_button_set_icon_widget">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
+          <parameter name="n_columns">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="icon_widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="types">
+            <type name="GType" c:type="GType*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_icon_widget"
-              c:identifier="gtk_tool_button_get_icon_widget">
+      <method name="set_value" c:identifier="gtk_list_store_set_value">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="set_label_widget"
-              c:identifier="gtk_tool_button_set_label_widget">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="label_widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_label_widget"
-              c:identifier="gtk_tool_button_get_label_widget">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
+          <parameter name="value">
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="label">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="use-underline">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="label-widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
-      </property>
-      <property name="stock-id">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="icon-name">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="icon-widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
-      </property>
-      <field name="button_type">
-        <type name="GType" c:type="GType"/>
-      </field>
-      <callback name="clicked">
+      <method name="set" c:identifier="gtk_list_store_set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="GtkToolButton*" c:type="GtkToolButton*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="clicked">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="tool_button_new" c:identifier="gtk_tool_button_new">
-      <return-value>
-        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon_widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tool_button_new_from_stock"
-              c:identifier="gtk_tool_button_new_from_stock">
-      <return-value>
-        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stock_id">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tool_button_get_button"
-              c:identifier="_gtk_tool_button_get_button">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="button">
-          <type name="ToolButton" c:type="GtkToolButton*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkMenuToolButtonPrivate" c:type="GtkMenuToolButtonPrivate"/>
-    <class name="MenuToolButton"
-           c:type="GtkMenuToolButton"
-           parent="ToolButton"
-           glib:type-name="GtkMenuToolButton"
-           glib:get-type="gtk_menu_tool_button_get_type">
-      <method name="set_menu" c:identifier="gtk_menu_tool_button_set_menu">
+      </method>
+      <method name="set_valuesv" c:identifier="gtk_list_store_set_valuesv">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="menu">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="columns">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="values">
+            <type name="GValue" c:type="GValue*"/>
+          </parameter>
+          <parameter name="n_values">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_menu" c:identifier="gtk_menu_tool_button_get_menu">
+      <method name="set_valist" c:identifier="gtk_list_store_set_valist">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="var_args">
+            <type name="va_list" c:type="va_list"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_arrow_tooltip"
-              c:identifier="gtk_menu_tool_button_set_arrow_tooltip">
+      <method name="remove" c:identifier="gtk_list_store_remove">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
-          </parameter>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
-          </parameter>
-          <parameter name="tip_text">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="tip_private">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_arrow_tooltip_text"
-              c:identifier="gtk_menu_tool_button_set_arrow_tooltip_text">
+      <method name="insert" c:identifier="gtk_list_store_insert">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_arrow_tooltip_markup"
-              c:identifier="gtk_menu_tool_button_set_arrow_tooltip_markup">
+      <method name="insert_before" c:identifier="gtk_list_store_insert_before">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="markup">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="sibling">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="menu">
-        <type name="GtkMenu" c:type="GtkMenu"/>
-      </property>
-      <callback name="show_menu">
+      <method name="insert_after" c:identifier="gtk_list_store_insert_after">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="GtkMenuToolButton*" c:type="GtkMenuToolButton*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="sibling">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="show-menu">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="menu_tool_button_new"
-              c:identifier="gtk_menu_tool_button_new">
-      <return-value>
-        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon_widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="menu_tool_button_new_from_stock"
-              c:identifier="gtk_menu_tool_button_new_from_stock">
-      <return-value>
-        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stock_id">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="MessageDialog"
-           c:type="GtkMessageDialog"
-           parent="Dialog"
-           glib:type-name="GtkMessageDialog"
-           glib:get-type="gtk_message_dialog_get_type">
-      <method name="set_image" c:identifier="gtk_message_dialog_set_image">
+      </method>
+      <method name="insert_with_values"
+              c:identifier="gtk_list_store_insert_with_values">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="dialog">
-            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="image">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_markup" c:identifier="gtk_message_dialog_set_markup">
+      <method name="insert_with_valuesv"
+              c:identifier="gtk_list_store_insert_with_valuesv">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="message_dialog">
-            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="str">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="columns">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="values">
+            <type name="GValue" c:type="GValue*"/>
+          </parameter>
+          <parameter name="n_values">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="format_secondary_text"
-              c:identifier="gtk_message_dialog_format_secondary_text">
+      <method name="prepend" c:identifier="gtk_list_store_prepend">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="message_dialog">
-            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="message_format">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="format_secondary_markup"
-              c:identifier="gtk_message_dialog_format_secondary_markup">
+      <method name="append" c:identifier="gtk_list_store_append">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="message_dialog">
-            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="message_format">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="message-type">
-        <type name="GtkMessageType" c:type="GtkMessageType"/>
-      </property>
-      <property name="buttons">
-        <type name="GtkButtonsType" c:type="GtkButtonsType"/>
-      </property>
-      <property name="text">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="use-markup">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="secondary-text">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="secondary-use-markup">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="image">
-        <type name="GtkWidget" c:type="GtkWidget"/>
-      </property>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+      <method name="clear" c:identifier="gtk_list_store_clear">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-    </class>
-    <function name="message_dialog_new" c:identifier="gtk_message_dialog_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="DialogFlags" c:type="GtkDialogFlags"/>
-        </parameter>
-        <parameter name="type">
-          <type name="MessageType" c:type="GtkMessageType"/>
-        </parameter>
-        <parameter name="buttons">
-          <type name="ButtonsType" c:type="GtkButtonsType"/>
-        </parameter>
-        <parameter name="message_format">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="message_dialog_new_with_markup"
-              c:identifier="gtk_message_dialog_new_with_markup">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="DialogFlags" c:type="GtkDialogFlags"/>
-        </parameter>
-        <parameter name="type">
-          <type name="MessageType" c:type="GtkMessageType"/>
-        </parameter>
-        <parameter name="buttons">
-          <type name="ButtonsType" c:type="GtkButtonsType"/>
-        </parameter>
-        <parameter name="message_format">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="find_module" c:identifier="_gtk_find_module">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="type">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="get_module_path" c:identifier="_gtk_get_module_path">
-      <return-value>
-        <type name="gchar**" c:type="gchar**"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="modules_init" c:identifier="_gtk_modules_init">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="argc">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="argv">
-          <type name="gchar" c:type="gchar***"/>
-        </parameter>
-        <parameter name="gtk_modules_args">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="modules_settings_changed"
-              c:identifier="_gtk_modules_settings_changed">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="settings">
-          <type name="Settings" c:type="GtkSettings*"/>
-        </parameter>
-        <parameter name="modules">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <callback name="GtkModuleInitFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="argc">
-          <type name="gint*" c:type="gint*"/>
-        </parameter>
-        <parameter name="argv">
-          <type name="gchar***" c:type="gchar***"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkModuleDisplayInitFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="display">
-          <type name="GdkDisplay*" c:type="GdkDisplay*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GtkMountOperationPrivate" c:type="GtkMountOperationPrivate"/>
-    <class name="MountOperation"
-           c:type="GtkMountOperation"
-           parent="GMountOperation"
-           glib:type-name="GtkMountOperation"
-           glib:get-type="gtk_mount_operation_get_type">
-      <method name="is_showing" c:identifier="gtk_mount_operation_is_showing">
+        <parameters>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="iter_is_valid" c:identifier="gtk_list_store_iter_is_valid">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GtkMountOperation*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_parent" c:identifier="gtk_mount_operation_set_parent">
+      <method name="reorder" c:identifier="gtk_list_store_reorder">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GtkMountOperation*"/>
+          <parameter name="store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="parent">
-            <type name="Window" c:type="GtkWindow*"/>
+          <parameter name="new_order">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_parent" c:identifier="gtk_mount_operation_get_parent">
+      <method name="swap" c:identifier="gtk_list_store_swap">
         <return-value>
-          <type name="Window" c:type="GtkWindow*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GtkMountOperation*"/>
+          <parameter name="store">
+            <type name="ListStore" c:type="GtkListStore*"/>
+          </parameter>
+          <parameter name="a">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="b">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_screen" c:identifier="gtk_mount_operation_set_screen">
+      <method name="move_after" c:identifier="gtk_list_store_move_after">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GtkMountOperation*"/>
+          <parameter name="store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="position" allow-none="1">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_screen" c:identifier="gtk_mount_operation_get_screen">
+      <method name="move_before" c:identifier="gtk_list_store_move_before">
         <return-value>
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="MountOperation" c:type="GtkMountOperation*"/>
+          <parameter name="store">
+            <type name="ListStore" c:type="GtkListStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="position" allow-none="1">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="parent">
-        <type name="GtkWindow" c:type="GtkWindow"/>
-      </property>
-      <property name="is-showing">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="screen">
-        <type name="GtkWindow" c:type="GtkWindow"/>
-      </property>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
-    <function name="mount_operation_new" c:identifier="gtk_mount_operation_new">
+    <callback name="GtkTreeModelFilterVisibleFunc">
       <return-value>
-        <type name="GMountOperation*" c:type="GMountOperation*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
+        <parameter name="model">
+          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <record name="GtkNotebookPage" c:type="GtkNotebookPage"/>
-    <callback name="GtkNotebookWindowCreationFunc">
+    </callback>
+    <callback name="GtkTreeModelFilterModifyFunc">
       <return-value>
-        <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="source">
-          <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+        <parameter name="model">
+          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="page">
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <parameter name="iter">
+          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="x">
-          <type name="gint" c:type="gint"/>
+        <parameter name="value">
+          <type name="GValue*" c:type="GValue*"/>
         </parameter>
-        <parameter name="y">
-          <type name="gint" c:type="gint"/>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
-    <class name="Notebook"
-           c:type="GtkNotebook"
-           parent="Container"
-           glib:type-name="GtkNotebook"
-           glib:get-type="gtk_notebook_get_type">
-      <method name="append_page" c:identifier="gtk_notebook_append_page">
+    <record name="GtkTreeModelFilterPrivate"
+            c:type="GtkTreeModelFilterPrivate"/>
+    <class name="TreeModelFilter"
+           c:type="GtkTreeModelFilter"
+           parent="GLib.Object"
+           glib:type-name="GtkTreeModelFilter"
+           glib:get-type="gtk_tree_model_filter_get_type">
+      <method name="set_visible_func"
+              c:identifier="gtk_tree_model_filter_set_visible_func">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="func">
+            <type name="GtkTreeModelFilterVisibleFunc"
+                  c:type="GtkTreeModelFilterVisibleFunc"/>
           </parameter>
-          <parameter name="tab_label">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="append_page_menu"
-              c:identifier="gtk_notebook_append_page_menu">
+      <method name="set_modify_func"
+              c:identifier="gtk_tree_model_filter_set_modify_func">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="n_columns">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="tab_label">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="types">
+            <type name="GType" c:type="GType*"/>
           </parameter>
-          <parameter name="menu_label">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="func">
+            <type name="GtkTreeModelFilterModifyFunc"
+                  c:type="GtkTreeModelFilterModifyFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prepend_page" c:identifier="gtk_notebook_prepend_page">
+      <method name="set_visible_column"
+              c:identifier="gtk_tree_model_filter_set_visible_column">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
-          <parameter name="tab_label">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prepend_page_menu"
-              c:identifier="gtk_notebook_prepend_page_menu">
+      <method name="get_model" c:identifier="gtk_tree_model_filter_get_model">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+        </parameters>
+      </method>
+      <method name="convert_child_iter_to_iter"
+              c:identifier="gtk_tree_model_filter_convert_child_iter_to_iter">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
-          <parameter name="tab_label">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="filter_iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="menu_label">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="child_iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_page" c:identifier="gtk_notebook_insert_page">
+      <method name="convert_iter_to_child_iter"
+              c:identifier="gtk_tree_model_filter_convert_iter_to_child_iter">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
-          <parameter name="tab_label">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="child_iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="filter_iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_page_menu"
-              c:identifier="gtk_notebook_insert_page_menu">
+      <method name="convert_child_path_to_path"
+              c:identifier="gtk_tree_model_filter_convert_child_path_to_path">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="tab_label">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="menu_label">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="child_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_page" c:identifier="gtk_notebook_remove_page">
+      <method name="convert_path_to_child_path"
+              c:identifier="gtk_tree_model_filter_convert_path_to_child_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
-          <parameter name="page_num">
-            <type name="gint" c:type="gint"/>
+          <parameter name="filter_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_group_id" c:identifier="gtk_notebook_set_group_id">
+      <method name="refilter" c:identifier="gtk_tree_model_filter_refilter">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="group_id">
-            <type name="gint" c:type="gint"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_group_id" c:identifier="gtk_notebook_get_group_id">
+      <method name="clear_cache"
+              c:identifier="gtk_tree_model_filter_clear_cache">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_group" c:identifier="gtk_notebook_set_group">
+      <property name="child-model">
+        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+      </property>
+      <property name="virtual-root">
+        <type name="GtkTreePath" c:type="GtkTreePath"/>
+      </property>
+      <callback name="_gtk_reserved0">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="tree_model_filter_new"
+              c:identifier="gtk_tree_model_filter_new">
+      <return-value>
+        <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+      </return-value>
+      <parameters>
+        <parameter name="child_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="root" allow-none="1">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkEntryCompletionPrivate"
+            c:type="GtkEntryCompletionPrivate"/>
+    <callback name="GtkEntryCompletionMatchFunc">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="completion">
+          <type name="GtkEntryCompletion*" c:type="GtkEntryCompletion*"/>
+        </parameter>
+        <parameter name="key">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="EntryCompletion"
+           c:type="GtkEntryCompletion"
+           parent="GLib.Object"
+           glib:type-name="GtkEntryCompletion"
+           glib:get-type="gtk_entry_completion_get_type">
+      <constructor name="new" c:identifier="gtk_entry_completion_new">
+        <return-value>
+          <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+        </return-value>
+      </constructor>
+      <method name="get_entry" c:identifier="gtk_entry_completion_get_entry">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="group">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_group" c:identifier="gtk_notebook_get_group">
+      <method name="set_model" c:identifier="gtk_entry_completion_set_model">
         <return-value>
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          </parameter>
+          <parameter name="model" allow-none="1">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_current_page"
-              c:identifier="gtk_notebook_get_current_page">
+      <method name="get_model" c:identifier="gtk_entry_completion_get_model">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_nth_page" c:identifier="gtk_notebook_get_nth_page">
+      <method name="set_match_func"
+              c:identifier="gtk_entry_completion_set_match_func">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="page_num">
-            <type name="gint" c:type="gint"/>
+          <parameter name="func">
+            <type name="GtkEntryCompletionMatchFunc"
+                  c:type="GtkEntryCompletionMatchFunc"/>
+          </parameter>
+          <parameter name="func_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="func_notify">
+            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_n_pages" c:identifier="gtk_notebook_get_n_pages">
+      <method name="set_minimum_key_length"
+              c:identifier="gtk_entry_completion_set_minimum_key_length">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="page_num" c:identifier="gtk_notebook_page_num">
+      <method name="get_minimum_key_length"
+              c:identifier="gtk_entry_completion_get_minimum_key_length">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_current_page"
-              c:identifier="gtk_notebook_set_current_page">
+      <method name="complete" c:identifier="gtk_entry_completion_complete">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="page_num">
-            <type name="gint" c:type="gint"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="next_page" c:identifier="gtk_notebook_next_page">
+      <method name="insert_prefix"
+              c:identifier="gtk_entry_completion_insert_prefix">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prev_page" c:identifier="gtk_notebook_prev_page">
+      <method name="insert_action_text"
+              c:identifier="gtk_entry_completion_insert_action_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          </parameter>
+          <parameter name="index_">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_border"
-              c:identifier="gtk_notebook_set_show_border">
+      <method name="insert_action_markup"
+              c:identifier="gtk_entry_completion_insert_action_markup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="show_border">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="index_">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="markup">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_show_border"
-              c:identifier="gtk_notebook_get_show_border">
+      <method name="delete_action"
+              c:identifier="gtk_entry_completion_delete_action">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          </parameter>
+          <parameter name="index_">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_tabs" c:identifier="gtk_notebook_set_show_tabs">
+      <method name="set_inline_completion"
+              c:identifier="gtk_entry_completion_set_inline_completion">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="show_tabs">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="inline_completion">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_show_tabs" c:identifier="gtk_notebook_get_show_tabs">
+      <method name="get_inline_completion"
+              c:identifier="gtk_entry_completion_get_inline_completion">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tab_pos" c:identifier="gtk_notebook_set_tab_pos">
+      <method name="set_inline_selection"
+              c:identifier="gtk_entry_completion_set_inline_selection">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="pos">
-            <type name="PositionType" c:type="GtkPositionType"/>
+          <parameter name="inline_selection">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tab_pos" c:identifier="gtk_notebook_get_tab_pos">
+      <method name="get_inline_selection"
+              c:identifier="gtk_entry_completion_get_inline_selection">
         <return-value>
-          <type name="PositionType" c:type="GtkPositionType"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_homogeneous_tabs"
-              c:identifier="gtk_notebook_set_homogeneous_tabs">
+      <method name="set_popup_completion"
+              c:identifier="gtk_entry_completion_set_popup_completion">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="homogeneous">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="popup_completion">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tab_border" c:identifier="gtk_notebook_set_tab_border">
+      <method name="get_popup_completion"
+              c:identifier="gtk_entry_completion_get_popup_completion">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="border_width">
-            <type name="guint" c:type="guint"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tab_hborder"
-              c:identifier="gtk_notebook_set_tab_hborder">
+      <method name="set_popup_set_width"
+              c:identifier="gtk_entry_completion_set_popup_set_width">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="tab_hborder">
-            <type name="guint" c:type="guint"/>
+          <parameter name="popup_set_width">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tab_vborder"
-              c:identifier="gtk_notebook_set_tab_vborder">
+      <method name="get_popup_set_width"
+              c:identifier="gtk_entry_completion_get_popup_set_width">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="tab_vborder">
-            <type name="guint" c:type="guint"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_scrollable" c:identifier="gtk_notebook_set_scrollable">
+      <method name="set_popup_single_match"
+              c:identifier="gtk_entry_completion_set_popup_single_match">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="scrollable">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="popup_single_match">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_scrollable" c:identifier="gtk_notebook_get_scrollable">
+      <method name="get_popup_single_match"
+              c:identifier="gtk_entry_completion_get_popup_single_match">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="popup_enable" c:identifier="gtk_notebook_popup_enable">
+      <method name="get_completion_prefix"
+              c:identifier="gtk_entry_completion_get_completion_prefix">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="popup_disable" c:identifier="gtk_notebook_popup_disable">
+      <method name="set_text_column"
+              c:identifier="gtk_entry_completion_set_text_column">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tab_label" c:identifier="gtk_notebook_get_tab_label">
+      <method name="get_text_column"
+              c:identifier="gtk_entry_completion_get_text_column">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tab_label" c:identifier="gtk_notebook_set_tab_label">
+      <property name="model">
+        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+      </property>
+      <property name="minimum-key-length">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="text-column">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="inline-completion">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="popup-completion">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="popup-set-width">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="popup-single-match">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="inline-selection">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="match_selected">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="GtkEntryCompletion*" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="tab_label">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_tab_label_text"
-              c:identifier="gtk_notebook_set_tab_label_text">
+      </callback>
+      <callback name="action_activated">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="completion">
+            <type name="GtkEntryCompletion*" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="tab_text">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="index_">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_tab_label_text"
-              c:identifier="gtk_notebook_get_tab_label_text">
+      </callback>
+      <callback name="insert_prefix">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="GtkEntryCompletion*" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="prefix">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_menu_label" c:identifier="gtk_notebook_get_menu_label">
+      </callback>
+      <callback name="cursor_on_match">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="completion">
+            <type name="GtkEntryCompletion*" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="model">
+            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_menu_label" c:identifier="gtk_notebook_set_menu_label">
+      </callback>
+      <callback name="_gtk_reserved0">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="insert-prefix">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="match-selected">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTreeModel" c:type="GtkTreeModel"/>
           </parameter>
-          <parameter name="menu_label">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="p0">
+            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_menu_label_text"
-              c:identifier="gtk_notebook_set_menu_label_text">
+      </glib:signal>
+      <glib:signal name="cursor-on-match">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="object">
+            <type name="GtkTreeModel" c:type="GtkTreeModel"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="p0">
+            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
           </parameter>
-          <parameter name="menu_text">
-            <type name="gchar" c:type="gchar*"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="action-activated">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_menu_label_text"
-              c:identifier="gtk_notebook_get_menu_label_text">
+      </glib:signal>
+    </class>
+    <class name="Entry"
+           c:type="GtkEntry"
+           parent="Widget"
+           glib:type-name="GtkEntry"
+           glib:get-type="gtk_entry_get_type">
+      <method name="set_visibility" c:identifier="gtk_entry_set_visibility">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="visible">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="query_tab_label_packing"
-              c:identifier="gtk_notebook_query_tab_label_packing">
+      <method name="get_visibility" c:identifier="gtk_entry_get_visibility">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="expand">
-            <type name="gboolean" c:type="gboolean*"/>
-          </parameter>
-          <parameter name="fill">
-            <type name="gboolean" c:type="gboolean*"/>
-          </parameter>
-          <parameter name="pack_type">
-            <type name="PackType" c:type="GtkPackType*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tab_label_packing"
-              c:identifier="gtk_notebook_set_tab_label_packing">
+      <method name="set_invisible_char"
+              c:identifier="gtk_entry_set_invisible_char">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="expand">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="fill">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="pack_type">
-            <type name="PackType" c:type="GtkPackType"/>
+          <parameter name="ch">
+            <type name="gunichar" c:type="gunichar"/>
           </parameter>
         </parameters>
       </method>
-      <method name="reorder_child" c:identifier="gtk_notebook_reorder_child">
+      <method name="get_invisible_char"
+              c:identifier="gtk_entry_get_invisible_char">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="gunichar" c:type="gunichar"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tab_reorderable"
-              c:identifier="gtk_notebook_get_tab_reorderable">
+      <method name="set_has_frame" c:identifier="gtk_entry_set_has_frame">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tab_reorderable"
-              c:identifier="gtk_notebook_set_tab_reorderable">
+      <method name="get_has_frame" c:identifier="gtk_entry_get_has_frame">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="reorderable">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tab_detachable"
-              c:identifier="gtk_notebook_get_tab_detachable">
+      <method name="set_inner_border"
+              c:identifier="gtk_entry_set_inner_border">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="border" allow-none="1">
+            <type name="Border" c:type="GtkBorder*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tab_detachable"
-              c:identifier="gtk_notebook_set_tab_detachable">
+      <method name="get_inner_border"
+              c:identifier="gtk_entry_get_inner_border">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Border" c:type="GtkBorder*"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="detachable">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="tab-pos">
-        <type name="GtkPositionType" c:type="GtkPositionType"/>
-      </property>
-      <property name="show-tabs">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="show-border">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="scrollable">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="tab-border">
-        <type name="guint" c:type="guint"/>
-      </property>
-      <property name="tab-hborder">
-        <type name="guint" c:type="guint"/>
-      </property>
-      <property name="tab-vborder">
-        <type name="guint" c:type="guint"/>
-      </property>
-      <property name="page">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="enable-popup">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="group-id">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="group">
-        <type name="gpointer" c:type="gpointer"/>
-      </property>
-      <property name="homogeneous">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <callback name="switch_page">
+      <method name="set_max_length" c:identifier="gtk_entry_set_max_length">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="page">
-            <type name="GtkNotebookPage*" c:type="GtkNotebookPage*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="page_num">
-            <type name="guint" c:type="guint"/>
+          <parameter name="max">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="select_page">
+      </method>
+      <method name="get_max_length" c:identifier="gtk_entry_get_max_length">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="move_focus">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="focus_tab">
+      </method>
+      <method name="set_activates_default"
+              c:identifier="gtk_entry_set_activates_default">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="type">
-            <type name="GtkNotebookTab" c:type="GtkNotebookTab"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="change_current_page">
+      </method>
+      <method name="get_activates_default"
+              c:identifier="gtk_entry_get_activates_default">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="offset">
-            <type name="gint" c:type="gint"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_focus_out">
+      </method>
+      <method name="set_width_chars" c:identifier="gtk_entry_set_width_chars">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+          <parameter name="n_chars">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="reorder_tab">
+      </method>
+      <method name="get_width_chars" c:identifier="gtk_entry_get_width_chars">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="direction">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
-          </parameter>
-          <parameter name="move_to_last">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="insert_page">
+      </method>
+      <method name="set_text" c:identifier="gtk_entry_set_text">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="tab_label">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="menu_label">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="create_window">
+      </method>
+      <method name="get_text" c:identifier="gtk_entry_get_text">
         <return-value>
-          <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="page">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </method>
+      <method name="get_layout" c:identifier="gtk_entry_get_layout">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
         </return-value>
-      </callback>
-      <glib:signal name="switch-page">
+        <parameters>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_layout_offsets"
+              c:identifier="gtk_entry_get_layout_offsets">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+          <parameter name="x">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="focus-tab">
+      </method>
+      <method name="set_alignment" c:identifier="gtk_entry_set_alignment">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkNotebookTab" c:type="GtkNotebookTab"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
+          </parameter>
+          <parameter name="xalign">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="select-page">
+      </method>
+      <method name="get_alignment" c:identifier="gtk_entry_get_alignment">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="float" c:type="gfloat"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="change-current-page">
+      </method>
+      <method name="set_completion" c:identifier="gtk_entry_set_completion">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gint" c:type="gint"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
+          </parameter>
+          <parameter name="completion" allow-none="1">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="move-focus-out">
+      </method>
+      <method name="get_completion" c:identifier="gtk_entry_get_completion">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="reorder-tab">
+      </method>
+      <method name="layout_index_to_text_index"
+              c:identifier="gtk_entry_layout_index_to_text_index">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="layout_index">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="page-reordered">
+      </method>
+      <method name="text_index_to_layout_index"
+              c:identifier="gtk_entry_text_index_to_layout_index">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+          <parameter name="text_index">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="page-removed">
+      </method>
+      <method name="set_cursor_hadjustment"
+              c:identifier="gtk_entry_set_cursor_hadjustment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="page-added">
+      </method>
+      <method name="get_cursor_hadjustment"
+              c:identifier="gtk_entry_get_cursor_hadjustment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="create-window">
+      </method>
+      <method name="append_text" c:identifier="gtk_entry_append_text">
         <return-value>
-          <type name="GtkNotebook" c:type="GtkNotebook"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="gint" c:type="gint"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="notebook_new" c:identifier="gtk_notebook_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="notebook_set_window_creation_hook"
-              c:identifier="gtk_notebook_set_window_creation_hook">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="func">
-          <type name="GtkNotebookWindowCreationFunc"
-                  c:type="GtkNotebookWindowCreationFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <glib:boxed c:type="PaperSize"
-                glib:name="PaperSize"
-                glib:type-name="GtkPaperSize"
-                glib:get-type="gtk_paper_size_get_type">
-      <constructor name="new" c:identifier="gtk_paper_size_new">
+      </method>
+      <method name="prepend_text" c:identifier="gtk_entry_prepend_text">
         <return-value>
-          <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_ppd"
-                   c:identifier="gtk_paper_size_new_from_ppd">
+      </method>
+      <method name="set_position" c:identifier="gtk_entry_set_position">
         <return-value>
-          <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ppd_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="ppd_display_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="height">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_custom" c:identifier="gtk_paper_size_new_custom">
+      </method>
+      <method name="select_region" c:identifier="gtk_entry_select_region">
         <return-value>
-          <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="display_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="height">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="start">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="end">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_paper_size_copy">
+      </method>
+      <method name="set_editable" c:identifier="gtk_entry_set_editable">
         <return-value>
-          <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="other">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
+          </parameter>
+          <parameter name="editable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_key_file"
-                   c:identifier="gtk_paper_size_new_from_key_file">
+      </method>
+      <property name="cursor-position">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="selection-bound">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="editable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="max-length">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="visibility">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="has-frame">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="inner-border">
+        <type name="GtkBorder" c:type="GtkBorder"/>
+      </property>
+      <property name="invisible-char">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <property name="activates-default">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="width-chars">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="scroll-offset">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="xalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="truncate-multiline">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="shadow-type">
+        <type name="GtkShadowType" c:type="GtkShadowType"/>
+      </property>
+      <callback name="populate_popup">
         <return-value>
-          <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
-          </parameter>
-          <parameter name="group_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="entry">
+            <type name="GtkEntry*" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="menu">
+            <type name="GtkMenu*" c:type="GtkMenu*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_paper_size_free">
+      </callback>
+      <callback name="activate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="entry">
+            <type name="GtkEntry*" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="is_equal" c:identifier="gtk_paper_size_is_equal">
+      </callback>
+      <callback name="move_cursor">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size1">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="entry">
+            <type name="GtkEntry*" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="size2">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="step">
+            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_name" c:identifier="gtk_paper_size_get_name">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="extend_selection">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_display_name"
-              c:identifier="gtk_paper_size_get_display_name">
+      </callback>
+      <callback name="insert_at_cursor">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="entry">
+            <type name="GtkEntry*" c:type="GtkEntry*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_ppd_name" c:identifier="gtk_paper_size_get_ppd_name">
+      </callback>
+      <callback name="delete_from_cursor">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="entry">
+            <type name="GtkEntry*" c:type="GtkEntry*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="GtkDeleteType" c:type="GtkDeleteType"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_width" c:identifier="gtk_paper_size_get_width">
+      </callback>
+      <callback name="backspace">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="entry">
+            <type name="GtkEntry*" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_height" c:identifier="gtk_paper_size_get_height">
+      </callback>
+      <callback name="cut_clipboard">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="entry">
+            <type name="GtkEntry*" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="is_custom" c:identifier="gtk_paper_size_is_custom">
+      </callback>
+      <callback name="copy_clipboard">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="entry">
+            <type name="GtkEntry*" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_size" c:identifier="gtk_paper_size_set_size">
+      </callback>
+      <callback name="paste_clipboard">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-          <parameter name="height">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="entry">
+            <type name="GtkEntry*" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_default_top_margin"
-              c:identifier="gtk_paper_size_get_default_top_margin">
+      </callback>
+      <callback name="toggle_overwrite">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="entry">
+            <type name="GtkEntry*" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_default_bottom_margin"
-              c:identifier="gtk_paper_size_get_default_bottom_margin">
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="move-cursor">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="object">
+            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_default_left_margin"
-              c:identifier="gtk_paper_size_get_default_left_margin">
+      </glib:signal>
+      <glib:signal name="copy-clipboard">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="populate-popup">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="object">
+            <type name="GtkMenu" c:type="GtkMenu"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_default_right_margin"
-              c:identifier="gtk_paper_size_get_default_right_margin">
+      </glib:signal>
+      <glib:signal name="activate">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="insert-at-cursor">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="to_key_file" c:identifier="gtk_paper_size_to_key_file">
+      </glib:signal>
+      <glib:signal name="delete-from-cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
+          <parameter name="object">
+            <type name="GtkDeleteType" c:type="GtkDeleteType"/>
           </parameter>
-          <parameter name="group_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-    </glib:boxed>
-    <function name="paper_size_get_paper_sizes"
-              c:identifier="gtk_paper_size_get_paper_sizes">
+      </glib:signal>
+      <glib:signal name="backspace">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="cut-clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="paste-clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="toggle-overwrite">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="entry_new" c:identifier="gtk_entry_new">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="entry_new_with_max_length"
+              c:identifier="gtk_entry_new_with_max_length">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="include_custom">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="max">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="paper_size_get_default"
-              c:identifier="gtk_paper_size_get_default">
+    <record name="GtkTreeViewPrivate" c:type="GtkTreeViewPrivate"/>
+    <callback name="GtkTreeViewColumnDropFunc">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
-    </function>
-    <class name="PageSetup"
-           c:type="GtkPageSetup"
-           parent="GLib.Object"
-           glib:type-name="GtkPageSetup"
-           glib:get-type="gtk_page_setup_get_type">
-      <constructor name="new" c:identifier="gtk_page_setup_new">
-        <return-value>
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
-        </return-value>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_page_setup_copy">
+      <parameters>
+        <parameter name="tree_view">
+          <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+        </parameter>
+        <parameter name="prev_column">
+          <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+        </parameter>
+        <parameter name="next_column">
+          <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GtkTreeViewMappingFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_view">
+          <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GtkTreeViewSearchEqualFunc">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="model">
+          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="key">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="search_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GtkTreeViewRowSeparatorFunc">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="model">
+          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GtkTreeViewSearchPositionFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_view">
+          <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+        </parameter>
+        <parameter name="search_dialog">
+          <type name="GtkWidget*" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="TreeView"
+           c:type="GtkTreeView"
+           parent="Container"
+           glib:type-name="GtkTreeView"
+           glib:get-type="gtk_tree_view_get_type">
+      <method name="get_model" c:identifier="gtk_tree_view_get_model">
         <return-value>
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </return-value>
         <parameters>
-          <parameter name="other">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_file"
-                   c:identifier="gtk_page_setup_new_from_file">
+      </method>
+      <method name="set_model" c:identifier="gtk_tree_view_set_model">
         <return-value>
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="model" allow-none="1">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_key_file"
-                   c:identifier="gtk_page_setup_new_from_key_file">
+      </method>
+      <method name="get_selection" c:identifier="gtk_tree_view_get_selection">
         <return-value>
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <type name="GtkTreeSelection" c:type="GtkTreeSelection*"/>
         </return-value>
         <parameters>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
-          </parameter>
-          <parameter name="group_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="get_orientation"
-              c:identifier="gtk_page_setup_get_orientation">
+      </method>
+      <method name="get_hadjustment"
+              c:identifier="gtk_tree_view_get_hadjustment">
         <return-value>
-          <type name="PageOrientation" c:type="GtkPageOrientation"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_orientation"
-              c:identifier="gtk_page_setup_set_orientation">
+      <method name="set_hadjustment"
+              c:identifier="gtk_tree_view_set_hadjustment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="orientation">
-            <type name="PageOrientation" c:type="GtkPageOrientation"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paper_size"
-              c:identifier="gtk_page_setup_get_paper_size">
+      <method name="get_vadjustment"
+              c:identifier="gtk_tree_view_get_vadjustment">
         <return-value>
-          <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_paper_size"
-              c:identifier="gtk_page_setup_set_paper_size">
+      <method name="set_vadjustment"
+              c:identifier="gtk_tree_view_set_vadjustment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_top_margin"
-              c:identifier="gtk_page_setup_get_top_margin">
+      <method name="get_headers_visible"
+              c:identifier="gtk_tree_view_get_headers_visible">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_top_margin"
-              c:identifier="gtk_page_setup_set_top_margin">
+      <method name="set_headers_visible"
+              c:identifier="gtk_tree_view_set_headers_visible">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
-          </parameter>
-          <parameter name="margin">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="headers_visible">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_bottom_margin"
-              c:identifier="gtk_page_setup_get_bottom_margin">
+      <method name="columns_autosize"
+              c:identifier="gtk_tree_view_columns_autosize">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_bottom_margin"
-              c:identifier="gtk_page_setup_set_bottom_margin">
+      <method name="get_headers_clickable"
+              c:identifier="gtk_tree_view_get_headers_clickable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
-          </parameter>
-          <parameter name="margin">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_left_margin"
-              c:identifier="gtk_page_setup_get_left_margin">
+      <method name="set_headers_clickable"
+              c:identifier="gtk_tree_view_set_headers_clickable">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_left_margin"
-              c:identifier="gtk_page_setup_set_left_margin">
+      <method name="set_rules_hint"
+              c:identifier="gtk_tree_view_set_rules_hint">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="margin">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+        </parameters>
+      </method>
+      <method name="get_rules_hint"
+              c:identifier="gtk_tree_view_get_rules_hint">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_right_margin"
-              c:identifier="gtk_page_setup_get_right_margin">
+      <method name="append_column" c:identifier="gtk_tree_view_append_column">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_right_margin"
-              c:identifier="gtk_page_setup_set_right_margin">
+      <method name="remove_column" c:identifier="gtk_tree_view_remove_column">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
-          </parameter>
-          <parameter name="margin">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_paper_size_and_default_margins"
-              c:identifier="gtk_page_setup_set_paper_size_and_default_margins">
+      <method name="insert_column" c:identifier="gtk_tree_view_insert_column">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paper_width"
-              c:identifier="gtk_page_setup_get_paper_width">
+      <method name="insert_column_with_attributes"
+              c:identifier="gtk_tree_view_insert_column_with_attributes">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paper_height"
-              c:identifier="gtk_page_setup_get_paper_height">
+      <method name="insert_column_with_data_func"
+              c:identifier="gtk_tree_view_insert_column_with_data_func">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="GtkTreeCellDataFunc" c:type="GtkTreeCellDataFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="dnotify">
+            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_page_width"
-              c:identifier="gtk_page_setup_get_page_width">
+      <method name="get_column" c:identifier="gtk_tree_view_get_column">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="n">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_page_height"
-              c:identifier="gtk_page_setup_get_page_height">
+      <method name="get_columns" c:identifier="gtk_tree_view_get_columns">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="GList" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="load_file" c:identifier="gtk_page_setup_load_file">
+      <method name="move_column_after"
+              c:identifier="gtk_tree_view_move_column_after">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="file_name">
-            <type name="char" c:type="char*"/>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="base_column" allow-none="1">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="to_file" c:identifier="gtk_page_setup_to_file">
+      <method name="set_expander_column"
+              c:identifier="gtk_tree_view_set_expander_column">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
-          </parameter>
-          <parameter name="file_name">
-            <type name="char" c:type="char*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="load_key_file" c:identifier="gtk_page_setup_load_key_file">
+      <method name="get_expander_column"
+              c:identifier="gtk_tree_view_get_expander_column">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
-          </parameter>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
-          </parameter>
-          <parameter name="group_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="to_key_file" c:identifier="gtk_page_setup_to_key_file">
+      <method name="set_column_drag_function"
+              c:identifier="gtk_tree_view_set_column_drag_function">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
+          <parameter name="func">
+            <type name="GtkTreeViewColumnDropFunc"
+                  c:type="GtkTreeViewColumnDropFunc"/>
           </parameter>
-          <parameter name="group_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-    </class>
-    <class name="Socket"
-           c:type="GtkSocket"
-           parent="Container"
-           glib:type-name="GtkSocket"
-           glib:get-type="gtk_socket_get_type">
-      <method name="add_id" c:identifier="gtk_socket_add_id">
+      <method name="scroll_to_point"
+              c:identifier="gtk_tree_view_scroll_to_point">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="socket_">
-            <type name="Socket" c:type="GtkSocket*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="window_id">
-            <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+          <parameter name="tree_x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="tree_y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_id" c:identifier="gtk_socket_get_id">
+      <method name="scroll_to_cell"
+              c:identifier="gtk_tree_view_scroll_to_cell">
         <return-value>
-          <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="socket_">
-            <type name="Socket" c:type="GtkSocket*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="column" allow-none="1">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="use_align">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="row_align">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="col_align">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
-      <method name="steal" c:identifier="gtk_socket_steal">
+      <method name="row_activated" c:identifier="gtk_tree_view_row_activated">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="socket_">
-            <type name="Socket" c:type="GtkSocket*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="wid">
-            <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="plug_added">
+      <method name="expand_all" c:identifier="gtk_tree_view_expand_all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="socket_">
-            <type name="GtkSocket*" c:type="GtkSocket*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="plug_removed">
+      </method>
+      <method name="collapse_all" c:identifier="gtk_tree_view_collapse_all">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="socket_">
-            <type name="GtkSocket*" c:type="GtkSocket*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="plug-added">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="plug-removed">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="socket_new" c:identifier="gtk_socket_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="Plug"
-           c:type="GtkPlug"
-           parent="Window"
-           glib:type-name="GtkPlug"
-           glib:get-type="gtk_plug_get_type">
-      <method name="construct" c:identifier="gtk_plug_construct">
+      </method>
+      <method name="expand_to_path"
+              c:identifier="gtk_tree_view_expand_to_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="plug">
-            <type name="Plug" c:type="GtkPlug*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="socket_id">
-            <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="construct_for_display"
-              c:identifier="gtk_plug_construct_for_display">
+      <method name="expand_row" c:identifier="gtk_tree_view_expand_row">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="plug">
-            <type name="Plug" c:type="GtkPlug*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="display">
-            <type name="Gdk.Display" c:type="GdkDisplay*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="socket_id">
-            <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+          <parameter name="open_all">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_id" c:identifier="gtk_plug_get_id">
+      <method name="collapse_row" c:identifier="gtk_tree_view_collapse_row">
         <return-value>
-          <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="plug">
-            <type name="Plug" c:type="GtkPlug*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="embedded">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <callback name="embedded">
+      <method name="map_expanded_rows"
+              c:identifier="gtk_tree_view_map_expanded_rows">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="plug">
-            <type name="GtkPlug*" c:type="GtkPlug*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="embedded">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="plug_new" c:identifier="gtk_plug_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="socket_id">
-          <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="plug_new_for_display"
-              c:identifier="gtk_plug_new_for_display">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="display">
-          <type name="Gdk.Display" c:type="GdkDisplay*"/>
-        </parameter>
-        <parameter name="socket_id">
-          <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="plug_add_to_socket" c:identifier="_gtk_plug_add_to_socket">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="plug">
-          <type name="Plug" c:type="GtkPlug*"/>
-        </parameter>
-        <parameter name="socket_">
-          <type name="Socket" c:type="GtkSocket*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="plug_remove_from_socket"
-              c:identifier="_gtk_plug_remove_from_socket">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="plug">
-          <type name="Plug" c:type="GtkPlug*"/>
-        </parameter>
-        <parameter name="socket_">
-          <type name="Socket" c:type="GtkSocket*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="PrintContext"
-           c:type="GtkPrintContext"
-           parent="GLib.Object"
-           glib:type-name="GtkPrintContext"
-           glib:get-type="gtk_print_context_get_type">
-      <method name="get_cairo_context"
-              c:identifier="gtk_print_context_get_cairo_context">
-        <return-value>
-          <type name="cairo_t" c:type="cairo_t*"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="func">
+            <type name="GtkTreeViewMappingFunc"
+                  c:type="GtkTreeViewMappingFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_page_setup"
-              c:identifier="gtk_print_context_get_page_setup">
+      <method name="row_expanded" c:identifier="gtk_tree_view_row_expanded">
         <return-value>
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_width" c:identifier="gtk_print_context_get_width">
+      <method name="set_reorderable"
+              c:identifier="gtk_tree_view_set_reorderable">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="reorderable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_height" c:identifier="gtk_print_context_get_height">
+      <method name="get_reorderable"
+              c:identifier="gtk_tree_view_get_reorderable">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_dpi_x" c:identifier="gtk_print_context_get_dpi_x">
+      <method name="set_cursor" c:identifier="gtk_tree_view_set_cursor">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="focus_column" allow-none="1">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="start_editing">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_dpi_y" c:identifier="gtk_print_context_get_dpi_y">
+      <method name="set_cursor_on_cell"
+              c:identifier="gtk_tree_view_set_cursor_on_cell">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="focus_column" allow-none="1">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="focus_cell" allow-none="1">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="start_editing">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_pango_fontmap"
-              c:identifier="gtk_print_context_get_pango_fontmap">
+      <method name="get_cursor" c:identifier="gtk_tree_view_get_cursor">
         <return-value>
-          <type name="Pango.FontMap" c:type="PangoFontMap*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="focus_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_pango_context"
-              c:identifier="gtk_print_context_create_pango_context">
+      <method name="get_bin_window"
+              c:identifier="gtk_tree_view_get_bin_window">
         <return-value>
-          <type name="Pango.Context" c:type="PangoContext*"/>
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_pango_layout"
-              c:identifier="gtk_print_context_create_pango_layout">
+      <method name="get_path_at_pos"
+              c:identifier="gtk_tree_view_get_path_at_pos">
         <return-value>
-          <type name="Pango.Layout" c:type="PangoLayout*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn**"/>
+          </parameter>
+          <parameter name="cell_x">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="cell_y">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_cairo_context"
-              c:identifier="gtk_print_context_set_cairo_context">
+      <method name="get_cell_area" c:identifier="gtk_tree_view_get_cell_area">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="cr">
-            <type name="cairo_t" c:type="cairo_t*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="dpi_x">
-            <type name="double" c:type="double"/>
+          <parameter name="column" allow-none="1">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="dpi_y">
-            <type name="double" c:type="double"/>
+          <parameter name="rect">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </method>
-    </class>
-    <callback name="GtkPrintSettingsFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="key">
-          <type name="gchar*" c:type="gchar*"/>
-        </parameter>
-        <parameter name="value">
-          <type name="gchar*" c:type="gchar*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GtkPageRange" c:type="GtkPageRange">
-      <field name="start">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="end">
-        <type name="gint" c:type="gint"/>
-      </field>
-    </record>
-    <class name="PrintSettings"
-           c:type="GtkPrintSettings"
-           parent="GLib.Object"
-           glib:type-name="GtkPrintSettings"
-           glib:get-type="gtk_print_settings_get_type">
-      <constructor name="new" c:identifier="gtk_print_settings_new">
-        <return-value>
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-        </return-value>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_print_settings_copy">
+      <method name="get_background_area"
+              c:identifier="gtk_tree_view_get_background_area">
         <return-value>
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="other">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="rect">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_file"
-                   c:identifier="gtk_print_settings_new_from_file">
+      </method>
+      <method name="get_visible_rect"
+              c:identifier="gtk_tree_view_get_visible_rect">
         <return-value>
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="visible_rect">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_key_file"
-                   c:identifier="gtk_print_settings_new_from_key_file">
+      </method>
+      <method name="widget_to_tree_coords"
+              c:identifier="gtk_tree_view_widget_to_tree_coords">
         <return-value>
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="group_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="wx">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="wy">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="tx">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="ty">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="load_file" c:identifier="gtk_print_settings_load_file">
+      </method>
+      <method name="tree_to_widget_coords"
+              c:identifier="gtk_tree_view_tree_to_widget_coords">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="file_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="tx">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="ty">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="wx">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="wy">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="to_file" c:identifier="gtk_print_settings_to_file">
+      <method name="get_visible_range"
+              c:identifier="gtk_tree_view_get_visible_range">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="file_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="start_path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="end_path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="load_key_file"
-              c:identifier="gtk_print_settings_load_key_file">
+      <method name="enable_model_drag_source"
+              c:identifier="gtk_tree_view_enable_model_drag_source">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
+          <parameter name="start_button_mask">
+            <type name="GdkModifierType" c:type="GdkModifierType"/>
           </parameter>
-          <parameter name="group_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="targets">
+            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="n_targets">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="actions">
+            <type name="GdkDragAction" c:type="GdkDragAction"/>
           </parameter>
         </parameters>
       </method>
-      <method name="to_key_file" c:identifier="gtk_print_settings_to_key_file">
+      <method name="enable_model_drag_dest"
+              c:identifier="gtk_tree_view_enable_model_drag_dest">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
+          <parameter name="targets">
+            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
           </parameter>
-          <parameter name="group_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="n_targets">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="actions">
+            <type name="GdkDragAction" c:type="GdkDragAction"/>
           </parameter>
         </parameters>
       </method>
-      <method name="has_key" c:identifier="gtk_print_settings_has_key">
+      <method name="unset_rows_drag_source"
+              c:identifier="gtk_tree_view_unset_rows_drag_source">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get" c:identifier="gtk_print_settings_get">
+      <method name="unset_rows_drag_dest"
+              c:identifier="gtk_tree_view_unset_rows_drag_dest">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set" c:identifier="gtk_print_settings_set">
+      <method name="set_drag_dest_row"
+              c:identifier="gtk_tree_view_set_drag_dest_row">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="value">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="pos">
+            <type name="TreeViewDropPosition"
+                  c:type="GtkTreeViewDropPosition"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unset" c:identifier="gtk_print_settings_unset">
+      <method name="get_drag_dest_row"
+              c:identifier="gtk_tree_view_get_drag_dest_row">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="TreeViewDropPosition"
+                  c:type="GtkTreeViewDropPosition*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="foreach" c:identifier="gtk_print_settings_foreach">
+      <method name="get_dest_row_at_pos"
+              c:identifier="gtk_tree_view_get_dest_row_at_pos">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="func">
-            <type name="GtkPrintSettingsFunc" c:type="GtkPrintSettingsFunc"/>
+          <parameter name="drag_x">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="drag_y">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="TreeViewDropPosition"
+                  c:type="GtkTreeViewDropPosition*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_bool" c:identifier="gtk_print_settings_get_bool">
+      <method name="create_row_drag_icon"
+              c:identifier="gtk_tree_view_create_row_drag_icon">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_bool" c:identifier="gtk_print_settings_set_bool">
+      <method name="set_enable_search"
+              c:identifier="gtk_tree_view_set_enable_search">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="value">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="enable_search">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_double" c:identifier="gtk_print_settings_get_double">
+      <method name="get_enable_search"
+              c:identifier="gtk_tree_view_get_enable_search">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_double_with_default"
-              c:identifier="gtk_print_settings_get_double_with_default">
+      <method name="get_search_column"
+              c:identifier="gtk_tree_view_get_search_column">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="def">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_double" c:identifier="gtk_print_settings_set_double">
+      <method name="set_search_column"
+              c:identifier="gtk_tree_view_set_search_column">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="value">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_length" c:identifier="gtk_print_settings_get_length">
+      <method name="get_search_equal_func"
+              c:identifier="gtk_tree_view_get_search_equal_func">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="GtkTreeViewSearchEqualFunc"
+                c:type="GtkTreeViewSearchEqualFunc"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_length" c:identifier="gtk_print_settings_set_length">
+      <method name="set_search_equal_func"
+              c:identifier="gtk_tree_view_set_search_equal_func">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="search_equal_func">
+            <type name="GtkTreeViewSearchEqualFunc"
+                  c:type="GtkTreeViewSearchEqualFunc"/>
           </parameter>
-          <parameter name="value">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="search_user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="search_destroy">
+            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_int" c:identifier="gtk_print_settings_get_int">
+      <method name="get_search_entry"
+              c:identifier="gtk_tree_view_get_search_entry">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="Entry" c:type="GtkEntry*"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_int_with_default"
-              c:identifier="gtk_print_settings_get_int_with_default">
+      <method name="set_search_entry"
+              c:identifier="gtk_tree_view_set_search_entry">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="def">
-            <type name="gint" c:type="gint"/>
+          <parameter name="entry" allow-none="1">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_int" c:identifier="gtk_print_settings_set_int">
+      <method name="get_search_position_func"
+              c:identifier="gtk_tree_view_get_search_position_func">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkTreeViewSearchPositionFunc"
+                c:type="GtkTreeViewSearchPositionFunc"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="gint" c:type="gint"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_printer" c:identifier="gtk_print_settings_get_printer">
+      <method name="set_search_position_func"
+              c:identifier="gtk_tree_view_set_search_position_func">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="set_printer" c:identifier="gtk_print_settings_set_printer">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="func">
+            <type name="GtkTreeViewSearchPositionFunc"
+                  c:type="GtkTreeViewSearchPositionFunc"/>
           </parameter>
-          <parameter name="printer">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_orientation"
-              c:identifier="gtk_print_settings_get_orientation">
+      <method name="convert_widget_to_tree_coords"
+              c:identifier="gtk_tree_view_convert_widget_to_tree_coords">
         <return-value>
-          <type name="PageOrientation" c:type="GtkPageOrientation"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="wx">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="wy">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="tx">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="ty">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_orientation"
-              c:identifier="gtk_print_settings_set_orientation">
+      <method name="convert_tree_to_widget_coords"
+              c:identifier="gtk_tree_view_convert_tree_to_widget_coords">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="orientation">
-            <type name="PageOrientation" c:type="GtkPageOrientation"/>
+          <parameter name="tx">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="ty">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="wx">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="wy">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paper_size"
-              c:identifier="gtk_print_settings_get_paper_size">
+      <method name="convert_widget_to_bin_window_coords"
+              c:identifier="gtk_tree_view_convert_widget_to_bin_window_coords">
         <return-value>
-          <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="wx">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="wy">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="bx">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="by">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_paper_size"
-              c:identifier="gtk_print_settings_set_paper_size">
+      <method name="convert_bin_window_to_widget_coords"
+              c:identifier="gtk_tree_view_convert_bin_window_to_widget_coords">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="paper_size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="bx">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="by">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="wx">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="wy">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paper_width"
-              c:identifier="gtk_print_settings_get_paper_width">
+      <method name="convert_tree_to_bin_window_coords"
+              c:identifier="gtk_tree_view_convert_tree_to_bin_window_coords">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="tx">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="ty">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="bx">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="by">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_paper_width"
-              c:identifier="gtk_print_settings_set_paper_width">
+      <method name="convert_bin_window_to_tree_coords"
+              c:identifier="gtk_tree_view_convert_bin_window_to_tree_coords">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="width">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="bx">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="by">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="tx">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="ty">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paper_height"
-              c:identifier="gtk_print_settings_get_paper_height">
+      <method name="set_destroy_count_func"
+              c:identifier="gtk_tree_view_set_destroy_count_func">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="func">
+            <type name="GtkTreeDestroyCountFunc"
+                  c:type="GtkTreeDestroyCountFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_paper_height"
-              c:identifier="gtk_print_settings_set_paper_height">
+      <method name="set_fixed_height_mode"
+              c:identifier="gtk_tree_view_set_fixed_height_mode">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="height">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="enable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_use_color"
-              c:identifier="gtk_print_settings_get_use_color">
+      <method name="get_fixed_height_mode"
+              c:identifier="gtk_tree_view_get_fixed_height_mode">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_color"
-              c:identifier="gtk_print_settings_set_use_color">
+      <method name="set_hover_selection"
+              c:identifier="gtk_tree_view_set_hover_selection">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="use_color">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="hover">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_collate" c:identifier="gtk_print_settings_get_collate">
+      <method name="get_hover_selection"
+              c:identifier="gtk_tree_view_get_hover_selection">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_collate" c:identifier="gtk_print_settings_set_collate">
+      <method name="set_hover_expand"
+              c:identifier="gtk_tree_view_set_hover_expand">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="collate">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_reverse" c:identifier="gtk_print_settings_get_reverse">
+      <method name="get_hover_expand"
+              c:identifier="gtk_tree_view_get_hover_expand">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_reverse" c:identifier="gtk_print_settings_set_reverse">
+      <method name="set_rubber_banding"
+              c:identifier="gtk_tree_view_set_rubber_banding">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="reverse">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="enable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_duplex" c:identifier="gtk_print_settings_get_duplex">
+      <method name="get_rubber_banding"
+              c:identifier="gtk_tree_view_get_rubber_banding">
         <return-value>
-          <type name="PrintDuplex" c:type="GtkPrintDuplex"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_duplex" c:identifier="gtk_print_settings_set_duplex">
+      <method name="is_rubber_banding_active"
+              c:identifier="gtk_tree_view_is_rubber_banding_active">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="duplex">
-            <type name="PrintDuplex" c:type="GtkPrintDuplex"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_quality" c:identifier="gtk_print_settings_get_quality">
+      <method name="get_row_separator_func"
+              c:identifier="gtk_tree_view_get_row_separator_func">
         <return-value>
-          <type name="PrintQuality" c:type="GtkPrintQuality"/>
+          <type name="GtkTreeViewRowSeparatorFunc"
+                c:type="GtkTreeViewRowSeparatorFunc"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_quality" c:identifier="gtk_print_settings_set_quality">
+      <method name="set_row_separator_func"
+              c:identifier="gtk_tree_view_set_row_separator_func">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="quality">
-            <type name="PrintQuality" c:type="GtkPrintQuality"/>
+          <parameter name="func">
+            <type name="GtkTreeViewRowSeparatorFunc"
+                  c:type="GtkTreeViewRowSeparatorFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_n_copies"
-              c:identifier="gtk_print_settings_get_n_copies">
+      <method name="get_grid_lines"
+              c:identifier="gtk_tree_view_get_grid_lines">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="TreeViewGridLines" c:type="GtkTreeViewGridLines"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_n_copies"
-              c:identifier="gtk_print_settings_set_n_copies">
+      <method name="set_grid_lines"
+              c:identifier="gtk_tree_view_set_grid_lines">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="num_copies">
-            <type name="gint" c:type="gint"/>
+          <parameter name="grid_lines">
+            <type name="TreeViewGridLines" c:type="GtkTreeViewGridLines"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_number_up"
-              c:identifier="gtk_print_settings_get_number_up">
+      <method name="get_enable_tree_lines"
+              c:identifier="gtk_tree_view_get_enable_tree_lines">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_number_up"
-              c:identifier="gtk_print_settings_set_number_up">
+      <method name="set_enable_tree_lines"
+              c:identifier="gtk_tree_view_set_enable_tree_lines">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="number_up">
-            <type name="gint" c:type="gint"/>
+          <parameter name="enabled">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_resolution"
-              c:identifier="gtk_print_settings_get_resolution">
+      <method name="set_show_expanders"
+              c:identifier="gtk_tree_view_set_show_expanders">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="enabled">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_resolution"
-              c:identifier="gtk_print_settings_set_resolution">
+      <method name="get_show_expanders"
+              c:identifier="gtk_tree_view_get_show_expanders">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="resolution">
-            <type name="gint" c:type="gint"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_scale" c:identifier="gtk_print_settings_get_scale">
+      <method name="set_level_indentation"
+              c:identifier="gtk_tree_view_set_level_indentation">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="indentation">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_scale" c:identifier="gtk_print_settings_set_scale">
+      <method name="get_level_indentation"
+              c:identifier="gtk_tree_view_get_level_indentation">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="scale">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_print_pages"
-              c:identifier="gtk_print_settings_get_print_pages">
+      <method name="set_tooltip_row"
+              c:identifier="gtk_tree_view_set_tooltip_row">
         <return-value>
-          <type name="PrintPages" c:type="GtkPrintPages"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="tooltip">
+            <type name="GtkTooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_print_pages"
-              c:identifier="gtk_print_settings_set_print_pages">
+      <method name="set_tooltip_cell"
+              c:identifier="gtk_tree_view_set_tooltip_cell">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="pages">
-            <type name="PrintPages" c:type="GtkPrintPages"/>
+          <parameter name="tooltip">
+            <type name="GtkTooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_page_ranges"
-              c:identifier="gtk_print_settings_get_page_ranges">
+      <method name="get_tooltip_context"
+              c:identifier="gtk_tree_view_get_tooltip_context">
         <return-value>
-          <type name="GtkPageRange" c:type="GtkPageRange*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="num_ranges">
+          <parameter name="x">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
             <type name="gint" c:type="gint*"/>
           </parameter>
+          <parameter name="keyboard_tip">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="model">
+            <type name="TreeModel" c:type="GtkTreeModel**"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="set_page_ranges"
-              c:identifier="gtk_print_settings_set_page_ranges">
+      <method name="set_tooltip_column"
+              c:identifier="gtk_tree_view_set_tooltip_column">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="page_ranges">
-            <type name="GtkPageRange" c:type="GtkPageRange*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="num_ranges">
-            <type name="gint" c:type="gint"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_page_set"
-              c:identifier="gtk_print_settings_get_page_set">
+      <method name="get_tooltip_column"
+              c:identifier="gtk_tree_view_get_tooltip_column">
         <return-value>
-          <type name="PageSet" c:type="GtkPageSet"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_page_set"
-              c:identifier="gtk_print_settings_set_page_set">
+      <property name="model">
+        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+      </property>
+      <property name="hadjustment">
+        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="vadjustment">
+        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="headers-visible">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="headers-clickable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="expander-column">
+        <type name="GtkTreeViewColumn" c:type="GtkTreeViewColumn"/>
+      </property>
+      <property name="reorderable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="rules-hint">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="enable-search">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="search-column">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="fixed-height-mode">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="hover-selection">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="hover-expand">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-expanders">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="level-indentation">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="rubber-banding">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="enable-grid-lines">
+        <type name="GtkTreeViewGridLines" c:type="GtkTreeViewGridLines"/>
+      </property>
+      <property name="enable-tree-lines">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="tooltip-column">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <callback name="set_scroll_adjustments">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="page_set">
-            <type name="PageSet" c:type="GtkPageSet"/>
+          <parameter name="hadjustment">
+            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+          </parameter>
+          <parameter name="vadjustment">
+            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_default_source"
-              c:identifier="gtk_print_settings_get_default_source">
+      </callback>
+      <callback name="row_activated">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_default_source"
-              c:identifier="gtk_print_settings_set_default_source">
+      </callback>
+      <callback name="test_expand_row">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="default_source">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_media_type"
-              c:identifier="gtk_print_settings_get_media_type">
+      </callback>
+      <callback name="test_collapse_row">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_media_type"
-              c:identifier="gtk_print_settings_set_media_type">
+      </callback>
+      <callback name="row_expanded">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="media_type">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_dither" c:identifier="gtk_print_settings_get_dither">
+      </callback>
+      <callback name="row_collapsed">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_dither" c:identifier="gtk_print_settings_set_dither">
+      </callback>
+      <callback name="columns_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="dither">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_finishings"
-              c:identifier="gtk_print_settings_get_finishings">
+      </callback>
+      <callback name="cursor_changed">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_finishings"
-              c:identifier="gtk_print_settings_set_finishings">
+      </callback>
+      <callback name="move_cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="finishings">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="step">
+            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_output_bin"
-              c:identifier="gtk_print_settings_get_output_bin">
+      </callback>
+      <callback name="select_all">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_output_bin"
-              c:identifier="gtk_print_settings_set_output_bin">
+      </callback>
+      <callback name="unselect_all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="output_bin">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
-      </method>
-    </class>
-    <record name="GtkPrintOperationPreview" c:type="GtkPrintOperationPreview"/>
-    <interface name="PrintOperationPreview"
-               c:type="GtkPrintOperationPreview"
-               glib:type-name="GtkPrintOperationPreview"
-               glib:get-type="gtk_print_operation_preview_get_type">
-      <callback name="ready">
+      </callback>
+      <callback name="select_cursor_row">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="preview">
-            <type name="GtkPrintOperationPreview*"
-                    c:type="GtkPrintOperationPreview*"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="context">
-            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          <parameter name="start_editing">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="got_page_size">
+      <callback name="toggle_cursor_row">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="preview">
-            <type name="GtkPrintOperationPreview*"
-                    c:type="GtkPrintOperationPreview*"/>
-          </parameter>
-          <parameter name="context">
-            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
-          </parameter>
-          <parameter name="page_setup">
-            <type name="GtkPageSetup*" c:type="GtkPageSetup*"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="render_page">
+      <callback name="expand_collapse_cursor_row">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="preview">
-            <type name="GtkPrintOperationPreview*"
-                    c:type="GtkPrintOperationPreview*"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="page_nr">
-            <type name="gint" c:type="gint"/>
+          <parameter name="logical">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="open_all">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_selected">
+      <callback name="select_cursor_parent">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="preview">
-            <type name="GtkPrintOperationPreview*"
-                    c:type="GtkPrintOperationPreview*"/>
-          </parameter>
-          <parameter name="page_nr">
-            <type name="gint" c:type="gint"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="end_preview">
+      <callback name="start_interactive_search">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="preview">
-            <type name="GtkPrintOperationPreview*"
-                    c:type="GtkPrintOperationPreview*"/>
+          <parameter name="tree_view">
+            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </callback>
+      <callback name="_gtk_reserved0">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved5">
+      <glib:signal name="move-cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved6">
+        <parameters>
+          <parameter name="object">
+            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="set-scroll-adjustments">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved7">
+        <parameters>
+          <parameter name="object">
+            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="row-activated">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <glib:signal name="ready">
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTreePath" c:type="GtkTreePath"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkTreeViewColumn" c:type="GtkTreeViewColumn"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="test-expand-row">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkTreePath" c:type="GtkTreePath"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="got-page-size">
+      <glib:signal name="test-collapse-row">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkPageSetup" c:type="GtkPageSetup"/>
+            <type name="GtkTreePath" c:type="GtkTreePath"/>
           </parameter>
         </parameters>
       </glib:signal>
-    </interface>
-    <function name="print_operation_preview_render_page"
-              c:identifier="gtk_print_operation_preview_render_page">
+      <glib:signal name="row-expanded">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkTreePath" c:type="GtkTreePath"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="row-collapsed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkTreePath" c:type="GtkTreePath"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="columns-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="cursor-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="select-all">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="unselect-all">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="select-cursor-row">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="toggle-cursor-row">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="expand-collapse-cursor-row">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="select-cursor-parent">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="start-interactive-search">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="tree_view_new" c:identifier="gtk_tree_view_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="preview">
-          <type name="PrintOperationPreview"
-                  c:type="GtkPrintOperationPreview*"/>
-        </parameter>
-        <parameter name="page_nr">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="print_operation_preview_end_preview"
-              c:identifier="gtk_print_operation_preview_end_preview">
+    <function name="tree_view_new_with_model"
+              c:identifier="gtk_tree_view_new_with_model">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="preview">
-          <type name="PrintOperationPreview"
-                  c:type="GtkPrintOperationPreview*"/>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="print_operation_preview_is_selected"
-              c:identifier="gtk_print_operation_preview_is_selected">
+    <callback name="GtkTreeDestroyCountFunc">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="preview">
-          <type name="PrintOperationPreview"
-                  c:type="GtkPrintOperationPreview*"/>
+        <parameter name="tree_view">
+          <type name="GtkTreeView*" c:type="GtkTreeView*"/>
         </parameter>
-        <parameter name="page_nr">
-          <type name="gint" c:type="gint"/>
+        <parameter name="path">
+          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="children">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <record name="GtkPrintOperationPrivate" c:type="GtkPrintOperationPrivate"/>
-    <function name="print_error_quark" c:identifier="gtk_print_error_quark">
-      <return-value>
-        <type name="GQuark" c:type="GQuark"/>
-      </return-value>
-    </function>
-    <class name="PrintOperation"
-           c:type="GtkPrintOperation"
-           parent="GLib.Object"
-           glib:type-name="GtkPrintOperation"
-           glib:get-type="gtk_print_operation_get_type">
-      <constructor name="new" c:identifier="gtk_print_operation_new">
+    </callback>
+    <record name="GtkComboBoxPrivate" c:type="GtkComboBoxPrivate"/>
+    <class name="ComboBox"
+           c:type="GtkComboBox"
+           parent="Bin"
+           glib:type-name="GtkComboBox"
+           glib:get-type="gtk_combo_box_get_type">
+      <method name="get_wrap_width"
+              c:identifier="gtk_combo_box_get_wrap_width">
         <return-value>
-          <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
-      </constructor>
-      <method name="set_default_page_setup"
-              c:identifier="gtk_print_operation_set_default_page_setup">
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_wrap_width"
+              c:identifier="gtk_combo_box_set_wrap_width">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="default_page_setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="width">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_default_page_setup"
-              c:identifier="gtk_print_operation_get_default_page_setup">
+      <method name="get_row_span_column"
+              c:identifier="gtk_combo_box_get_row_span_column">
         <return-value>
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_print_settings"
-              c:identifier="gtk_print_operation_set_print_settings">
+      <method name="set_row_span_column"
+              c:identifier="gtk_combo_box_set_row_span_column">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="print_settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="row_span">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_print_settings"
-              c:identifier="gtk_print_operation_get_print_settings">
+      <method name="get_column_span_column"
+              c:identifier="gtk_combo_box_get_column_span_column">
         <return-value>
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_job_name"
-              c:identifier="gtk_print_operation_set_job_name">
+      <method name="set_column_span_column"
+              c:identifier="gtk_combo_box_set_column_span_column">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="job_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="column_span">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_add_tearoffs"
+              c:identifier="gtk_combo_box_get_add_tearoffs">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_n_pages" c:identifier="gtk_print_operation_set_n_pages">
+      <method name="set_add_tearoffs"
+              c:identifier="gtk_combo_box_set_add_tearoffs">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="n_pages">
-            <type name="gint" c:type="gint"/>
+          <parameter name="add_tearoffs">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_current_page"
-              c:identifier="gtk_print_operation_set_current_page">
+      <method name="get_title" c:identifier="gtk_combo_box_get_title">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="current_page">
-            <type name="gint" c:type="gint"/>
+        </parameters>
+      </method>
+      <method name="set_title" c:identifier="gtk_combo_box_set_title">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_full_page"
-              c:identifier="gtk_print_operation_set_use_full_page">
+      <method name="get_focus_on_click"
+              c:identifier="gtk_combo_box_get_focus_on_click">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="full_page">
-            <type name="gboolean" c:type="gboolean"/>
+        </parameters>
+      </method>
+      <method name="set_focus_on_click"
+              c:identifier="gtk_combo_box_set_focus_on_click">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="focus_on_click">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_unit" c:identifier="gtk_print_operation_set_unit">
+      <method name="get_active" c:identifier="gtk_combo_box_get_active">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+        </parameters>
+      </method>
+      <method name="set_active" c:identifier="gtk_combo_box_set_active">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="index_">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_export_filename"
-              c:identifier="gtk_print_operation_set_export_filename">
+      <method name="get_active_iter"
+              c:identifier="gtk_combo_box_get_active_iter">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="filename">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_track_print_status"
-              c:identifier="gtk_print_operation_set_track_print_status">
+      <method name="set_active_iter"
+              c:identifier="gtk_combo_box_set_active_iter">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="track_status">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_progress"
-              c:identifier="gtk_print_operation_set_show_progress">
+      <method name="set_model" c:identifier="gtk_combo_box_set_model">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="show_progress">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="model" allow-none="1">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_allow_async"
-              c:identifier="gtk_print_operation_set_allow_async">
+      <method name="get_model" c:identifier="gtk_combo_box_get_model">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="allow_async">
-            <type name="gboolean" c:type="gboolean"/>
+        </parameters>
+      </method>
+      <method name="get_row_separator_func"
+              c:identifier="gtk_combo_box_get_row_separator_func">
+        <return-value>
+          <type name="GtkTreeViewRowSeparatorFunc"
+                c:type="GtkTreeViewRowSeparatorFunc"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_custom_tab_label"
-              c:identifier="gtk_print_operation_set_custom_tab_label">
+      <method name="set_row_separator_func"
+              c:identifier="gtk_combo_box_set_row_separator_func">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="label">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="func">
+            <type name="GtkTreeViewRowSeparatorFunc"
+                  c:type="GtkTreeViewRowSeparatorFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="run" c:identifier="gtk_print_operation_run">
+      <method name="append_text" c:identifier="gtk_combo_box_append_text">
         <return-value>
-          <type name="PrintOperationResult" c:type="GtkPrintOperationResult"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="action">
-            <type name="PrintOperationAction"
-                    c:type="GtkPrintOperationAction"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="parent">
-            <type name="Window" c:type="GtkWindow*"/>
+        </parameters>
+      </method>
+      <method name="insert_text" c:identifier="gtk_combo_box_insert_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_error" c:identifier="gtk_print_operation_get_error">
+      <method name="prepend_text" c:identifier="gtk_combo_box_prepend_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_status" c:identifier="gtk_print_operation_get_status">
+      <method name="remove_text" c:identifier="gtk_combo_box_remove_text">
         <return-value>
-          <type name="PrintStatus" c:type="GtkPrintStatus"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_status_string"
-              c:identifier="gtk_print_operation_get_status_string">
+      <method name="get_active_text"
+              c:identifier="gtk_combo_box_get_active_text">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="popup" c:identifier="gtk_combo_box_popup">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_finished" c:identifier="gtk_print_operation_is_finished">
+      <method name="popdown" c:identifier="gtk_combo_box_popdown">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="cancel" c:identifier="gtk_print_operation_cancel">
+      <method name="get_popup_accessible"
+              c:identifier="gtk_combo_box_get_popup_accessible">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Atk.Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="default-page-setup">
-        <type name="GtkPageSetup" c:type="GtkPageSetup"/>
-      </property>
-      <property name="print-settings">
-        <type name="GtkPrintSettings" c:type="GtkPrintSettings"/>
-      </property>
-      <property name="job-name">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="n-pages">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="current-page">
-        <type name="gint" c:type="gint"/>
+      <property name="model">
+        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
       </property>
-      <property name="use-full-page">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="wrap-width">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="track-print-status">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="row-span-column">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="unit">
-        <type name="GtkUnit" c:type="GtkUnit"/>
+      <property name="column-span-column">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="show-progress">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="active">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="allow-async">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="add-tearoffs">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="export-filename">
-        <type name="gchararray" c:type="gchararray"/>
+      <property name="tearoff-title">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <property name="status">
-        <type name="GtkPrintStatus" c:type="GtkPrintStatus"/>
+      <property name="has-frame">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="status-string">
-        <type name="gchararray" c:type="gchararray"/>
+      <property name="focus-on-click">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="custom-tab-label">
-        <type name="gchararray" c:type="gchararray"/>
+      <property name="popup-shown">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="done">
+      <callback name="changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          <parameter name="combo_box">
+            <type name="GtkComboBox*" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="result">
-            <type name="GtkPrintOperationResult"
-                    c:type="GtkPrintOperationResult"/>
+        </parameters>
+      </callback>
+      <callback name="get_active_text">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="GtkComboBox*" c:type="GtkComboBox*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="begin_print">
+      <callback name="_gtk_reserved0">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="move-active">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="popup">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="popdown">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="combo_box_new" c:identifier="gtk_combo_box_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="combo_box_new_with_model"
+              c:identifier="gtk_combo_box_new_with_model">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="combo_box_new_text" c:identifier="gtk_combo_box_new_text">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="combo_box_editing_canceled"
+              c:identifier="_gtk_combo_box_editing_canceled">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="combo_box">
+          <type name="ComboBox" c:type="GtkComboBox*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkComboBoxEntryPrivate" c:type="GtkComboBoxEntryPrivate"/>
+    <class name="ComboBoxEntry"
+           c:type="GtkComboBoxEntry"
+           parent="ComboBox"
+           glib:type-name="GtkComboBoxEntry"
+           glib:get-type="gtk_combo_box_entry_get_type">
+      <method name="set_text_column"
+              c:identifier="gtk_combo_box_entry_set_text_column">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="entry_box">
+            <type name="ComboBoxEntry" c:type="GtkComboBoxEntry*"/>
+          </parameter>
+          <parameter name="text_column">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_text_column"
+              c:identifier="gtk_combo_box_entry_get_text_column">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="entry_box">
+            <type name="ComboBoxEntry" c:type="GtkComboBoxEntry*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="text-column">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <callback name="_gtk_reserved0">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="combo_box_entry_new"
+              c:identifier="gtk_combo_box_entry_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="combo_box_entry_new_with_model"
+              c:identifier="gtk_combo_box_entry_new_with_model">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="text_column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="combo_box_entry_new_text"
+              c:identifier="gtk_combo_box_entry_new_text">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="HBox"
+           c:type="GtkHBox"
+           parent="Box"
+           glib:type-name="GtkHBox"
+           glib:get-type="gtk_hbox_get_type">
+    </class>
+    <function name="hbox_new" c:identifier="gtk_hbox_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="homogeneous">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="spacing">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Combo"
+           c:type="GtkCombo"
+           parent="HBox"
+           glib:type-name="GtkCombo"
+           glib:get-type="gtk_combo_get_type">
+      <method name="set_value_in_list"
+              c:identifier="gtk_combo_set_value_in_list">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="context">
-            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          <parameter name="combo">
+            <type name="Combo" c:type="GtkCombo*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="paginate">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          <parameter name="val">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="context">
-            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          <parameter name="ok_if_empty">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="request_page_setup">
+      </method>
+      <method name="set_use_arrows" c:identifier="gtk_combo_set_use_arrows">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="context">
-            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
-          </parameter>
-          <parameter name="page_nr">
-            <type name="gint" c:type="gint"/>
+          <parameter name="combo">
+            <type name="Combo" c:type="GtkCombo*"/>
           </parameter>
-          <parameter name="setup">
-            <type name="GtkPageSetup*" c:type="GtkPageSetup*"/>
+          <parameter name="val">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="draw_page">
+      </method>
+      <method name="set_use_arrows_always"
+              c:identifier="gtk_combo_set_use_arrows_always">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="context">
-            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          <parameter name="combo">
+            <type name="Combo" c:type="GtkCombo*"/>
           </parameter>
-          <parameter name="page_nr">
-            <type name="gint" c:type="gint"/>
+          <parameter name="val">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="end_print">
+      </method>
+      <method name="set_case_sensitive"
+              c:identifier="gtk_combo_set_case_sensitive">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          <parameter name="combo">
+            <type name="Combo" c:type="GtkCombo*"/>
           </parameter>
-          <parameter name="context">
-            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          <parameter name="val">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="status_changed">
+      </method>
+      <method name="set_item_string" c:identifier="gtk_combo_set_item_string">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          <parameter name="combo">
+            <type name="Combo" c:type="GtkCombo*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="create_custom_widget">
-        <return-value>
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          <parameter name="item">
+            <type name="Item" c:type="GtkItem*"/>
+          </parameter>
+          <parameter name="item_value">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="custom_widget_apply">
+      </method>
+      <method name="set_popdown_strings"
+              c:identifier="gtk_combo_set_popdown_strings">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          <parameter name="combo">
+            <type name="Combo" c:type="GtkCombo*"/>
           </parameter>
-          <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <parameter name="strings">
+            <type name="GList" c:type="GList*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="preview">
+      </method>
+      <method name="disable_activate"
+              c:identifier="gtk_combo_disable_activate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="preview">
-            <type name="GtkPrintOperationPreview*"
-                    c:type="GtkPrintOperationPreview*"/>
-          </parameter>
-          <parameter name="context">
-            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="GtkWindow*" c:type="GtkWindow*"/>
+          <parameter name="combo">
+            <type name="Combo" c:type="GtkCombo*"/>
           </parameter>
         </parameters>
-      </callback>
+      </method>
+      <property name="enable-arrow-keys">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="enable-arrows-always">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="case-sensitive">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="allow-empty">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="value-in-list">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved5">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved6">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved7">
-        <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="done">
+    </class>
+    <function name="combo_new" c:identifier="gtk_combo_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <record name="GtkCTree" c:type="GtkCTree">
+      <field name="clist">
+        <type name="GtkCList" c:type="GtkCList"/>
+      </field>
+      <field name="lines_gc">
+        <type name="GdkGC*" c:type="GdkGC*"/>
+      </field>
+      <field name="tree_indent">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="tree_spacing">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="tree_column">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="line_style">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="expander_style">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="show_stub">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="drag_compare">
+        <type name="GtkCTreeCompareDragFunc" c:type="GtkCTreeCompareDragFunc"/>
+      </field>
+      <callback name="tree_select_row">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkPrintOperationResult"
-                    c:type="GtkPrintOperationResult"/>
+          <parameter name="ctree">
+            <type name="GtkCTree*" c:type="GtkCTree*"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="begin-print">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          <parameter name="row">
+            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="paginate">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="request-page-setup">
+      </callback>
+      <callback name="tree_unselect_row">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          <parameter name="ctree">
+            <type name="GtkCTree*" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
+          <parameter name="row">
+            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="GtkPageSetup" c:type="GtkPageSetup"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="draw-page">
+      </callback>
+      <callback name="tree_expand">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          <parameter name="ctree">
+            <type name="GtkCTree*" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
+          <parameter name="node">
+            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="end-print">
+      </callback>
+      <callback name="tree_collapse">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          <parameter name="ctree">
+            <type name="GtkCTree*" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="status-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="create-custom-widget">
-        <return-value>
-          <type name="GObject" c:type="GObject"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="custom-widget-apply">
+      </callback>
+      <callback name="tree_move">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+          <parameter name="ctree">
+            <type name="GtkCTree*" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="new_parent">
+            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="new_sibling">
+            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="preview">
+      </callback>
+      <callback name="change_focus_row_expansion">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkPrintOperationPreview"
-                    c:type="GtkPrintOperationPreview"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          <parameter name="ctree">
+            <type name="GtkCTree*" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="GtkWindow" c:type="GtkWindow"/>
+          <parameter name="action">
+            <type name="GtkCTreeExpansionType" c:type="GtkCTreeExpansionType"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="print_run_page_setup_dialog"
-              c:identifier="gtk_print_run_page_setup_dialog">
+      </callback>
+    </record>
+    <record name="GtkCTreeRow" c:type="GtkCTreeRow">
+      <field name="row">
+        <type name="GtkCListRow" c:type="GtkCListRow"/>
+      </field>
+      <field name="parent">
+        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+      </field>
+      <field name="sibling">
+        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+      </field>
+      <field name="children">
+        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+      </field>
+      <field name="pixmap_closed">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="mask_closed">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
+      <field name="pixmap_opened">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="mask_opened">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
+      <field name="level">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="is_leaf">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="expanded">
+        <type name="guint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="GtkCTreeNode" c:type="GtkCTreeNode">
+      <field name="list">
+        <type name="GList" c:type="GList"/>
+      </field>
+    </record>
+    <callback name="GtkCTreeFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree*" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GtkCTreeGNodeFunc">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree*" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="depth">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="gnode">
+          <type name="GNode*" c:type="GNode*"/>
+        </parameter>
+        <parameter name="cnode">
+          <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GtkCTreeCompareDragFunc">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree*" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="source_node">
+          <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="new_parent">
+          <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="new_sibling">
+          <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <function name="ctree_get_type" c:identifier="gtk_ctree_get_type">
+      <return-value>
+        <type name="GtkType" c:type="GtkType"/>
+      </return-value>
+    </function>
+    <function name="ctree_new_with_titles"
+              c:identifier="gtk_ctree_new_with_titles">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="columns">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="tree_column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="titles">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_new" c:identifier="gtk_ctree_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="columns">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="tree_column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_insert_node" c:identifier="gtk_ctree_insert_node">
+      <return-value>
+        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="parent">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="sibling">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="spacing">
+          <type name="uint8" c:type="guint8"/>
+        </parameter>
+        <parameter name="pixmap_closed" allow-none="1">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        </parameter>
+        <parameter name="mask_closed" allow-none="1">
+          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+        </parameter>
+        <parameter name="pixmap_opened" allow-none="1">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        </parameter>
+        <parameter name="mask_opened" allow-none="1">
+          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+        </parameter>
+        <parameter name="is_leaf">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="expanded">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_remove_node" c:identifier="gtk_ctree_remove_node">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_insert_gnode" c:identifier="gtk_ctree_insert_gnode">
+      <return-value>
+        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="parent">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="sibling">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="gnode">
+          <type name="GNode" c:type="GNode*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GtkCTreeGNodeFunc" c:type="GtkCTreeGNodeFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_export_to_gnode"
+              c:identifier="gtk_ctree_export_to_gnode">
+      <return-value>
+        <type name="GNode*" c:type="GNode*"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="parent">
+          <type name="GNode" c:type="GNode*"/>
+        </parameter>
+        <parameter name="sibling">
+          <type name="GNode" c:type="GNode*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GtkCTreeGNodeFunc" c:type="GtkCTreeGNodeFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_post_recursive"
+              c:identifier="gtk_ctree_post_recursive">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GtkCTreeFunc" c:type="GtkCTreeFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_post_recursive_to_depth"
+              c:identifier="gtk_ctree_post_recursive_to_depth">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="depth">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GtkCTreeFunc" c:type="GtkCTreeFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_pre_recursive"
+              c:identifier="gtk_ctree_pre_recursive">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GtkCTreeFunc" c:type="GtkCTreeFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_pre_recursive_to_depth"
+              c:identifier="gtk_ctree_pre_recursive_to_depth">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="depth">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GtkCTreeFunc" c:type="GtkCTreeFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_is_viewable" c:identifier="gtk_ctree_is_viewable">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_last" c:identifier="gtk_ctree_last">
+      <return-value>
+        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_find_node_ptr"
+              c:identifier="gtk_ctree_find_node_ptr">
+      <return-value>
+        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="ctree_row">
+          <type name="GtkCTreeRow" c:type="GtkCTreeRow*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_nth" c:identifier="gtk_ctree_node_nth">
+      <return-value>
+        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="row">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_find" c:identifier="gtk_ctree_find">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="child">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_is_ancestor" c:identifier="gtk_ctree_is_ancestor">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="child">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_find_by_row_data"
+              c:identifier="gtk_ctree_find_by_row_data">
+      <return-value>
+        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_find_all_by_row_data"
+              c:identifier="gtk_ctree_find_all_by_row_data">
+      <return-value>
+        <type name="GList*" c:type="GList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_find_by_row_data_custom"
+              c:identifier="gtk_ctree_find_by_row_data_custom">
+      <return-value>
+        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GCompareFunc" c:type="GCompareFunc"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_find_all_by_row_data_custom"
+              c:identifier="gtk_ctree_find_all_by_row_data_custom">
+      <return-value>
+        <type name="GList*" c:type="GList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GCompareFunc" c:type="GCompareFunc"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_is_hot_spot" c:identifier="gtk_ctree_is_hot_spot">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_move" c:identifier="gtk_ctree_move">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="new_parent" allow-none="1">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="new_sibling" allow-none="1">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_expand" c:identifier="gtk_ctree_expand">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_expand_recursive"
+              c:identifier="gtk_ctree_expand_recursive">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_expand_to_depth"
+              c:identifier="gtk_ctree_expand_to_depth">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="depth">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_collapse" c:identifier="gtk_ctree_collapse">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_collapse_recursive"
+              c:identifier="gtk_ctree_collapse_recursive">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_collapse_to_depth"
+              c:identifier="gtk_ctree_collapse_to_depth">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="depth">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_toggle_expansion"
+              c:identifier="gtk_ctree_toggle_expansion">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_toggle_expansion_recursive"
+              c:identifier="gtk_ctree_toggle_expansion_recursive">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_select" c:identifier="gtk_ctree_select">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_select_recursive"
+              c:identifier="gtk_ctree_select_recursive">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_unselect" c:identifier="gtk_ctree_unselect">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_unselect_recursive"
+              c:identifier="gtk_ctree_unselect_recursive">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_real_select_recursive"
+              c:identifier="gtk_ctree_real_select_recursive">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="state">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_set_text"
+              c:identifier="gtk_ctree_node_set_text">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_set_pixmap"
+              c:identifier="gtk_ctree_node_set_pixmap">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        </parameter>
+        <parameter name="mask" allow-none="1">
+          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_set_pixtext"
+              c:identifier="gtk_ctree_node_set_pixtext">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="spacing">
+          <type name="uint8" c:type="guint8"/>
+        </parameter>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        </parameter>
+        <parameter name="mask" allow-none="1">
+          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_set_node_info"
+              c:identifier="gtk_ctree_set_node_info">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="spacing">
+          <type name="uint8" c:type="guint8"/>
+        </parameter>
+        <parameter name="pixmap_closed" allow-none="1">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        </parameter>
+        <parameter name="mask_closed" allow-none="1">
+          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+        </parameter>
+        <parameter name="pixmap_opened" allow-none="1">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        </parameter>
+        <parameter name="mask_opened" allow-none="1">
+          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+        </parameter>
+        <parameter name="is_leaf">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="expanded">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_set_shift"
+              c:identifier="gtk_ctree_node_set_shift">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="vertical">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="horizontal">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_set_selectable"
+              c:identifier="gtk_ctree_node_set_selectable">
       <return-value>
-        <type name="GtkPageSetup*" c:type="GtkPageSetup*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
         </parameter>
-        <parameter name="page_setup">
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
         </parameter>
-        <parameter name="settings">
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+        <parameter name="selectable">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GtkPageSetupDoneFunc">
+    <function name="ctree_node_get_selectable"
+              c:identifier="gtk_ctree_node_get_selectable">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="page_setup">
-          <type name="GtkPageSetup*" c:type="GtkPageSetup*"/>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
         </parameter>
       </parameters>
-    </callback>
-    <function name="print_run_page_setup_dialog_async"
-              c:identifier="gtk_print_run_page_setup_dialog_async">
+    </function>
+    <function name="ctree_node_get_cell_type"
+              c:identifier="gtk_ctree_node_get_cell_type">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkCellType" c:type="GtkCellType"/>
       </return-value>
       <parameters>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
         </parameter>
-        <parameter name="page_setup">
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
         </parameter>
-        <parameter name="settings">
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="done_cb">
-          <type name="GtkPageSetupDoneFunc" c:type="GtkPageSetupDoneFunc"/>
+      </parameters>
+    </function>
+    <function name="ctree_node_get_text"
+              c:identifier="gtk_ctree_node_get_text">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="text">
+          <type name="gchar" c:type="gchar**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_get_pixmap"
+              c:identifier="gtk_ctree_node_get_pixmap">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
+        </parameter>
+        <parameter name="mask">
+          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_get_pixtext"
+              c:identifier="gtk_ctree_node_get_pixtext">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="text">
+          <type name="gchar" c:type="gchar**"/>
+        </parameter>
+        <parameter name="spacing">
+          <type name="guint8" c:type="guint8*"/>
+        </parameter>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
+        </parameter>
+        <parameter name="mask">
+          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_get_node_info"
+              c:identifier="gtk_ctree_get_node_info">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="text">
+          <type name="gchar" c:type="gchar**"/>
+        </parameter>
+        <parameter name="spacing">
+          <type name="guint8" c:type="guint8*"/>
+        </parameter>
+        <parameter name="pixmap_closed">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
+        </parameter>
+        <parameter name="mask_closed">
+          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+        </parameter>
+        <parameter name="pixmap_opened">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
+        </parameter>
+        <parameter name="mask_opened">
+          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+        </parameter>
+        <parameter name="is_leaf">
+          <type name="gboolean" c:type="gboolean*"/>
+        </parameter>
+        <parameter name="expanded">
+          <type name="gboolean" c:type="gboolean*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_set_row_style"
+              c:identifier="gtk_ctree_node_set_row_style">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_get_row_style"
+              c:identifier="gtk_ctree_node_get_row_style">
+      <return-value>
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_set_cell_style"
+              c:identifier="gtk_ctree_node_set_cell_style">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_get_cell_style"
+              c:identifier="gtk_ctree_node_get_cell_style">
+      <return-value>
+        <type name="GtkStyle*" c:type="GtkStyle*"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_set_foreground"
+              c:identifier="gtk_ctree_node_set_foreground">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="color">
+          <type name="GdkColor" c:type="GdkColor*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_set_background"
+              c:identifier="gtk_ctree_node_set_background">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="color">
+          <type name="GdkColor" c:type="GdkColor*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_set_row_data"
+              c:identifier="gtk_ctree_node_set_row_data">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <class name="Progress"
-           c:type="GtkProgress"
+    <function name="ctree_node_set_row_data_full"
+              c:identifier="gtk_ctree_node_set_row_data_full">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_get_row_data"
+              c:identifier="gtk_ctree_node_get_row_data">
+      <return-value>
+        <type name="any" c:type="gpointer"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_moveto" c:identifier="gtk_ctree_node_moveto">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="row_align">
+          <type name="float" c:type="gfloat"/>
+        </parameter>
+        <parameter name="col_align">
+          <type name="float" c:type="gfloat"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_node_is_visible"
+              c:identifier="gtk_ctree_node_is_visible">
+      <return-value>
+        <type name="GtkVisibility" c:type="GtkVisibility"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_set_indent" c:identifier="gtk_ctree_set_indent">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="indent">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_set_spacing" c:identifier="gtk_ctree_set_spacing">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="spacing">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_set_show_stub"
+              c:identifier="gtk_ctree_set_show_stub">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="show_stub">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_set_line_style"
+              c:identifier="gtk_ctree_set_line_style">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="line_style">
+          <type name="CTreeLineStyle" c:type="GtkCTreeLineStyle"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_set_expander_style"
+              c:identifier="gtk_ctree_set_expander_style">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="expander_style">
+          <type name="CTreeExpanderStyle" c:type="GtkCTreeExpanderStyle"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_set_drag_compare_func"
+              c:identifier="gtk_ctree_set_drag_compare_func">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="cmp_func">
+          <type name="GtkCTreeCompareDragFunc"
+                c:type="GtkCTreeCompareDragFunc"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_sort_node" c:identifier="gtk_ctree_sort_node">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="ctree_sort_recursive"
+              c:identifier="gtk_ctree_sort_recursive">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ctree">
+          <type name="GtkCTree" c:type="GtkCTree*"/>
+        </parameter>
+        <parameter name="node">
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="DrawingArea"
+           c:type="GtkDrawingArea"
            parent="Widget"
-           glib:type-name="GtkProgress"
-           glib:get-type="gtk_progress_get_type">
-      <method name="set_show_text" c:identifier="gtk_progress_set_show_text">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
-          </parameter>
-          <parameter name="show_text">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_text_alignment"
-              c:identifier="gtk_progress_set_text_alignment">
+           glib:type-name="GtkDrawingArea"
+           glib:get-type="gtk_drawing_area_get_type">
+      <method name="size" c:identifier="gtk_drawing_area_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
-          </parameter>
-          <parameter name="x_align">
-            <type name="gfloat" c:type="gfloat"/>
-          </parameter>
-          <parameter name="y_align">
-            <type name="gfloat" c:type="gfloat"/>
+          <parameter name="darea">
+            <type name="DrawingArea" c:type="GtkDrawingArea*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="set_format_string"
-              c:identifier="gtk_progress_set_format_string">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="width">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="format">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="height">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_adjustment" c:identifier="gtk_progress_set_adjustment">
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
-          </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="configure" c:identifier="gtk_progress_configure">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-          <parameter name="hmin">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-          <parameter name="max">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_percentage" c:identifier="gtk_progress_set_percentage">
+      </callback>
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
-          </parameter>
-          <parameter name="percentage">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_value" c:identifier="gtk_progress_set_value">
+      </callback>
+      <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_value" c:identifier="gtk_progress_get_value">
+      </callback>
+    </class>
+    <function name="drawing_area_new" c:identifier="gtk_drawing_area_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="Curve"
+           c:type="GtkCurve"
+           parent="DrawingArea"
+           glib:type-name="GtkCurve"
+           glib:get-type="gtk_curve_get_type">
+      <method name="reset" c:identifier="gtk_curve_reset">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="curve">
+            <type name="Curve" c:type="GtkCurve*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_activity_mode"
-              c:identifier="gtk_progress_set_activity_mode">
+      <method name="set_gamma" c:identifier="gtk_curve_set_gamma">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="curve">
+            <type name="Curve" c:type="GtkCurve*"/>
           </parameter>
-          <parameter name="activity_mode">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="gamma_">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_current_text"
-              c:identifier="gtk_progress_get_current_text">
+      <method name="set_range" c:identifier="gtk_curve_set_range">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="curve">
+            <type name="Curve" c:type="GtkCurve*"/>
+          </parameter>
+          <parameter name="min_x">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="max_x">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="min_y">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="max_y">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_text_from_value"
-              c:identifier="gtk_progress_get_text_from_value">
+      <method name="get_vector" c:identifier="gtk_curve_get_vector">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="curve">
+            <type name="Curve" c:type="GtkCurve*"/>
           </parameter>
-          <parameter name="value">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="veclen">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="vector">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_current_percentage"
-              c:identifier="gtk_progress_get_current_percentage">
+      <method name="set_vector" c:identifier="gtk_curve_set_vector">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="curve">
+            <type name="Curve" c:type="GtkCurve*"/>
+          </parameter>
+          <parameter name="veclen">
+            <type name="int32" c:type="int"/>
+          </parameter>
+          <parameter name="vector">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_percentage_from_value"
-              c:identifier="gtk_progress_get_percentage_from_value">
+      <method name="set_curve_type" c:identifier="gtk_curve_set_curve_type">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="curve">
+            <type name="Curve" c:type="GtkCurve*"/>
           </parameter>
-          <parameter name="value">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="type">
+            <type name="CurveType" c:type="GtkCurveType"/>
           </parameter>
         </parameters>
       </method>
-      <property name="activity-mode">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="curve-type">
+        <type name="GtkCurveType" c:type="GtkCurveType"/>
       </property>
-      <property name="show-text">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="min-x">
+        <type name="float" c:type="gfloat"/>
       </property>
-      <property name="text-xalign">
-        <type name="gfloat" c:type="gfloat"/>
+      <property name="max-x">
+        <type name="float" c:type="gfloat"/>
       </property>
-      <property name="text-yalign">
-        <type name="gfloat" c:type="gfloat"/>
+      <property name="min-y">
+        <type name="float" c:type="gfloat"/>
       </property>
-      <callback name="paint">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="progress">
-            <type name="GtkProgress*" c:type="GtkProgress*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="update">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="progress">
-            <type name="GtkProgress*" c:type="GtkProgress*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="act_mode_enter">
+      <property name="max-y">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <callback name="curve_type_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="GtkProgress*" c:type="GtkProgress*"/>
+          <parameter name="curve">
+            <type name="GtkCurve*" c:type="GtkCurve*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
+      <glib:signal name="curve-type-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
     </class>
-    <class name="ProgressBar"
-           c:type="GtkProgressBar"
-           parent="Progress"
-           glib:type-name="GtkProgressBar"
-           glib:get-type="gtk_progress_bar_get_type">
-      <method name="pulse" c:identifier="gtk_progress_bar_pulse">
+    <function name="curve_new" c:identifier="gtk_curve_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="EventBox"
+           c:type="GtkEventBox"
+           parent="Bin"
+           glib:type-name="GtkEventBox"
+           glib:get-type="gtk_event_box_get_type">
+      <method name="get_visible_window"
+              c:identifier="gtk_event_box_get_visible_window">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="event_box">
+            <type name="EventBox" c:type="GtkEventBox*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_text" c:identifier="gtk_progress_bar_set_text">
+      <method name="set_visible_window"
+              c:identifier="gtk_event_box_set_visible_window">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="event_box">
+            <type name="EventBox" c:type="GtkEventBox*"/>
           </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="visible_window">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_fraction" c:identifier="gtk_progress_bar_set_fraction">
+      <method name="get_above_child"
+              c:identifier="gtk_event_box_get_above_child">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
-          </parameter>
-          <parameter name="fraction">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="event_box">
+            <type name="EventBox" c:type="GtkEventBox*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_pulse_step"
-              c:identifier="gtk_progress_bar_set_pulse_step">
+      <method name="set_above_child"
+              c:identifier="gtk_event_box_set_above_child">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="event_box">
+            <type name="EventBox" c:type="GtkEventBox*"/>
           </parameter>
-          <parameter name="fraction">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="above_child">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_orientation"
-              c:identifier="gtk_progress_bar_set_orientation">
+      <property name="visible-window">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="above-child">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+    </class>
+    <function name="event_box_new" c:identifier="gtk_event_box_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <record name="GtkExpanderPrivate" c:type="GtkExpanderPrivate"/>
+    <class name="Expander"
+           c:type="GtkExpander"
+           parent="Bin"
+           glib:type-name="GtkExpander"
+           glib:get-type="gtk_expander_get_type">
+      <method name="set_expanded" c:identifier="gtk_expander_set_expanded">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
-          <parameter name="orientation">
-            <type name="ProgressBarOrientation"
-                    c:type="GtkProgressBarOrientation"/>
+          <parameter name="expanded">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_text" c:identifier="gtk_progress_bar_get_text">
+      <method name="get_expanded" c:identifier="gtk_expander_get_expanded">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_fraction" c:identifier="gtk_progress_bar_get_fraction">
+      <method name="set_spacing" c:identifier="gtk_expander_set_spacing">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
+          </parameter>
+          <parameter name="spacing">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_pulse_step"
-              c:identifier="gtk_progress_bar_get_pulse_step">
+      <method name="get_spacing" c:identifier="gtk_expander_get_spacing">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_orientation"
-              c:identifier="gtk_progress_bar_get_orientation">
+      <method name="set_label" c:identifier="gtk_expander_set_label">
         <return-value>
-          <type name="ProgressBarOrientation"
-                  c:type="GtkProgressBarOrientation"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
+          </parameter>
+          <parameter name="label" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_ellipsize"
-              c:identifier="gtk_progress_bar_set_ellipsize">
+      <method name="get_label" c:identifier="gtk_expander_get_label">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
-          </parameter>
-          <parameter name="mode">
-            <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_ellipsize"
-              c:identifier="gtk_progress_bar_get_ellipsize">
+      <method name="set_use_underline"
+              c:identifier="gtk_expander_set_use_underline">
         <return-value>
-          <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
+          </parameter>
+          <parameter name="use_underline">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_bar_style"
-              c:identifier="gtk_progress_bar_set_bar_style">
+      <method name="get_use_underline"
+              c:identifier="gtk_expander_get_use_underline">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
-          </parameter>
-          <parameter name="style">
-            <type name="ProgressBarStyle" c:type="GtkProgressBarStyle"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_discrete_blocks"
-              c:identifier="gtk_progress_bar_set_discrete_blocks">
+      <method name="set_use_markup" c:identifier="gtk_expander_set_use_markup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
-          <parameter name="blocks">
-            <type name="guint" c:type="guint"/>
+          <parameter name="use_markup">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_activity_step"
-              c:identifier="gtk_progress_bar_set_activity_step">
+      <method name="get_use_markup" c:identifier="gtk_expander_get_use_markup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
-          </parameter>
-          <parameter name="step">
-            <type name="guint" c:type="guint"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_activity_blocks"
-              c:identifier="gtk_progress_bar_set_activity_blocks">
+      <method name="set_label_widget"
+              c:identifier="gtk_expander_set_label_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
-          <parameter name="blocks">
-            <type name="guint" c:type="guint"/>
+          <parameter name="label_widget" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="update" c:identifier="gtk_progress_bar_update">
+      <method name="get_label_widget"
+              c:identifier="gtk_expander_get_label_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
-          </parameter>
-          <parameter name="percentage">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="fraction">
-        <type name="gdouble" c:type="gdouble"/>
-      </property>
-      <property name="pulse-step">
-        <type name="gdouble" c:type="gdouble"/>
-      </property>
-      <property name="orientation">
-        <type name="GtkProgressBarOrientation"
-                c:type="GtkProgressBarOrientation"/>
-      </property>
-      <property name="text">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="ellipsize">
-        <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
+      <property name="expanded">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="adjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+      <property name="label">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <property name="bar-style">
-        <type name="GtkProgressBarStyle" c:type="GtkProgressBarStyle"/>
+      <property name="use-underline">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="activity-step">
-        <type name="guint" c:type="guint"/>
+      <property name="use-markup">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="activity-blocks">
-        <type name="guint" c:type="guint"/>
+      <property name="spacing">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="discrete-blocks">
-        <type name="guint" c:type="guint"/>
+      <property name="label-widget">
+        <type name="GtkWidget" c:type="GtkWidget"/>
       </property>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="activate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="expander">
+            <type name="GtkExpander*" c:type="GtkExpander*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved4">
+      <glib:signal name="activate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
+      </glib:signal>
     </class>
-    <function name="progress_bar_new" c:identifier="gtk_progress_bar_new">
+    <function name="expander_new" c:identifier="gtk_expander_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
+      <parameters>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="progress_bar_new_with_adjustment"
-              c:identifier="gtk_progress_bar_new_with_adjustment">
+    <function name="expander_new_with_mnemonic"
+              c:identifier="gtk_expander_new_with_mnemonic">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="adjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="label" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkToggleActionPrivate" c:type="GtkToggleActionPrivate"/>
-    <class name="ToggleAction"
-           c:type="GtkToggleAction"
-           parent="Action"
-           glib:type-name="GtkToggleAction"
-           glib:get-type="gtk_toggle_action_get_type">
-      <constructor name="new" c:identifier="gtk_toggle_action_new">
+    <record name="GtkFileFilterInfo" c:type="GtkFileFilterInfo">
+      <field name="contains">
+        <type name="GtkFileFilterFlags" c:type="GtkFileFilterFlags"/>
+      </field>
+      <field name="filename">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="uri">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="display_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="mime_type">
+        <type name="string" c:type="gchar*"/>
+      </field>
+    </record>
+    <callback name="GtkFileFilterFunc">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="filter_info">
+          <type name="GtkFileFilterInfo*" c:type="GtkFileFilterInfo*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="FileFilter"
+           c:type="GtkFileFilter"
+           parent="GtkObject"
+           glib:type-name="GtkFileFilter"
+           glib:get-type="gtk_file_filter_get_type">
+      <constructor name="new" c:identifier="gtk_file_filter_new">
         <return-value>
-          <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <type name="FileFilter" c:type="GtkFileFilter*"/>
+        </return-value>
+      </constructor>
+      <method name="set_name" c:identifier="gtk_file_filter_set_name">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
+          </parameter>
           <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="label">
-            <type name="gchar" c:type="gchar*"/>
+        </parameters>
+      </method>
+      <method name="get_name" c:identifier="gtk_file_filter_get_name">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
           </parameter>
-          <parameter name="tooltip">
-            <type name="gchar" c:type="gchar*"/>
+        </parameters>
+      </method>
+      <method name="add_mime_type"
+              c:identifier="gtk_file_filter_add_mime_type">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
           </parameter>
-          <parameter name="stock_id">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="mime_type">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_pattern" c:identifier="gtk_file_filter_add_pattern">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
+          </parameter>
+          <parameter name="pattern">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_pixbuf_formats"
+              c:identifier="gtk_file_filter_add_pixbuf_formats">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_custom" c:identifier="gtk_file_filter_add_custom">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
+          </parameter>
+          <parameter name="needed">
+            <type name="FileFilterFlags" c:type="GtkFileFilterFlags"/>
+          </parameter>
+          <parameter name="func">
+            <type name="GtkFileFilterFunc" c:type="GtkFileFilterFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="notify">
+            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_needed" c:identifier="gtk_file_filter_get_needed">
+        <return-value>
+          <type name="FileFilterFlags" c:type="GtkFileFilterFlags"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="filter" c:identifier="gtk_file_filter_filter">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
+          </parameter>
+          <parameter name="filter_info">
+            <type name="GtkFileFilterInfo" c:type="GtkFileFilterInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </class>
+    <record name="GtkFileChooser" c:type="GtkFileChooser"/>
+    <interface name="FileChooser"
+               c:type="GtkFileChooser"
+               glib:type-name="GtkFileChooser"
+               glib:get-type="gtk_file_chooser_get_type">
+      <property name="do-overwrite-confirmation">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="local-only">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="filter">
+        <type name="GtkFileFilter" c:type="GtkFileFilter"/>
+      </property>
+      <property name="action">
+        <type name="GtkFileChooserAction" c:type="GtkFileChooserAction"/>
+      </property>
+      <property name="preview-widget">
+        <type name="GtkWidget" c:type="GtkWidget"/>
+      </property>
+      <property name="show-hidden">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="file-system-backend">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="extra-widget">
+        <type name="GtkWidget" c:type="GtkWidget"/>
+      </property>
+      <property name="select-multiple">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="preview-widget-active">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="use-preview-label">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="set_current_folder">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="toggled" c:identifier="gtk_toggle_action_toggled">
+      </callback>
+      <callback name="get_current_folder">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_active" c:identifier="gtk_toggle_action_set_active">
+      </callback>
+      <callback name="set_current_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
           </parameter>
-          <parameter name="is_active">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_active" c:identifier="gtk_toggle_action_get_active">
+      </callback>
+      <callback name="select_path">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_draw_as_radio"
-              c:identifier="gtk_toggle_action_set_draw_as_radio">
+      </callback>
+      <callback name="unselect_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
           </parameter>
-          <parameter name="draw_as_radio">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_draw_as_radio"
-              c:identifier="gtk_toggle_action_get_draw_as_radio">
+      </callback>
+      <callback name="select_all">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="draw-as-radio">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="active">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <callback name="toggled">
+      </callback>
+      <callback name="unselect_all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="GtkToggleAction*" c:type="GtkToggleAction*"/>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="get_paths">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GSList*" c:type="GSList*"/>
         </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="get_preview_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
         </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <glib:signal name="toggled">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <record name="GtkRadioActionPrivate" c:type="GtkRadioActionPrivate"/>
-    <class name="RadioAction"
-           c:type="GtkRadioAction"
-           parent="ToggleAction"
-           glib:type-name="GtkRadioAction"
-           glib:get-type="gtk_radio_action_get_type">
-      <constructor name="new" c:identifier="gtk_radio_action_new">
+      <callback name="get_file_system">
         <return-value>
-          <type name="RadioAction" c:type="GtkRadioAction*"/>
+          <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
         </return-value>
         <parameters>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="label">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="tooltip">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="stock_id">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="gint" c:type="gint"/>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="get_group" c:identifier="gtk_radio_action_get_group">
+      </callback>
+      <callback name="add_filter">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
+          </parameter>
+          <parameter name="filter">
+            <type name="GtkFileFilter*" c:type="GtkFileFilter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_group" c:identifier="gtk_radio_action_set_group">
+      </callback>
+      <callback name="remove_filter">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
           </parameter>
-          <parameter name="group">
-            <type name="GSList" c:type="GSList*"/>
+          <parameter name="filter">
+            <type name="GtkFileFilter*" c:type="GtkFileFilter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_current_value"
-              c:identifier="gtk_radio_action_get_current_value">
+      </callback>
+      <callback name="list_filters">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="GSList*" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_current_value"
-              c:identifier="gtk_radio_action_set_current_value">
+      </callback>
+      <callback name="add_shortcut_folder">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
           </parameter>
-          <parameter name="current_value">
-            <type name="gint" c:type="gint"/>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="value">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="group">
-        <type name="GtkRadioAction" c:type="GtkRadioAction"/>
-      </property>
-      <property name="current-value">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <callback name="changed">
+      </callback>
+      <callback name="remove_shortcut_folder">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="GtkRadioAction*" c:type="GtkRadioAction*"/>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
           </parameter>
-          <parameter name="current">
-            <type name="GtkRadioAction*" c:type="GtkRadioAction*"/>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="list_shortcut_folders">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GSList*" c:type="GSList*"/>
         </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="current_folder_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="selection_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <glib:signal name="changed">
+      <callback name="update_preview">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkRadioAction" c:type="GtkRadioAction"/>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <class name="RadioButton"
-           c:type="GtkRadioButton"
-           parent="CheckButton"
-           glib:type-name="GtkRadioButton"
-           glib:get-type="gtk_radio_button_get_type">
-      <method name="new_from_widget"
-              c:identifier="gtk_radio_button_new_from_widget">
+      </callback>
+      <callback name="file_activated">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="radio_group_member">
-            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="new_with_label_from_widget"
-              c:identifier="gtk_radio_button_new_with_label_from_widget">
+      </callback>
+      <callback name="confirm_overwrite">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="GtkFileChooserConfirmation"
+                c:type="GtkFileChooserConfirmation"/>
         </return-value>
         <parameters>
-          <parameter name="radio_group_member">
-            <type name="RadioButton" c:type="GtkRadioButton*"/>
-          </parameter>
-          <parameter name="label">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="chooser">
+            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="new_with_mnemonic_from_widget"
-              c:identifier="gtk_radio_button_new_with_mnemonic_from_widget">
+      </callback>
+      <glib:signal name="current-folder-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="selection-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="update-preview">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="file-activated">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="confirm-overwrite">
         <return-value>
+          <type name="GtkFileChooserConfirmation"
+                c:type="GtkFileChooserConfirmation"/>
+        </return-value>
+      </glib:signal>
+    </interface>
+    <function name="file_chooser_error_quark"
+              c:identifier="gtk_file_chooser_error_quark">
+      <return-value>
+        <type name="GQuark" c:type="GQuark"/>
+      </return-value>
+    </function>
+    <function name="file_chooser_set_action"
+              c:identifier="gtk_file_chooser_set_action">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_action"
+              c:identifier="gtk_file_chooser_get_action">
+      <return-value>
+        <type name="GtkFileChooserAction" c:type="GtkFileChooserAction"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_local_only"
+              c:identifier="gtk_file_chooser_set_local_only">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="local_only">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_local_only"
+              c:identifier="gtk_file_chooser_get_local_only">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_select_multiple"
+              c:identifier="gtk_file_chooser_set_select_multiple">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="select_multiple">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_select_multiple"
+              c:identifier="gtk_file_chooser_get_select_multiple">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_show_hidden"
+              c:identifier="gtk_file_chooser_set_show_hidden">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="show_hidden">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_show_hidden"
+              c:identifier="gtk_file_chooser_get_show_hidden">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_do_overwrite_confirmation"
+              c:identifier="gtk_file_chooser_set_do_overwrite_confirmation">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="do_overwrite_confirmation">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_do_overwrite_confirmation"
+              c:identifier="gtk_file_chooser_get_do_overwrite_confirmation">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_current_name"
+              c:identifier="gtk_file_chooser_set_current_name">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_filename"
+              c:identifier="gtk_file_chooser_get_filename">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_filename"
+              c:identifier="gtk_file_chooser_set_filename">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="filename">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_select_filename"
+              c:identifier="gtk_file_chooser_select_filename">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="filename">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_unselect_filename"
+              c:identifier="gtk_file_chooser_unselect_filename">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="filename">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_select_all"
+              c:identifier="gtk_file_chooser_select_all">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_unselect_all"
+              c:identifier="gtk_file_chooser_unselect_all">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_filenames"
+              c:identifier="gtk_file_chooser_get_filenames">
+      <return-value>
+        <type name="GSList*" c:type="GSList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_current_folder"
+              c:identifier="gtk_file_chooser_set_current_folder">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="filename">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_current_folder"
+              c:identifier="gtk_file_chooser_get_current_folder">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_uri"
+              c:identifier="gtk_file_chooser_get_uri">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_uri"
+              c:identifier="gtk_file_chooser_set_uri">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_select_uri"
+              c:identifier="gtk_file_chooser_select_uri">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_unselect_uri"
+              c:identifier="gtk_file_chooser_unselect_uri">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_uris"
+              c:identifier="gtk_file_chooser_get_uris">
+      <return-value>
+        <type name="GSList*" c:type="GSList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_current_folder_uri"
+              c:identifier="gtk_file_chooser_set_current_folder_uri">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_current_folder_uri"
+              c:identifier="gtk_file_chooser_get_current_folder_uri">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_preview_widget"
+              c:identifier="gtk_file_chooser_set_preview_widget">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="preview_widget">
           <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="radio_group_member">
-            <type name="RadioButton" c:type="GtkRadioButton*"/>
-          </parameter>
-          <parameter name="label">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_group" c:identifier="gtk_radio_button_get_group">
-        <return-value>
-          <type name="GSList" c:type="GSList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="radio_button">
-            <type name="RadioButton" c:type="GtkRadioButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_group" c:identifier="gtk_radio_button_set_group">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="radio_button">
-            <type name="RadioButton" c:type="GtkRadioButton*"/>
-          </parameter>
-          <parameter name="group">
-            <type name="GSList" c:type="GSList*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="group">
-        <type name="GtkRadioButton" c:type="GtkRadioButton"/>
-      </property>
-      <callback name="group_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="radio_button">
-            <type name="GtkRadioButton*" c:type="GtkRadioButton*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="group-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="radio_button_new" c:identifier="gtk_radio_button_new">
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_preview_widget"
+              c:identifier="gtk_file_chooser_get_preview_widget">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="group">
-          <type name="GSList" c:type="GSList*"/>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="radio_button_new_with_label"
-              c:identifier="gtk_radio_button_new_with_label">
+    <function name="file_chooser_set_preview_widget_active"
+              c:identifier="gtk_file_chooser_set_preview_widget_active">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="group">
-          <type name="GSList" c:type="GSList*"/>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
         </parameter>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="active">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="radio_button_new_with_mnemonic"
-              c:identifier="gtk_radio_button_new_with_mnemonic">
+    <function name="file_chooser_get_preview_widget_active"
+              c:identifier="gtk_file_chooser_get_preview_widget_active">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="group">
-          <type name="GSList" c:type="GSList*"/>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
         </parameter>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_use_preview_label"
+              c:identifier="gtk_file_chooser_set_use_preview_label">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="use_label">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <class name="RadioMenuItem"
-           c:type="GtkRadioMenuItem"
-           parent="CheckMenuItem"
-           glib:type-name="GtkRadioMenuItem"
-           glib:get-type="gtk_radio_menu_item_get_type">
-      <method name="new_from_widget"
-              c:identifier="gtk_radio_menu_item_new_from_widget">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="group">
-            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="new_with_mnemonic_from_widget"
-              c:identifier="gtk_radio_menu_item_new_with_mnemonic_from_widget">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="group">
-            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
-          </parameter>
-          <parameter name="label">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="new_with_label_from_widget"
-              c:identifier="gtk_radio_menu_item_new_with_label_from_widget">
-        <return-value>
+    <function name="file_chooser_get_use_preview_label"
+              c:identifier="gtk_file_chooser_get_use_preview_label">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_preview_filename"
+              c:identifier="gtk_file_chooser_get_preview_filename">
+      <return-value>
+        <type name="string" c:type="char*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_preview_uri"
+              c:identifier="gtk_file_chooser_get_preview_uri">
+      <return-value>
+        <type name="string" c:type="char*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_extra_widget"
+              c:identifier="gtk_file_chooser_set_extra_widget">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="extra_widget">
           <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="group">
-            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
-          </parameter>
-          <parameter name="label">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_group" c:identifier="gtk_radio_menu_item_get_group">
-        <return-value>
-          <type name="GSList" c:type="GSList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="radio_menu_item">
-            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_group" c:identifier="gtk_radio_menu_item_set_group">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="radio_menu_item">
-            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
-          </parameter>
-          <parameter name="group">
-            <type name="GSList" c:type="GSList*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="group">
-        <type name="GtkRadioMenuItem" c:type="GtkRadioMenuItem"/>
-      </property>
-      <callback name="group_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="radio_menu_item">
-            <type name="GtkRadioMenuItem*" c:type="GtkRadioMenuItem*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="group-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="radio_menu_item_new" c:identifier="gtk_radio_menu_item_new">
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_extra_widget"
+              c:identifier="gtk_file_chooser_get_extra_widget">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="group">
-          <type name="GSList" c:type="GSList*"/>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="radio_menu_item_new_with_label"
-              c:identifier="gtk_radio_menu_item_new_with_label">
+    <function name="file_chooser_add_filter"
+              c:identifier="gtk_file_chooser_add_filter">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="group">
-          <type name="GSList" c:type="GSList*"/>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
         </parameter>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="filter">
+          <type name="FileFilter" c:type="GtkFileFilter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="radio_menu_item_new_with_mnemonic"
-              c:identifier="gtk_radio_menu_item_new_with_mnemonic">
+    <function name="file_chooser_remove_filter"
+              c:identifier="gtk_file_chooser_remove_filter">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="group">
-          <type name="GSList" c:type="GSList*"/>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
         </parameter>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="filter">
+          <type name="FileFilter" c:type="GtkFileFilter*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkToggleToolButtonPrivate"
-              c:type="GtkToggleToolButtonPrivate"/>
-    <class name="ToggleToolButton"
-           c:type="GtkToggleToolButton"
-           parent="ToolButton"
-           glib:type-name="GtkToggleToolButton"
-           glib:get-type="gtk_toggle_tool_button_get_type">
-      <method name="set_active"
-              c:identifier="gtk_toggle_tool_button_set_active">
+    <function name="file_chooser_list_filters"
+              c:identifier="gtk_file_chooser_list_filters">
+      <return-value>
+        <type name="GSList*" c:type="GSList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_filter"
+              c:identifier="gtk_file_chooser_set_filter">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="filter">
+          <type name="FileFilter" c:type="GtkFileFilter*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_filter"
+              c:identifier="gtk_file_chooser_get_filter">
+      <return-value>
+        <type name="GtkFileFilter*" c:type="GtkFileFilter*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_add_shortcut_folder"
+              c:identifier="gtk_file_chooser_add_shortcut_folder">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="folder">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_remove_shortcut_folder"
+              c:identifier="gtk_file_chooser_remove_shortcut_folder">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="folder">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_list_shortcut_folders"
+              c:identifier="gtk_file_chooser_list_shortcut_folders">
+      <return-value>
+        <type name="GSList*" c:type="GSList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_add_shortcut_folder_uri"
+              c:identifier="gtk_file_chooser_add_shortcut_folder_uri">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_remove_shortcut_folder_uri"
+              c:identifier="gtk_file_chooser_remove_shortcut_folder_uri">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_list_shortcut_folder_uris"
+              c:identifier="gtk_file_chooser_list_shortcut_folder_uris">
+      <return-value>
+        <type name="GSList*" c:type="GSList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkFileChooserButtonPrivate"
+            c:type="GtkFileChooserButtonPrivate"/>
+    <class name="FileChooserButton"
+           c:type="GtkFileChooserButton"
+           parent="HBox"
+           glib:type-name="GtkFileChooserButton"
+           glib:get-type="gtk_file_chooser_button_get_type">
+      <method name="get_title"
+              c:identifier="gtk_file_chooser_button_get_title">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="button">
-            <type name="ToggleToolButton" c:type="GtkToggleToolButton*"/>
-          </parameter>
-          <parameter name="is_active">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_active"
-              c:identifier="gtk_toggle_tool_button_get_active">
+      <method name="set_title"
+              c:identifier="gtk_file_chooser_button_set_title">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
-            <type name="ToggleToolButton" c:type="GtkToggleToolButton*"/>
+            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
+          </parameter>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="active">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <callback name="toggled">
+      <method name="get_width_chars"
+              c:identifier="gtk_file_chooser_button_get_width_chars">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="button">
-            <type name="GtkToggleToolButton*" c:type="GtkToggleToolButton*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="toggled">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="toggle_tool_button_new"
-              c:identifier="gtk_toggle_tool_button_new">
-      <return-value>
-        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
-      </return-value>
-    </function>
-    <function name="toggle_tool_button_new_from_stock"
-              c:identifier="gtk_toggle_tool_button_new_from_stock">
-      <return-value>
-        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stock_id">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="RadioToolButton"
-           c:type="GtkRadioToolButton"
-           parent="ToggleToolButton"
-           glib:type-name="GtkRadioToolButton"
-           glib:get-type="gtk_radio_tool_button_get_type">
-      <method name="new_from_widget"
-              c:identifier="gtk_radio_tool_button_new_from_widget">
-        <return-value>
-          <type name="ToolItem" c:type="GtkToolItem*"/>
-        </return-value>
-        <parameters>
-          <parameter name="group">
-            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
+            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="new_with_stock_from_widget"
-              c:identifier="gtk_radio_tool_button_new_with_stock_from_widget">
+      <method name="set_width_chars"
+              c:identifier="gtk_file_chooser_button_set_width_chars">
         <return-value>
-          <type name="ToolItem" c:type="GtkToolItem*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="group">
-            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
+          <parameter name="button">
+            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
           </parameter>
-          <parameter name="stock_id">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="n_chars">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_group" c:identifier="gtk_radio_tool_button_get_group">
+      <method name="get_focus_on_click"
+              c:identifier="gtk_file_chooser_button_get_focus_on_click">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="button">
-            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
+            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_group" c:identifier="gtk_radio_tool_button_set_group">
+      <method name="set_focus_on_click"
+              c:identifier="gtk_file_chooser_button_set_focus_on_click">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="button">
-            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
+            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
           </parameter>
-          <parameter name="group">
-            <type name="GSList" c:type="GSList*"/>
+          <parameter name="focus_on_click">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <property name="group">
-        <type name="GtkRadioToolButton" c:type="GtkRadioToolButton"/>
+      <property name="dialog">
+        <type name="GtkFileChooser" c:type="GtkFileChooser"/>
       </property>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+      <property name="focus-on-click">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="title">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="width-chars">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <callback name="file_set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="fc">
+            <type name="GtkFileChooserButton*" c:type="GtkFileChooserButton*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved4">
+      <field name="__gtk_reserved1">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved2">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved3">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved4">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved5">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved6">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved7">
+        <type name="any" c:type="void*"/>
+      </field>
+      <glib:signal name="file-set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
+      </glib:signal>
     </class>
-    <function name="radio_tool_button_new"
-              c:identifier="gtk_radio_tool_button_new">
+    <function name="file_chooser_button_new"
+              c:identifier="gtk_file_chooser_button_new">
       <return-value>
-        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="group">
-          <type name="GSList" c:type="GSList*"/>
+        <parameter name="title">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
         </parameter>
       </parameters>
     </function>
-    <function name="radio_tool_button_new_from_stock"
-              c:identifier="gtk_radio_tool_button_new_from_stock">
+    <function name="file_chooser_button_new_with_backend"
+              c:identifier="gtk_file_chooser_button_new_with_backend">
       <return-value>
-        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="group">
-          <type name="GSList" c:type="GSList*"/>
+        <parameter name="title">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="stock_id">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+        </parameter>
+        <parameter name="backend">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkRecentData" c:type="GtkRecentData">
-      <field name="display_name">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="description">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="mime_type">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="app_name">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="app_exec">
-        <type name="gchar*" c:type="gchar*"/>
+    <function name="file_chooser_button_new_with_dialog"
+              c:identifier="gtk_file_chooser_button_new_with_dialog">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="dialog">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkFileChooserDialogPrivate"
+            c:type="GtkFileChooserDialogPrivate">
+      <field name="widget">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </field>
-      <field name="groups">
-        <type name="gchar**" c:type="gchar**"/>
+      <field name="file_system">
+        <type name="string" c:type="char*"/>
       </field>
-      <field name="is_private">
-        <type name="gboolean" c:type="gboolean"/>
+      <field name="response_requested">
+        <type name="boolean" c:type="gboolean"/>
       </field>
     </record>
-    <record name="GtkRecentManagerPrivate" c:type="GtkRecentManagerPrivate"/>
-    <function name="recent_manager_error_quark"
-              c:identifier="gtk_recent_manager_error_quark">
+    <class name="FileChooserDialog"
+           c:type="GtkFileChooserDialog"
+           parent="Dialog"
+           glib:type-name="GtkFileChooserDialog"
+           glib:get-type="gtk_file_chooser_dialog_get_type">
+    </class>
+    <function name="file_chooser_dialog_new"
+              c:identifier="gtk_file_chooser_dialog_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="title">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="parent">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+        </parameter>
+        <parameter name="first_button_text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_dialog_new_with_backend"
+              c:identifier="gtk_file_chooser_dialog_new_with_backend">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="title">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="parent">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+        </parameter>
+        <parameter name="backend">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="first_button_text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkFileFolder" c:type="GtkFileFolder"/>
+    <record name="GtkFileSystem" c:type="GtkFileSystem"/>
+    <record name="GtkFileSystemVolume" c:type="GtkFileSystemVolume"/>
+    <enumeration name="FileInfoType" c:type="GtkFileInfoType">
+      <member name="display_name"
+              value="1"
+              c:identifier="GTK_FILE_INFO_DISPLAY_NAME"/>
+      <member name="is_folder"
+              value="2"
+              c:identifier="GTK_FILE_INFO_IS_FOLDER"/>
+      <member name="is_hidden"
+              value="4"
+              c:identifier="GTK_FILE_INFO_IS_HIDDEN"/>
+      <member name="mime_type"
+              value="8"
+              c:identifier="GTK_FILE_INFO_MIME_TYPE"/>
+      <member name="modification_time"
+              value="16"
+              c:identifier="GTK_FILE_INFO_MODIFICATION_TIME"/>
+      <member name="size" value="32" c:identifier="GTK_FILE_INFO_SIZE"/>
+      <member name="icon" value="64" c:identifier="GTK_FILE_INFO_ICON"/>
+      <member name="all" value="127" c:identifier="GTK_FILE_INFO_ALL"/>
+    </enumeration>
+    <enumeration name="FileSystemError" c:type="GtkFileSystemError">
+      <member name="r_nonexistent"
+              value="0"
+              c:identifier="GTK_FILE_SYSTEM_ERROR_NONEXISTENT"/>
+      <member name="r_not_folder"
+              value="1"
+              c:identifier="GTK_FILE_SYSTEM_ERROR_NOT_FOLDER"/>
+      <member name="r_invalid_uri"
+              value="2"
+              c:identifier="GTK_FILE_SYSTEM_ERROR_INVALID_URI"/>
+      <member name="r_bad_filename"
+              value="3"
+              c:identifier="GTK_FILE_SYSTEM_ERROR_BAD_FILENAME"/>
+      <member name="r_failed"
+              value="4"
+              c:identifier="GTK_FILE_SYSTEM_ERROR_FAILED"/>
+      <member name="r_already_exists"
+              value="5"
+              c:identifier="GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS"/>
+    </enumeration>
+    <function name="file_system_error_quark"
+              c:identifier="gtk_file_system_error_quark">
       <return-value>
         <type name="GQuark" c:type="GQuark"/>
       </return-value>
     </function>
-    <class name="RecentManager"
-           c:type="GtkRecentManager"
-           parent="GLib.Object"
-           glib:type-name="GtkRecentManager"
-           glib:get-type="gtk_recent_manager_get_type">
-      <constructor name="new" c:identifier="gtk_recent_manager_new">
+    <glib:boxed c:type="FileInfo"
+                glib:name="FileInfo"
+                glib:type-name="GtkFileInfo"
+                glib:get-type="gtk_file_info_get_type">
+      <constructor name="new" c:identifier="gtk_file_info_new">
         <return-value>
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <type name="FileInfo" c:type="GtkFileInfo*"/>
         </return-value>
       </constructor>
-      <constructor name="get_default"
-                   c:identifier="gtk_recent_manager_get_default">
+      <constructor name="copy" c:identifier="gtk_file_info_copy">
         <return-value>
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <type name="FileInfo" c:type="GtkFileInfo*"/>
         </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          </parameter>
+        </parameters>
       </constructor>
-      <constructor name="get_for_screen"
-                   c:identifier="gtk_recent_manager_get_for_screen">
+      <method name="free" c:identifier="gtk_file_info_free">
         <return-value>
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="set_screen" c:identifier="gtk_recent_manager_set_screen">
+      </method>
+      <method name="get_display_name"
+              c:identifier="gtk_file_info_get_display_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_item" c:identifier="gtk_recent_manager_add_item">
+      <method name="get_display_key"
+              c:identifier="gtk_file_info_get_display_key">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
-          </parameter>
-          <parameter name="uri">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_full" c:identifier="gtk_recent_manager_add_full">
+      <method name="set_display_name"
+              c:identifier="gtk_file_info_set_display_name">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="display_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="recent_data">
-            <type name="GtkRecentData" c:type="GtkRecentData*"/>
+        </parameters>
+      </method>
+      <method name="get_is_folder" c:identifier="gtk_file_info_get_is_folder">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_item" c:identifier="gtk_recent_manager_remove_item">
+      <method name="set_is_folder" c:identifier="gtk_file_info_set_is_folder">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="is_folder">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+        </parameters>
+      </method>
+      <method name="get_is_hidden" c:identifier="gtk_file_info_get_is_hidden">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="lookup_item" c:identifier="gtk_recent_manager_lookup_item">
+      <method name="set_is_hidden" c:identifier="gtk_file_info_set_is_hidden">
         <return-value>
-          <type name="GtkRecentInfo" c:type="GtkRecentInfo*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="is_hidden">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+        </parameters>
+      </method>
+      <method name="get_mime_type" c:identifier="gtk_file_info_get_mime_type">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="has_item" c:identifier="gtk_recent_manager_has_item">
+      <method name="set_mime_type" c:identifier="gtk_file_info_set_mime_type">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="mime_type">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_item" c:identifier="gtk_recent_manager_move_item">
+      <method name="get_modification_time"
+              c:identifier="gtk_file_info_get_modification_time">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="GtkFileTime" c:type="GtkFileTime"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="gchar" c:type="gchar*"/>
+        </parameters>
+      </method>
+      <method name="set_modification_time"
+              c:identifier="gtk_file_info_set_modification_time">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
-          <parameter name="new_uri">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="modification_time">
+            <type name="GtkFileTime" c:type="GtkFileTime"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+        </parameters>
+      </method>
+      <method name="get_size" c:identifier="gtk_file_info_get_size">
+        <return-value>
+          <type name="gint64" c:type="gint64"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_limit" c:identifier="gtk_recent_manager_set_limit">
+      <method name="set_size" c:identifier="gtk_file_info_set_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
-          <parameter name="limit">
-            <type name="gint" c:type="gint"/>
+          <parameter name="size">
+            <type name="gint64" c:type="gint64"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_limit" c:identifier="gtk_recent_manager_get_limit">
+      <method name="set_icon_name" c:identifier="gtk_file_info_set_icon_name">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          </parameter>
+          <parameter name="con_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_items" c:identifier="gtk_recent_manager_get_items">
+      <method name="get_icon_name" c:identifier="gtk_file_info_get_icon_name">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="purge_items" c:identifier="gtk_recent_manager_purge_items">
+      <method name="render_icon" c:identifier="gtk_file_info_render_icon">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="pixel_size">
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="error">
             <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <property name="filename">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="limit">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="size">
-        <type name="gint" c:type="gint"/>
+    </glib:boxed>
+    <class name="FileSystemHandle"
+           c:type="GtkFileSystemHandle"
+           parent="GLib.Object"
+           glib:type-name="GtkFileSystemHandle"
+           glib:get-type="gtk_file_system_handle_get_type">
+      <property name="cancelled">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="changed">
+    </class>
+    <callback name="GtkFileSystemGetInfoCallback">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="handle">
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+        </parameter>
+        <parameter name="file_info">
+          <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError*" c:type="GError*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GtkFileSystemGetFolderCallback">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="handle">
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+        </parameter>
+        <parameter name="folder">
+          <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError*" c:type="GError*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GtkFileSystemCreateFolderCallback">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="handle">
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError*" c:type="GError*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GtkFileSystemVolumeMountCallback">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="handle">
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+        </parameter>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError*" c:type="GError*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <interface name="FileSystem"
+               c:type="GtkFileSystem"
+               glib:type-name="GtkFileSystem"
+               glib:get-type="gtk_file_system_get_type">
+      <callback name="list_volumes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GSList*" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="GtkRecentManager*" c:type="GtkRecentManager*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_recent1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_recent2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_recent3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_recent4">
+      <callback name="get_volume_for_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
         </return-value>
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <glib:signal name="changed">
+      <callback name="get_folder">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
         </return-value>
-      </glib:signal>
-    </class>
-    <glib:boxed c:type="RecentInfo"
-                glib:name="RecentInfo"
-                glib:type-name="GtkRecentInfo"
-                glib:get-type="gtk_recent_info_get_type">
-      <constructor name="ref" c:identifier="gtk_recent_info_ref">
+        <parameters>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="types">
+            <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkFileSystemGetFolderCallback"
+                  c:type="GtkFileSystemGetFolderCallback"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_info">
         <return-value>
-          <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="types">
+            <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkFileSystemGetInfoCallback"
+                  c:type="GtkFileSystemGetInfoCallback"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="unref" c:identifier="gtk_recent_info_unref">
+      </callback>
+      <callback name="create_folder">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkFileSystemCreateFolderCallback"
+                  c:type="GtkFileSystemCreateFolderCallback"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_uri" c:identifier="gtk_recent_info_get_uri">
+      </callback>
+      <callback name="cancel_operation">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="handle">
+            <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_display_name"
-              c:identifier="gtk_recent_info_get_display_name">
+      </callback>
+      <callback name="volume_free">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="volume">
+            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_description"
-              c:identifier="gtk_recent_info_get_description">
+      </callback>
+      <callback name="volume_get_base_path">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="volume">
+            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_mime_type" c:identifier="gtk_recent_info_get_mime_type">
+      </callback>
+      <callback name="volume_get_is_mounted">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="volume">
+            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_added" c:identifier="gtk_recent_info_get_added">
+      </callback>
+      <callback name="volume_mount">
         <return-value>
-          <type name="time_t" c:type="time_t"/>
+          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="volume">
+            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkFileSystemVolumeMountCallback"
+                  c:type="GtkFileSystemVolumeMountCallback"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_modified" c:identifier="gtk_recent_info_get_modified">
+      </callback>
+      <callback name="volume_get_display_name">
         <return-value>
-          <type name="time_t" c:type="time_t"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="volume">
+            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_visited" c:identifier="gtk_recent_info_get_visited">
+      </callback>
+      <callback name="volume_get_icon_name">
         <return-value>
-          <type name="time_t" c:type="time_t"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="volume">
+            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_private_hint"
-              c:identifier="gtk_recent_info_get_private_hint">
+      </callback>
+      <callback name="get_parent">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="parent">
+            <type name="GtkFilePath**" c:type="GtkFilePath**"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_application_info"
-              c:identifier="gtk_recent_info_get_application_info">
+      </callback>
+      <callback name="make_path">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-          <parameter name="app_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
-          <parameter name="app_exec">
-            <type name="gchar" c:type="gchar**"/>
+          <parameter name="base_path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
           </parameter>
-          <parameter name="count">
-            <type name="guint" c:type="guint*"/>
+          <parameter name="display_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="time_">
-            <type name="time_t" c:type="time_t*"/>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_applications"
-              c:identifier="gtk_recent_info_get_applications">
+      </callback>
+      <callback name="parse">
         <return-value>
-          <type name="gchar" c:type="gchar**"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
-          <parameter name="length">
-            <type name="gsize" c:type="gsize*"/>
+          <parameter name="base_path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="folder">
+            <type name="GtkFilePath**" c:type="GtkFilePath**"/>
+          </parameter>
+          <parameter name="file_part">
+            <type name="gchar**" c:type="gchar**"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="last_application"
-              c:identifier="gtk_recent_info_last_application">
+      </callback>
+      <callback name="path_to_uri">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="has_application"
-              c:identifier="gtk_recent_info_has_application">
+      </callback>
+      <callback name="path_to_filename">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
-          <parameter name="app_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_groups" c:identifier="gtk_recent_info_get_groups">
+      </callback>
+      <callback name="uri_to_path">
         <return-value>
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
-          <parameter name="length">
-            <type name="gsize" c:type="gsize*"/>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="has_group" c:identifier="gtk_recent_info_has_group">
+      </callback>
+      <callback name="filename_to_path">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
-          <parameter name="group_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_icon" c:identifier="gtk_recent_info_get_icon">
+      </callback>
+      <callback name="insert_bookmark">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
-          <parameter name="size">
-            <type name="gint" c:type="gint"/>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_short_name"
-              c:identifier="gtk_recent_info_get_short_name">
+      </callback>
+      <callback name="remove_bookmark">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_uri_display"
-              c:identifier="gtk_recent_info_get_uri_display">
+      </callback>
+      <callback name="list_bookmarks">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="GSList*" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_age" c:identifier="gtk_recent_info_get_age">
+      </callback>
+      <callback name="volumes_changed">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="is_local" c:identifier="gtk_recent_info_is_local">
+      </callback>
+      <callback name="bookmarks_changed">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="exists" c:identifier="gtk_recent_info_exists">
+      </callback>
+      <callback name="get_bookmark_label">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="match" c:identifier="gtk_recent_info_match">
+      </callback>
+      <callback name="set_bookmark_label">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info_a">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="file_system">
+            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
           </parameter>
-          <parameter name="info_b">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          </parameter>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-    </glib:boxed>
-    <function name="recent_manager_sync"
-              c:identifier="_gtk_recent_manager_sync">
+      </callback>
+      <glib:signal name="volumes-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="bookmarks-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </interface>
+    <function name="file_system_list_volumes"
+              c:identifier="gtk_file_system_list_volumes">
+      <return-value>
+        <type name="GSList*" c:type="GSList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_get_volume_for_path"
+              c:identifier="gtk_file_system_get_volume_for_path">
+      <return-value>
+        <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_volume_free"
+              c:identifier="gtk_file_system_volume_free">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_volume_get_base_path"
+              c:identifier="gtk_file_system_volume_get_base_path">
+      <return-value>
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_volume_get_is_mounted"
+              c:identifier="gtk_file_system_volume_get_is_mounted">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_volume_mount"
+              c:identifier="gtk_file_system_volume_mount">
+      <return-value>
+        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
+        </parameter>
+        <parameter name="callback">
+          <type name="GtkFileSystemVolumeMountCallback"
+                c:type="GtkFileSystemVolumeMountCallback"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_volume_get_display_name"
+              c:identifier="gtk_file_system_volume_get_display_name">
+      <return-value>
+        <type name="string" c:type="char*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_volume_render_icon"
+              c:identifier="gtk_file_system_volume_render_icon">
+      <return-value>
+        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
+        </parameter>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="pixel_size">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_volume_get_icon_name"
+              c:identifier="gtk_file_system_volume_get_icon_name">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="volume">
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_get_parent"
+              c:identifier="gtk_file_system_get_parent">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        </parameter>
+        <parameter name="parent">
+          <type name="GtkFilePath" c:type="GtkFilePath**"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_get_folder"
+              c:identifier="gtk_file_system_get_folder">
+      <return-value>
+        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        </parameter>
+        <parameter name="types">
+          <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
+        </parameter>
+        <parameter name="callback">
+          <type name="GtkFileSystemGetFolderCallback"
+                c:type="GtkFileSystemGetFolderCallback"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_get_info"
+              c:identifier="gtk_file_system_get_info">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
       </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        </parameter>
+        <parameter name="types">
+          <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
+        </parameter>
+        <parameter name="callback">
+          <type name="GtkFileSystemGetInfoCallback"
+                c:type="GtkFileSystemGetInfoCallback"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
     </function>
-    <record name="GtkRecentActionPrivate" c:type="GtkRecentActionPrivate"/>
-    <class name="RecentAction"
-           c:type="GtkRecentAction"
-           parent="Action"
-           glib:type-name="GtkRecentAction"
-           glib:get-type="gtk_recent_action_get_type">
-      <method name="get_show_numbers"
-              c:identifier="gtk_recent_action_get_show_numbers">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="RecentAction" c:type="GtkRecentAction*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_show_numbers"
-              c:identifier="gtk_recent_action_set_show_numbers">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="RecentAction" c:type="GtkRecentAction*"/>
-          </parameter>
-          <parameter name="show_numbers">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="show-numbers">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-    </class>
-    <function name="recent_action_new" c:identifier="gtk_recent_action_new">
+    <function name="file_system_create_folder"
+              c:identifier="gtk_file_system_create_folder">
       <return-value>
-        <type name="GtkAction*" c:type="GtkAction*"/>
+        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
-        <parameter name="tooltip">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="callback">
+          <type name="GtkFileSystemCreateFolderCallback"
+                c:type="GtkFileSystemCreateFolderCallback"/>
         </parameter>
-        <parameter name="stock_id">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_action_new_for_manager"
-              c:identifier="gtk_recent_action_new_for_manager">
+    <function name="file_system_cancel_operation"
+              c:identifier="gtk_file_system_cancel_operation">
       <return-value>
-        <type name="GtkAction*" c:type="GtkAction*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="handle">
+          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
         </parameter>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+      </parameters>
+    </function>
+    <function name="file_system_make_path"
+              c:identifier="gtk_file_system_make_path">
+      <return-value>
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="tooltip">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="base_path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
-        <parameter name="stock_id">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="display_name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="manager">
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkRecentFilterInfo" c:type="GtkRecentFilterInfo">
-      <field name="contains">
-        <type name="GtkRecentFilterFlags" c:type="GtkRecentFilterFlags"/>
-      </field>
-      <field name="uri">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="display_name">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="mime_type">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="applications">
-        <type name="gchar**" c:type="gchar**"/>
-      </field>
-      <field name="groups">
-        <type name="gchar**" c:type="gchar**"/>
-      </field>
-      <field name="age">
-        <type name="gint" c:type="gint"/>
-      </field>
-    </record>
-    <callback name="GtkRecentFilterFunc">
+    <function name="file_system_parse" c:identifier="gtk_file_system_parse">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="filter_info">
-          <type name="GtkRecentFilterInfo*" c:type="GtkRecentFilterInfo*"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="base_path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        </parameter>
+        <parameter name="str">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="folder">
+          <type name="GtkFilePath" c:type="GtkFilePath**"/>
+        </parameter>
+        <parameter name="file_part">
+          <type name="gchar" c:type="gchar**"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
-    </callback>
-    <class name="RecentFilter"
-           c:type="GtkRecentFilter"
-           parent="GtkObject"
-           glib:type-name="GtkRecentFilter"
-           glib:get-type="gtk_recent_filter_get_type">
-      <constructor name="new" c:identifier="gtk_recent_filter_new">
-        <return-value>
-          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-        </return-value>
-      </constructor>
-      <method name="set_name" c:identifier="gtk_recent_filter_set_name">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_name" c:identifier="gtk_recent_filter_get_name">
-        <return-value>
-          <type name="gchar" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_mime_type"
-              c:identifier="gtk_recent_filter_add_mime_type">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="mime_type">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_pattern" c:identifier="gtk_recent_filter_add_pattern">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="pattern">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_pixbuf_formats"
-              c:identifier="gtk_recent_filter_add_pixbuf_formats">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_application"
-              c:identifier="gtk_recent_filter_add_application">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="application">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_group" c:identifier="gtk_recent_filter_add_group">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="group">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_age" c:identifier="gtk_recent_filter_add_age">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="days">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_custom" c:identifier="gtk_recent_filter_add_custom">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="needed">
-            <type name="RecentFilterFlags" c:type="GtkRecentFilterFlags"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkRecentFilterFunc" c:type="GtkRecentFilterFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="data_destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_needed" c:identifier="gtk_recent_filter_get_needed">
-        <return-value>
-          <type name="RecentFilterFlags" c:type="GtkRecentFilterFlags"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="filter" c:identifier="gtk_recent_filter_filter">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="filter_info">
-            <type name="GtkRecentFilterInfo" c:type="GtkRecentFilterInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </class>
-    <callback name="GtkRecentSortFunc">
+    </function>
+    <function name="file_system_path_to_uri"
+              c:identifier="gtk_file_system_path_to_uri">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="a">
-          <type name="GtkRecentInfo*" c:type="GtkRecentInfo*"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-        <parameter name="b">
-          <type name="GtkRecentInfo*" c:type="GtkRecentInfo*"/>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="file_system_path_to_filename"
+              c:identifier="gtk_file_system_path_to_filename">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
       </parameters>
-    </callback>
-    <record name="GtkRecentChooser" c:type="GtkRecentChooser"/>
-    <function name="recent_chooser_error_quark"
-              c:identifier="gtk_recent_chooser_error_quark">
+    </function>
+    <function name="file_system_uri_to_path"
+              c:identifier="gtk_file_system_uri_to_path">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_filename_to_path"
+              c:identifier="gtk_file_system_filename_to_path">
+      <return-value>
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
       </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="filename">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
     </function>
-    <interface name="RecentChooser"
-               c:type="GtkRecentChooser"
-               glib:type-name="GtkRecentChooser"
-               glib:get-type="gtk_recent_chooser_get_type">
-      <property name="filter">
-        <type name="GtkRecentFilter" c:type="GtkRecentFilter"/>
-      </property>
-      <property name="show-icons">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="select-multiple">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="local-only">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="recent-manager">
-        <type name="GtkRecentManager" c:type="GtkRecentManager"/>
-      </property>
-      <property name="show-not-found">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="show-tips">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="show-private">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="limit">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="sort-type">
-        <type name="GtkRecentSortType" c:type="GtkRecentSortType"/>
-      </property>
-      <callback name="set_current_uri">
+    <function name="file_system_path_is_local"
+              c:identifier="gtk_file_system_path_is_local">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="filesystem">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_insert_bookmark"
+              c:identifier="gtk_file_system_insert_bookmark">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        </parameter>
+        <parameter name="position">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_remove_bookmark"
+              c:identifier="gtk_file_system_remove_bookmark">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_list_bookmarks"
+              c:identifier="gtk_file_system_list_bookmarks">
+      <return-value>
+        <type name="GSList*" c:type="GSList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_get_bookmark_label"
+              c:identifier="gtk_file_system_get_bookmark_label">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_system_set_bookmark_label"
+              c:identifier="gtk_file_system_set_bookmark_label">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        </parameter>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <interface name="FileFolder"
+               c:type="GtkFileFolder"
+               glib:type-name="GtkFileFolder"
+               glib:get-type="gtk_file_folder_get_type">
+      <callback name="get_info">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          <parameter name="folder">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
           </parameter>
           <parameter name="error">
             <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_current_uri">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_uri">
+      <callback name="list_children">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          <parameter name="folder">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="children">
+            <type name="GSList**" c:type="GSList**"/>
           </parameter>
           <parameter name="error">
             <type name="GError**" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="unselect_uri">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
-          </parameter>
-          <parameter name="uri">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_all">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="unselect_all">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_items">
+      <callback name="deleted">
         <return-value>
-          <type name="GList*" c:type="GList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          <parameter name="monitor">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_recent_manager">
+      <callback name="files_added">
         <return-value>
-          <type name="GtkRecentManager*" c:type="GtkRecentManager*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          <parameter name="monitor">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          </parameter>
+          <parameter name="paths">
+            <type name="GSList*" c:type="GSList*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="add_filter">
+      <callback name="files_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          <parameter name="monitor">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
           </parameter>
-          <parameter name="filter">
-            <type name="GtkRecentFilter*" c:type="GtkRecentFilter*"/>
+          <parameter name="paths">
+            <type name="GSList*" c:type="GSList*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="remove_filter">
+      <callback name="files_removed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          <parameter name="monitor">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
           </parameter>
-          <parameter name="filter">
-            <type name="GtkRecentFilter*" c:type="GtkRecentFilter*"/>
+          <parameter name="paths">
+            <type name="GSList*" c:type="GSList*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="list_filters">
+      <callback name="is_finished_loading">
         <return-value>
-          <type name="GSList*" c:type="GSList*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          <parameter name="folder">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_sort_func">
+      <callback name="finished_loading">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
-          </parameter>
-          <parameter name="sort_func">
-            <type name="GtkRecentSortFunc" c:type="GtkRecentSortFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="folder">
+            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="item_activated">
+      <glib:signal name="deleted">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="files-added">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          <parameter name="object">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="selection_changed">
+      </glib:signal>
+      <glib:signal name="files-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          <parameter name="object">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </callback>
-      <glib:signal name="selection-changed">
+      </glib:signal>
+      <glib:signal name="files-removed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
       </glib:signal>
-      <glib:signal name="item-activated">
+      <glib:signal name="finished-loading">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
     </interface>
-    <function name="recent_chooser_set_show_private"
-              c:identifier="gtk_recent_chooser_set_show_private">
+    <function name="file_folder_list_children"
+              c:identifier="gtk_file_folder_list_children">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="folder">
+          <type name="FileFolder" c:type="GtkFileFolder*"/>
         </parameter>
-        <parameter name="show_private">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="children">
+          <type name="GSList" c:type="GSList**"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_show_private"
-              c:identifier="gtk_recent_chooser_get_show_private">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_set_show_not_found"
-              c:identifier="gtk_recent_chooser_set_show_not_found">
+    <function name="file_folder_get_info"
+              c:identifier="gtk_file_folder_get_info">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="folder">
+          <type name="FileFolder" c:type="GtkFileFolder*"/>
         </parameter>
-        <parameter name="show_not_found">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="path">
+          <type name="GtkFilePath" c:type="GtkFilePath*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_show_not_found"
-              c:identifier="gtk_recent_chooser_get_show_not_found">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_set_select_multiple"
-              c:identifier="gtk_recent_chooser_set_select_multiple">
+    <function name="file_folder_is_finished_loading"
+              c:identifier="gtk_file_folder_is_finished_loading">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="select_multiple">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="folder">
+          <type name="FileFolder" c:type="GtkFileFolder*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_get_select_multiple"
-              c:identifier="gtk_recent_chooser_get_select_multiple">
+    <glib:boxed c:type="FilePath"
+                glib:name="FilePath"
+                glib:type-name="GtkFilePath"
+                glib:get-type="gtk_file_path_get_type">
+    </glib:boxed>
+    <function name="file_paths_sort" c:identifier="gtk_file_paths_sort">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="GSList*" c:type="GSList*"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="paths">
+          <type name="GSList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_set_limit"
-              c:identifier="gtk_recent_chooser_set_limit">
+    <function name="file_paths_copy" c:identifier="gtk_file_paths_copy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GSList*" c:type="GSList*"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="limit">
-          <type name="gint" c:type="gint"/>
+        <parameter name="paths">
+          <type name="GSList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_get_limit"
-              c:identifier="gtk_recent_chooser_get_limit">
+    <function name="file_paths_free" c:identifier="gtk_file_paths_free">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="paths">
+          <type name="GSList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_set_local_only"
-              c:identifier="gtk_recent_chooser_set_local_only">
+    <function name="file_system_create" c:identifier="gtk_file_system_create">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="local_only">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="file_system_name">
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_get_local_only"
-              c:identifier="gtk_recent_chooser_get_local_only">
+    <record name="GtkFileSystemModel" c:type="GtkFileSystemModel">
+      <field name="parent_instance">
+        <type name="GObject" c:type="GObject"/>
+      </field>
+      <field name="file_system">
+        <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+      </field>
+      <field name="types">
+        <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
+      </field>
+      <field name="roots">
+        <type name="FileModelNode*" c:type="FileModelNode*"/>
+      </field>
+      <field name="root_folder">
+        <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+      </field>
+      <field name="root_path">
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+      </field>
+      <field name="filter_func">
+        <type name="GtkFileSystemModelFilter"
+              c:type="GtkFileSystemModelFilter"/>
+      </field>
+      <field name="filter_data">
+        <type name="any" c:type="gpointer"/>
+      </field>
+      <field name="idle_clears">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
+      <field name="idle_clear_source">
+        <type name="GSource*" c:type="GSource*"/>
+      </field>
+      <field name="max_depth">
+        <type name="gushort" c:type="gushort"/>
+      </field>
+      <field name="pending_handles">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
+      <field name="show_hidden">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="show_folders">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="show_files">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="folders_only">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="has_editable">
+        <type name="guint" c:type="guint"/>
+      </field>
+    </record>
+    <function name="file_system_model_get_type"
+              c:identifier="_gtk_file_system_model_get_type">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="GType" c:type="GType"/>
       </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="recent_chooser_set_show_tips"
-              c:identifier="gtk_recent_chooser_set_show_tips">
+    <enumeration name="FileSystemModelColumns"
+                 c:type="GtkFileSystemModelColumns">
+      <member name="info" value="0" c:identifier="GTK_FILE_SYSTEM_MODEL_INFO"/>
+      <member name="display_name"
+              value="1"
+              c:identifier="GTK_FILE_SYSTEM_MODEL_DISPLAY_NAME"/>
+      <member name="n_columns"
+              value="2"
+              c:identifier="GTK_FILE_SYSTEM_MODEL_N_COLUMNS"/>
+    </enumeration>
+    <function name="file_system_model_new"
+              c:identifier="_gtk_file_system_model_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkFileSystemModel*" c:type="GtkFileSystemModel*"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="show_tips">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="file_system">
+          <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_show_tips"
-              c:identifier="gtk_recent_chooser_get_show_tips">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="root_path">
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_set_show_numbers"
-              c:identifier="gtk_recent_chooser_set_show_numbers">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="max_depth">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="show_numbers">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="types">
+          <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_show_numbers"
-              c:identifier="gtk_recent_chooser_get_show_numbers">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_set_show_icons"
-              c:identifier="gtk_recent_chooser_set_show_icons">
+    <function name="file_system_model_get_info"
+              c:identifier="_gtk_file_system_model_get_info">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="show_icons">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="model">
+          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_show_icons"
-              c:identifier="gtk_recent_chooser_get_show_icons">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_set_sort_type"
-              c:identifier="gtk_recent_chooser_set_sort_type">
+    <function name="file_system_model_get_path"
+              c:identifier="_gtk_file_system_model_get_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="sort_type">
-          <type name="RecentSortType" c:type="GtkRecentSortType"/>
+        <parameter name="model">
+          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_sort_type"
-              c:identifier="gtk_recent_chooser_get_sort_type">
-      <return-value>
-        <type name="GtkRecentSortType" c:type="GtkRecentSortType"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_set_sort_func"
-              c:identifier="gtk_recent_chooser_set_sort_func">
+    <function name="file_system_model_set_show_hidden"
+              c:identifier="_gtk_file_system_model_set_show_hidden">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="sort_func">
-          <type name="GtkRecentSortFunc" c:type="GtkRecentSortFunc"/>
-        </parameter>
-        <parameter name="sort_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="model">
+          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
         </parameter>
-        <parameter name="data_destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+        <parameter name="show_hidden">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_set_current_uri"
-              c:identifier="gtk_recent_chooser_set_current_uri">
+    <function name="file_system_model_set_show_folders"
+              c:identifier="_gtk_file_system_model_set_show_folders">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="model">
+          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
         </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+        <parameter name="show_folders">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_get_current_uri"
-              c:identifier="gtk_recent_chooser_get_current_uri">
+    <function name="file_system_model_set_show_files"
+              c:identifier="_gtk_file_system_model_set_show_files">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="model">
+          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_current_item"
-              c:identifier="gtk_recent_chooser_get_current_item">
-      <return-value>
-        <type name="GtkRecentInfo*" c:type="GtkRecentInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="show_files">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_select_uri"
-              c:identifier="gtk_recent_chooser_select_uri">
+    <callback name="GtkFileSystemModelFilter">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="model">
+          <type name="GtkFileSystemModel*" c:type="GtkFileSystemModel*"/>
         </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+        <parameter name="path">
+          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_unselect_uri"
-              c:identifier="gtk_recent_chooser_unselect_uri">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="info">
+          <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
         </parameter>
-        <parameter name="uri">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="recent_chooser_select_all"
-              c:identifier="gtk_recent_chooser_select_all">
+    </callback>
+    <function name="file_system_model_set_filter"
+              c:identifier="_gtk_file_system_model_set_filter">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="model">
+          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_unselect_all"
-              c:identifier="gtk_recent_chooser_unselect_all">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="filter">
+          <type name="GtkFileSystemModelFilter"
+                c:type="GtkFileSystemModelFilter"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_items"
-              c:identifier="gtk_recent_chooser_get_items">
-      <return-value>
-        <type name="GList*" c:type="GList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_get_uris"
-              c:identifier="gtk_recent_chooser_get_uris">
+    <callback name="GtkFileSystemModelPathFunc">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="model">
+          <type name="GtkFileSystemModel*" c:type="GtkFileSystemModel*"/>
         </parameter>
-        <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+        <parameter name="path">
+          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_add_filter"
-              c:identifier="gtk_recent_chooser_add_filter">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="iter">
+          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="filter">
-          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="recent_chooser_remove_filter"
-              c:identifier="gtk_recent_chooser_remove_filter">
+    </callback>
+    <function name="file_system_model_path_do"
+              c:identifier="_gtk_file_system_model_path_do">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="model">
+          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
         </parameter>
-        <parameter name="filter">
-          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+        <parameter name="path">
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_list_filters"
-              c:identifier="gtk_recent_chooser_list_filters">
-      <return-value>
-        <type name="GSList*" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="func">
+          <type name="GtkFileSystemModelPathFunc"
+                c:type="GtkFileSystemModelPathFunc"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_set_filter"
-              c:identifier="gtk_recent_chooser_set_filter">
+    <function name="file_system_model_add_editable"
+              c:identifier="_gtk_file_system_model_add_editable">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="model">
+          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
         </parameter>
-        <parameter name="filter">
-          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="recent_chooser_get_filter"
-              c:identifier="gtk_recent_chooser_get_filter">
+    <function name="file_system_model_remove_editable"
+              c:identifier="_gtk_file_system_model_remove_editable">
       <return-value>
-        <type name="GtkRecentFilter*" c:type="GtkRecentFilter*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="model">
+          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkRecentChooserDialogPrivate"
-              c:type="GtkRecentChooserDialogPrivate"/>
-    <class name="RecentChooserDialog"
-           c:type="GtkRecentChooserDialog"
-           parent="Dialog"
-           glib:type-name="GtkRecentChooserDialog"
-           glib:get-type="gtk_recent_chooser_dialog_get_type">
-    </class>
-    <function name="recent_chooser_dialog_new"
-              c:identifier="gtk_recent_chooser_dialog_new">
+    <record name="GtkRecentData" c:type="GtkRecentData">
+      <field name="display_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="description">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="mime_type">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="app_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="app_exec">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="groups">
+        <type name="gchar**" c:type="gchar**"/>
+      </field>
+      <field name="is_private">
+        <type name="boolean" c:type="gboolean"/>
+      </field>
+    </record>
+    <record name="GtkRecentManagerPrivate" c:type="GtkRecentManagerPrivate"/>
+    <function name="recent_manager_error_quark"
+              c:identifier="gtk_recent_manager_error_quark">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="GQuark" c:type="GQuark"/>
       </return-value>
-      <parameters>
-        <parameter name="title">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="first_button_text">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="recent_chooser_dialog_new_for_manager"
-              c:identifier="gtk_recent_chooser_dialog_new_for_manager">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="title">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="manager">
+    <class name="RecentManager"
+           c:type="GtkRecentManager"
+           parent="GLib.Object"
+           glib:type-name="GtkRecentManager"
+           glib:get-type="gtk_recent_manager_get_type">
+      <constructor name="new" c:identifier="gtk_recent_manager_new">
+        <return-value>
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
+        </return-value>
+      </constructor>
+      <constructor name="get_default"
+                   c:identifier="gtk_recent_manager_get_default">
+        <return-value>
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
+        </return-value>
+      </constructor>
+      <constructor name="get_for_screen"
+                   c:identifier="gtk_recent_manager_get_for_screen">
+        <return-value>
           <type name="RecentManager" c:type="GtkRecentManager*"/>
-        </parameter>
-        <parameter name="first_button_text">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkRecentChooserMenuPrivate"
-              c:type="GtkRecentChooserMenuPrivate"/>
-    <class name="RecentChooserMenu"
-           c:type="GtkRecentChooserMenu"
-           parent="Menu"
-           glib:type-name="GtkRecentChooserMenu"
-           glib:get-type="gtk_recent_chooser_menu_get_type">
-      <method name="get_show_numbers"
-              c:identifier="gtk_recent_chooser_menu_get_show_numbers">
+        </return-value>
+        <parameters>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="set_screen" c:identifier="gtk_recent_manager_set_screen">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="RecentChooserMenu" c:type="GtkRecentChooserMenu*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          </parameter>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_numbers"
-              c:identifier="gtk_recent_chooser_menu_set_show_numbers">
+      <method name="add_item" c:identifier="gtk_recent_manager_add_item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="RecentChooserMenu" c:type="GtkRecentChooserMenu*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
-          <parameter name="show_numbers">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="show-numbers">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <callback name="gtk_recent1">
+      <method name="add_full" c:identifier="gtk_recent_manager_add_full">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-      <callback name="gtk_recent2">
+        <parameters>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="recent_data">
+            <type name="GtkRecentData" c:type="GtkRecentData*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_item" c:identifier="gtk_recent_manager_remove_item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-      <callback name="gtk_recent3">
+        <parameters>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="lookup_item" c:identifier="gtk_recent_manager_lookup_item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkRecentInfo" c:type="GtkRecentInfo*"/>
         </return-value>
-      </callback>
-      <callback name="gtk_recent4">
+        <parameters>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="has_item" c:identifier="gtk_recent_manager_has_item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-    </class>
-    <function name="recent_chooser_menu_new"
-              c:identifier="gtk_recent_chooser_menu_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="recent_chooser_menu_new_for_manager"
-              c:identifier="gtk_recent_chooser_menu_new_for_manager">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="manager">
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkRecentChooserWidgetPrivate"
-              c:type="GtkRecentChooserWidgetPrivate"/>
-    <class name="RecentChooserWidget"
-           c:type="GtkRecentChooserWidget"
-           parent="VBox"
-           glib:type-name="GtkRecentChooserWidget"
-           glib:get-type="gtk_recent_chooser_widget_get_type">
-    </class>
-    <function name="recent_chooser_widget_new"
-              c:identifier="gtk_recent_chooser_widget_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="recent_chooser_widget_new_for_manager"
-              c:identifier="gtk_recent_chooser_widget_new_for_manager">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="manager">
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkScaleButtonPrivate" c:type="GtkScaleButtonPrivate"/>
-    <class name="ScaleButton"
-           c:type="GtkScaleButton"
-           parent="Button"
-           glib:type-name="GtkScaleButton"
-           glib:get-type="gtk_scale_button_get_type">
-      <method name="set_icons" c:identifier="gtk_scale_button_set_icons">
+        <parameters>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="move_item" c:identifier="gtk_recent_manager_move_item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
-          <parameter name="icons">
-            <type name="gchar" c:type="gchar**"/>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="new_uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_value" c:identifier="gtk_scale_button_get_value">
+      <method name="set_limit" c:identifier="gtk_recent_manager_set_limit">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          </parameter>
+          <parameter name="limit">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_value" c:identifier="gtk_scale_button_set_value">
+      <method name="get_limit" c:identifier="gtk_recent_manager_get_limit">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_adjustment"
-              c:identifier="gtk_scale_button_get_adjustment">
+      <method name="get_items" c:identifier="gtk_recent_manager_get_items">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="GList" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_adjustment"
-              c:identifier="gtk_scale_button_set_adjustment">
+      <method name="purge_items" c:identifier="gtk_recent_manager_purge_items">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <property name="value">
-        <type name="gdouble" c:type="gdouble"/>
-      </property>
-      <property name="size">
-        <type name="GtkIconSize" c:type="GtkIconSize"/>
+      <property name="filename">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <property name="adjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+      <property name="limit">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="icons">
-        <type name="GStrv" c:type="GStrv"/>
+      <property name="size">
+        <type name="int32" c:type="gint"/>
       </property>
-      <callback name="value_changed">
+      <callback name="changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="GtkScaleButton*" c:type="GtkScaleButton*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="manager">
+            <type name="GtkRecentManager*" c:type="GtkRecentManager*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="_gtk_recent1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="_gtk_recent2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="_gtk_recent3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="_gtk_recent4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="value-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="popup">
+      <glib:signal name="changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="popdown">
+    </class>
+    <glib:boxed c:type="RecentInfo"
+                glib:name="RecentInfo"
+                glib:type-name="GtkRecentInfo"
+                glib:get-type="gtk_recent_info_get_type">
+      <constructor name="ref" c:identifier="gtk_recent_info_ref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="RecentInfo" c:type="GtkRecentInfo*"/>
         </return-value>
-      </glib:signal>
-    </class>
-    <function name="scale_button_new" c:identifier="gtk_scale_button_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="size">
-          <type name="IconSize" c:type="GtkIconSize"/>
-        </parameter>
-        <parameter name="min">
-          <type name="gdouble" c:type="gdouble"/>
-        </parameter>
-        <parameter name="max">
-          <type name="gdouble" c:type="gdouble"/>
-        </parameter>
-        <parameter name="step">
-          <type name="gdouble" c:type="gdouble"/>
-        </parameter>
-        <parameter name="icons">
-          <type name="gchar" c:type="gchar**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="VScrollbar"
-           c:type="GtkVScrollbar"
-           parent="Scrollbar"
-           glib:type-name="GtkVScrollbar"
-           glib:get-type="gtk_vscrollbar_get_type">
-    </class>
-    <function name="vscrollbar_new" c:identifier="gtk_vscrollbar_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="adjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Viewport"
-           c:type="GtkViewport"
-           parent="Bin"
-           glib:type-name="GtkViewport"
-           glib:get-type="gtk_viewport_get_type">
-      <method name="get_hadjustment"
-              c:identifier="gtk_viewport_get_hadjustment">
+        <parameters>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="unref" c:identifier="gtk_recent_info_unref">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_vadjustment"
-              c:identifier="gtk_viewport_get_vadjustment">
+      <method name="get_uri" c:identifier="gtk_recent_info_get_uri">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_hadjustment"
-              c:identifier="gtk_viewport_set_hadjustment">
+      <method name="get_display_name"
+              c:identifier="gtk_recent_info_get_display_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
-          </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_vadjustment"
-              c:identifier="gtk_viewport_set_vadjustment">
+      <method name="get_description"
+              c:identifier="gtk_recent_info_get_description">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
-          </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_shadow_type"
-              c:identifier="gtk_viewport_set_shadow_type">
+      <method name="get_mime_type"
+              c:identifier="gtk_recent_info_get_mime_type">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="ShadowType" c:type="GtkShadowType"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_shadow_type"
-              c:identifier="gtk_viewport_get_shadow_type">
+      <method name="get_added" c:identifier="gtk_recent_info_get_added">
         <return-value>
-          <type name="ShadowType" c:type="GtkShadowType"/>
+          <type name="time_t" c:type="time_t"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="hadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="vadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="shadow-type">
-        <type name="GtkShadowType" c:type="GtkShadowType"/>
-      </property>
-      <callback name="set_scroll_adjustments">
+      <method name="get_modified" c:identifier="gtk_recent_info_get_modified">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="time_t" c:type="time_t"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="GtkViewport*" c:type="GtkViewport*"/>
-          </parameter>
-          <parameter name="hadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
-          </parameter>
-          <parameter name="vadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
-      </callback>
-      <glib:signal name="set-scroll-adjustments">
+      </method>
+      <method name="get_visited" c:identifier="gtk_recent_info_get_visited">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="time_t" c:type="time_t"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="viewport_new" c:identifier="gtk_viewport_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="hadjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </parameter>
-        <parameter name="vadjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="ScrolledWindow"
-           c:type="GtkScrolledWindow"
-           parent="Bin"
-           glib:type-name="GtkScrolledWindow"
-           glib:get-type="gtk_scrolled_window_get_type">
-      <method name="set_hadjustment"
-              c:identifier="gtk_scrolled_window_set_hadjustment">
+      </method>
+      <method name="get_private_hint"
+              c:identifier="gtk_recent_info_get_private_hint">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
-          </parameter>
-          <parameter name="hadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_vadjustment"
-              c:identifier="gtk_scrolled_window_set_vadjustment">
+      <method name="get_application_info"
+              c:identifier="gtk_recent_info_get_application_info">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
-          <parameter name="vadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="app_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="app_exec">
+            <type name="gchar" c:type="gchar**"/>
+          </parameter>
+          <parameter name="count">
+            <type name="guint" c:type="guint*"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="time_t" c:type="time_t*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_hadjustment"
-              c:identifier="gtk_scrolled_window_get_hadjustment">
+      <method name="get_applications"
+              c:identifier="gtk_recent_info_get_applications">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="gchar" c:type="gchar**"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="gsize" c:type="gsize*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_vadjustment"
-              c:identifier="gtk_scrolled_window_get_vadjustment">
+      <method name="last_application"
+              c:identifier="gtk_recent_info_last_application">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_hscrollbar"
-              c:identifier="gtk_scrolled_window_get_hscrollbar">
+      <method name="has_application"
+              c:identifier="gtk_recent_info_has_application">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+          <parameter name="app_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_vscrollbar"
-              c:identifier="gtk_scrolled_window_get_vscrollbar">
+      <method name="get_groups" c:identifier="gtk_recent_info_get_groups">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="gchar" c:type="gchar**"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="gsize" c:type="gsize*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_policy" c:identifier="gtk_scrolled_window_set_policy">
+      <method name="has_group" c:identifier="gtk_recent_info_has_group">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
-          </parameter>
-          <parameter name="hscrollbar_policy">
-            <type name="PolicyType" c:type="GtkPolicyType"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
-          <parameter name="vscrollbar_policy">
-            <type name="PolicyType" c:type="GtkPolicyType"/>
+          <parameter name="group_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_policy" c:identifier="gtk_scrolled_window_get_policy">
+      <method name="get_icon" c:identifier="gtk_recent_info_get_icon">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
-          </parameter>
-          <parameter name="hscrollbar_policy">
-            <type name="PolicyType" c:type="GtkPolicyType*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
-          <parameter name="vscrollbar_policy">
-            <type name="PolicyType" c:type="GtkPolicyType*"/>
+          <parameter name="size">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_placement"
-              c:identifier="gtk_scrolled_window_set_placement">
+      <method name="get_short_name"
+              c:identifier="gtk_recent_info_get_short_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
-          </parameter>
-          <parameter name="window_placement">
-            <type name="CornerType" c:type="GtkCornerType"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unset_placement"
-              c:identifier="gtk_scrolled_window_unset_placement">
+      <method name="get_uri_display"
+              c:identifier="gtk_recent_info_get_uri_display">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_placement"
-              c:identifier="gtk_scrolled_window_get_placement">
+      <method name="get_age" c:identifier="gtk_recent_info_get_age">
         <return-value>
-          <type name="CornerType" c:type="GtkCornerType"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_shadow_type"
-              c:identifier="gtk_scrolled_window_set_shadow_type">
+      <method name="is_local" c:identifier="gtk_recent_info_is_local">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="ShadowType" c:type="GtkShadowType"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_shadow_type"
-              c:identifier="gtk_scrolled_window_get_shadow_type">
+      <method name="exists" c:identifier="gtk_recent_info_exists">
         <return-value>
-          <type name="ShadowType" c:type="GtkShadowType"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_with_viewport"
-              c:identifier="gtk_scrolled_window_add_with_viewport">
+      <method name="match" c:identifier="gtk_recent_info_match">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="info_a">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="info_b">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="hadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="vadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="hscrollbar-policy">
-        <type name="GtkPolicyType" c:type="GtkPolicyType"/>
-      </property>
-      <property name="vscrollbar-policy">
-        <type name="GtkPolicyType" c:type="GtkPolicyType"/>
-      </property>
-      <property name="window-placement">
-        <type name="GtkCornerType" c:type="GtkCornerType"/>
-      </property>
-      <property name="window-placement-set">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="shadow-type">
-        <type name="GtkShadowType" c:type="GtkShadowType"/>
-      </property>
-      <field name="scrollbar_spacing">
-        <type name="gint" c:type="gint"/>
+    </glib:boxed>
+    <function name="recent_manager_sync"
+              c:identifier="_gtk_recent_manager_sync">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <record name="GtkQuery" c:type="GtkQuery">
+      <field name="parent">
+        <type name="GObject" c:type="GObject"/>
       </field>
-      <callback name="scroll_child">
+      <field name="priv">
+        <type name="GtkQueryPrivate*" c:type="GtkQueryPrivate*"/>
+      </field>
+    </record>
+    <record name="GtkQueryPrivate" c:type="GtkQueryPrivate"/>
+    <function name="query_get_type" c:identifier="_gtk_query_get_type">
+      <return-value>
+        <type name="GType" c:type="GType"/>
+      </return-value>
+    </function>
+    <function name="query_enabled" c:identifier="_gtk_query_enabled">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+    </function>
+    <function name="query_new" c:identifier="_gtk_query_new">
+      <return-value>
+        <type name="GtkQuery*" c:type="GtkQuery*"/>
+      </return-value>
+    </function>
+    <function name="query_get_text" c:identifier="_gtk_query_get_text">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="query">
+          <type name="GtkQuery" c:type="GtkQuery*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="query_set_text" c:identifier="_gtk_query_set_text">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="query">
+          <type name="GtkQuery" c:type="GtkQuery*"/>
+        </parameter>
+        <parameter name="text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="query_get_location" c:identifier="_gtk_query_get_location">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="query">
+          <type name="GtkQuery" c:type="GtkQuery*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="query_set_location" c:identifier="_gtk_query_set_location">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="query">
+          <type name="GtkQuery" c:type="GtkQuery*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="query_get_mime_types"
+              c:identifier="_gtk_query_get_mime_types">
+      <return-value>
+        <type name="GList*" c:type="GList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="query">
+          <type name="GtkQuery" c:type="GtkQuery*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="query_set_mime_types"
+              c:identifier="_gtk_query_set_mime_types">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="query">
+          <type name="GtkQuery" c:type="GtkQuery*"/>
+        </parameter>
+        <parameter name="mime_types">
+          <type name="GList" c:type="GList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="query_add_mime_type"
+              c:identifier="_gtk_query_add_mime_type">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="query">
+          <type name="GtkQuery" c:type="GtkQuery*"/>
+        </parameter>
+        <parameter name="mime_type">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkSearchEngine" c:type="GtkSearchEngine">
+      <field name="parent">
+        <type name="GObject" c:type="GObject"/>
+      </field>
+      <field name="priv">
+        <type name="GtkSearchEnginePrivate*" c:type="GtkSearchEnginePrivate*"/>
+      </field>
+      <callback name="set_query">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="GtkScrolledWindow*" c:type="GtkScrolledWindow*"/>
-          </parameter>
-          <parameter name="scroll">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          <parameter name="engine">
+            <type name="GtkSearchEngine*" c:type="GtkSearchEngine*"/>
           </parameter>
-          <parameter name="horizontal">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="query">
+            <type name="GtkQuery*" c:type="GtkQuery*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="move_focus_out">
+      <callback name="start">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="GtkScrolledWindow*" c:type="GtkScrolledWindow*"/>
-          </parameter>
-          <parameter name="direction">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+          <parameter name="engine">
+            <type name="GtkSearchEngine*" c:type="GtkSearchEngine*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="stop">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="engine">
+            <type name="GtkSearchEngine*" c:type="GtkSearchEngine*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="is_indexed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <parameter name="engine">
+            <type name="GtkSearchEngine*" c:type="GtkSearchEngine*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="hits_added">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="engine">
+            <type name="GtkSearchEngine*" c:type="GtkSearchEngine*"/>
+          </parameter>
+          <parameter name="hits">
+            <type name="GList*" c:type="GList*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="hits_subtracted">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="engine">
+            <type name="GtkSearchEngine*" c:type="GtkSearchEngine*"/>
+          </parameter>
+          <parameter name="hits">
+            <type name="GList*" c:type="GList*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <glib:signal name="move-focus-out">
+      <callback name="finished">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+          <parameter name="engine">
+            <type name="GtkSearchEngine*" c:type="GtkSearchEngine*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="scroll-child">
+      </callback>
+      <callback name="error">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          <parameter name="engine">
+            <type name="GtkSearchEngine*" c:type="GtkSearchEngine*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="error_message">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="scrolled_window_new" c:identifier="gtk_scrolled_window_new">
+      </callback>
+    </record>
+    <record name="GtkSearchEnginePrivate" c:type="GtkSearchEnginePrivate"/>
+    <function name="search_engine_get_type"
+              c:identifier="_gtk_search_engine_get_type">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="GType" c:type="GType"/>
+      </return-value>
+    </function>
+    <function name="search_engine_enabled"
+              c:identifier="_gtk_search_engine_enabled">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+    </function>
+    <function name="search_engine_new" c:identifier="_gtk_search_engine_new">
+      <return-value>
+        <type name="GtkSearchEngine*" c:type="GtkSearchEngine*"/>
+      </return-value>
+    </function>
+    <function name="search_engine_set_query"
+              c:identifier="_gtk_search_engine_set_query">
+      <return-value>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="hadjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="engine">
+          <type name="GtkSearchEngine" c:type="GtkSearchEngine*"/>
         </parameter>
-        <parameter name="vadjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="query">
+          <type name="GtkQuery" c:type="GtkQuery*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="scrolled_window_get_scrollbar_spacing"
-              c:identifier="_gtk_scrolled_window_get_scrollbar_spacing">
+    <function name="search_engine_start"
+              c:identifier="_gtk_search_engine_start">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="scrolled_window">
-          <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+        <parameter name="engine">
+          <type name="GtkSearchEngine" c:type="GtkSearchEngine*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="SeparatorMenuItem"
-           c:type="GtkSeparatorMenuItem"
-           parent="MenuItem"
-           glib:type-name="GtkSeparatorMenuItem"
-           glib:get-type="gtk_separator_menu_item_get_type">
-    </class>
-    <function name="separator_menu_item_new"
-              c:identifier="gtk_separator_menu_item_new">
+    <function name="search_engine_stop" c:identifier="_gtk_search_engine_stop">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="engine">
+          <type name="GtkSearchEngine" c:type="GtkSearchEngine*"/>
+        </parameter>
+      </parameters>
     </function>
-    <record name="GtkSeparatorToolItemPrivate"
-              c:type="GtkSeparatorToolItemPrivate"/>
-    <class name="SeparatorToolItem"
-           c:type="GtkSeparatorToolItem"
-           parent="ToolItem"
-           glib:type-name="GtkSeparatorToolItem"
-           glib:get-type="gtk_separator_tool_item_get_type">
-      <method name="get_draw" c:identifier="gtk_separator_tool_item_get_draw">
+    <function name="search_engine_is_indexed"
+              c:identifier="_gtk_search_engine_is_indexed">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="engine">
+          <type name="GtkSearchEngine" c:type="GtkSearchEngine*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="search_engine_hits_added"
+              c:identifier="_gtk_search_engine_hits_added">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="engine">
+          <type name="GtkSearchEngine" c:type="GtkSearchEngine*"/>
+        </parameter>
+        <parameter name="hits">
+          <type name="GList" c:type="GList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="search_engine_hits_subtracted"
+              c:identifier="_gtk_search_engine_hits_subtracted">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="engine">
+          <type name="GtkSearchEngine" c:type="GtkSearchEngine*"/>
+        </parameter>
+        <parameter name="hits">
+          <type name="GList" c:type="GList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="search_engine_finished"
+              c:identifier="_gtk_search_engine_finished">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="engine">
+          <type name="GtkSearchEngine" c:type="GtkSearchEngine*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="search_engine_error"
+              c:identifier="_gtk_search_engine_error">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="engine">
+          <type name="GtkSearchEngine" c:type="GtkSearchEngine*"/>
+        </parameter>
+        <parameter name="error_message">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkTooltipsData" c:type="GtkTooltipsData">
+      <field name="tooltips">
+        <type name="GtkTooltips*" c:type="GtkTooltips*"/>
+      </field>
+      <field name="widget">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="tip_text">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="tip_private">
+        <type name="string" c:type="gchar*"/>
+      </field>
+    </record>
+    <class name="Tooltips"
+           c:type="GtkTooltips"
+           parent="GtkObject"
+           glib:type-name="GtkTooltips"
+           glib:get-type="gtk_tooltips_get_type">
+      <constructor name="new" c:identifier="gtk_tooltips_new">
+        <return-value>
+          <type name="Tooltips" c:type="GtkTooltips*"/>
+        </return-value>
+      </constructor>
+      <method name="enable" c:identifier="gtk_tooltips_enable">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="item">
-            <type name="SeparatorToolItem" c:type="GtkSeparatorToolItem*"/>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_draw" c:identifier="gtk_separator_tool_item_set_draw">
+      <method name="disable" c:identifier="gtk_tooltips_disable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="item">
-            <type name="SeparatorToolItem" c:type="GtkSeparatorToolItem*"/>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
           </parameter>
-          <parameter name="draw">
-            <type name="gboolean" c:type="gboolean"/>
+        </parameters>
+      </method>
+      <method name="set_delay" c:identifier="gtk_tooltips_set_delay">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
+          </parameter>
+          <parameter name="delay">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_tip" c:identifier="gtk_tooltips_set_tip">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tip_text" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="tip_private" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="force_window" c:identifier="gtk_tooltips_force_window">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="draw">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
-    <function name="separator_tool_item_new"
-              c:identifier="gtk_separator_tool_item_new">
+    <function name="tooltips_data_get" c:identifier="gtk_tooltips_data_get">
       <return-value>
-        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+        <type name="GtkTooltipsData*" c:type="GtkTooltipsData*"/>
       </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="show_uri" c:identifier="gtk_show_uri">
+    <function name="tooltips_get_info_from_tip_window"
+              c:identifier="gtk_tooltips_get_info_from_tip_window">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="screen">
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="tip_window">
+          <type name="Window" c:type="GtkWindow*"/>
         </parameter>
-        <parameter name="timestamp">
-          <type name="guint32" c:type="guint32"/>
+        <parameter name="tooltips">
+          <type name="Tooltips" c:type="GtkTooltips**"/>
         </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+        <parameter name="current_widget">
+          <type name="Widget" c:type="GtkWidget**"/>
         </parameter>
       </parameters>
     </function>
-    <class name="SizeGroup"
-           c:type="GtkSizeGroup"
+    <class name="TreeModelSort"
+           c:type="GtkTreeModelSort"
            parent="GLib.Object"
-           glib:type-name="GtkSizeGroup"
-           glib:get-type="gtk_size_group_get_type">
-      <constructor name="new" c:identifier="gtk_size_group_new">
+           glib:type-name="GtkTreeModelSort"
+           glib:get-type="gtk_tree_model_sort_get_type">
+      <method name="get_model" c:identifier="gtk_tree_model_sort_get_model">
         <return-value>
-          <type name="SizeGroup" c:type="GtkSizeGroup*"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </return-value>
         <parameters>
-          <parameter name="mode">
-            <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
+          <parameter name="tree_model">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="set_mode" c:identifier="gtk_size_group_set_mode">
+      </method>
+      <method name="convert_child_path_to_path"
+              c:identifier="gtk_tree_model_sort_convert_child_path_to_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
           </parameter>
-          <parameter name="mode">
-            <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
+          <parameter name="child_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_mode" c:identifier="gtk_size_group_get_mode">
+      <method name="convert_child_iter_to_iter"
+              c:identifier="gtk_tree_model_sort_convert_child_iter_to_iter">
         <return-value>
-          <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          </parameter>
+          <parameter name="sort_iter" allow-none="1">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="child_iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_ignore_hidden"
-              c:identifier="gtk_size_group_set_ignore_hidden">
+      <method name="convert_path_to_child_path"
+              c:identifier="gtk_tree_model_sort_convert_path_to_child_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
           </parameter>
-          <parameter name="ignore_hidden">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="sorted_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_ignore_hidden"
-              c:identifier="gtk_size_group_get_ignore_hidden">
+      <method name="convert_iter_to_child_iter"
+              c:identifier="gtk_tree_model_sort_convert_iter_to_child_iter">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          </parameter>
+          <parameter name="child_iter" allow-none="1">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="sorted_iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_widget" c:identifier="gtk_size_group_add_widget">
+      <method name="reset_default_sort_func"
+              c:identifier="gtk_tree_model_sort_reset_default_sort_func">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_widget" c:identifier="gtk_size_group_remove_widget">
+      <method name="clear_cache"
+              c:identifier="gtk_tree_model_sort_clear_cache">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_widgets" c:identifier="gtk_size_group_get_widgets">
+      <method name="iter_is_valid"
+              c:identifier="gtk_tree_model_sort_iter_is_valid">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="mode">
-        <type name="GtkSizeGroupMode" c:type="GtkSizeGroupMode"/>
-      </property>
-      <property name="ignore-hidden">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="model">
+        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
       </property>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
-    <function name="size_group_get_child_requisition"
-              c:identifier="_gtk_size_group_get_child_requisition">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="requisition">
-          <type name="Requisition" c:type="GtkRequisition*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="size_group_compute_requisition"
-              c:identifier="_gtk_size_group_compute_requisition">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="requisition">
-          <type name="Requisition" c:type="GtkRequisition*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="size_group_queue_resize"
-              c:identifier="_gtk_size_group_queue_resize">
+    <function name="tree_model_sort_new_with_model"
+              c:identifier="gtk_tree_model_sort_new_with_model">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="child_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="SpinButton"
-           c:type="GtkSpinButton"
-           parent="Entry"
-           glib:type-name="GtkSpinButton"
-           glib:get-type="gtk_spin_button_get_type">
-      <method name="configure" c:identifier="gtk_spin_button_configure">
+    <class name="TreeStore"
+           c:type="GtkTreeStore"
+           parent="GLib.Object"
+           glib:type-name="GtkTreeStore"
+           glib:get-type="gtk_tree_store_get_type">
+      <constructor name="new" c:identifier="gtk_tree_store_new">
+        <return-value>
+          <type name="TreeStore" c:type="GtkTreeStore*"/>
+        </return-value>
+        <parameters>
+          <parameter name="n_columns">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="newv" c:identifier="gtk_tree_store_newv">
+        <return-value>
+          <type name="TreeStore" c:type="GtkTreeStore*"/>
+        </return-value>
+        <parameters>
+          <parameter name="n_columns">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="types">
+            <type name="GType" c:type="GType*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="set_column_types"
+              c:identifier="gtk_tree_store_set_column_types">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="climb_rate">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="n_columns">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="digits">
-            <type name="guint" c:type="guint"/>
+          <parameter name="types">
+            <type name="GType" c:type="GType*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_adjustment"
-              c:identifier="gtk_spin_button_set_adjustment">
+      <method name="set_value" c:identifier="gtk_tree_store_set_value">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_adjustment"
-              c:identifier="gtk_spin_button_get_adjustment">
+      <method name="set" c:identifier="gtk_tree_store_set">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_digits" c:identifier="gtk_spin_button_set_digits">
+      <method name="set_valuesv" c:identifier="gtk_tree_store_set_valuesv">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="digits">
-            <type name="guint" c:type="guint"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="columns">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="values">
+            <type name="GValue" c:type="GValue*"/>
+          </parameter>
+          <parameter name="n_values">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_digits" c:identifier="gtk_spin_button_get_digits">
+      <method name="set_valist" c:identifier="gtk_tree_store_set_valist">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="var_args">
+            <type name="va_list" c:type="va_list"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_increments"
-              c:identifier="gtk_spin_button_set_increments">
+      <method name="remove" c:identifier="gtk_tree_store_remove">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="step">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="page">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_increments"
-              c:identifier="gtk_spin_button_get_increments">
+      <method name="insert" c:identifier="gtk_tree_store_insert">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="step">
-            <type name="gdouble" c:type="gdouble*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="page">
-            <type name="gdouble" c:type="gdouble*"/>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_range" c:identifier="gtk_spin_button_set_range">
+      <method name="insert_before" c:identifier="gtk_tree_store_insert_before">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="min">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="max">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="sibling">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_range" c:identifier="gtk_spin_button_get_range">
+      <method name="insert_after" c:identifier="gtk_tree_store_insert_after">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="min">
-            <type name="gdouble" c:type="gdouble*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="max">
-            <type name="gdouble" c:type="gdouble*"/>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="sibling">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_value" c:identifier="gtk_spin_button_get_value">
+      <method name="insert_with_values"
+              c:identifier="gtk_tree_store_insert_with_values">
         <return-value>
-          <type name="gdouble" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_value_as_int"
-              c:identifier="gtk_spin_button_get_value_as_int">
+      <method name="insert_with_valuesv"
+              c:identifier="gtk_tree_store_insert_with_valuesv">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="columns">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="values">
+            <type name="GValue" c:type="GValue*"/>
+          </parameter>
+          <parameter name="n_values">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_value" c:identifier="gtk_spin_button_set_value">
+      <method name="prepend" c:identifier="gtk_tree_store_prepend">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="value">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_update_policy"
-              c:identifier="gtk_spin_button_set_update_policy">
+      <method name="append" c:identifier="gtk_tree_store_append">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="policy">
-            <type name="SpinButtonUpdatePolicy"
-                    c:type="GtkSpinButtonUpdatePolicy"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_update_policy"
-              c:identifier="gtk_spin_button_get_update_policy">
+      <method name="is_ancestor" c:identifier="gtk_tree_store_is_ancestor">
         <return-value>
-          <type name="SpinButtonUpdatePolicy"
-                  c:type="GtkSpinButtonUpdatePolicy"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="descendant">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_numeric" c:identifier="gtk_spin_button_set_numeric">
+      <method name="iter_depth" c:identifier="gtk_tree_store_iter_depth">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="numeric">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_numeric" c:identifier="gtk_spin_button_get_numeric">
+      <method name="clear" c:identifier="gtk_tree_store_clear">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="spin" c:identifier="gtk_spin_button_spin">
+      <method name="iter_is_valid" c:identifier="gtk_tree_store_iter_is_valid">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="direction">
-            <type name="SpinType" c:type="GtkSpinType"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="increment">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_wrap" c:identifier="gtk_spin_button_set_wrap">
+      <method name="reorder" c:identifier="gtk_tree_store_reorder">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="wrap">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="new_order">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_wrap" c:identifier="gtk_spin_button_get_wrap">
+      <method name="swap" c:identifier="gtk_tree_store_swap">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          </parameter>
+          <parameter name="a">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="b">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_snap_to_ticks"
-              c:identifier="gtk_spin_button_set_snap_to_ticks">
+      <method name="move_before" c:identifier="gtk_tree_store_move_before">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="snap_to_ticks">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="position" allow-none="1">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_snap_to_ticks"
-              c:identifier="gtk_spin_button_get_snap_to_ticks">
+      <method name="move_after" c:identifier="gtk_tree_store_move_after">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="position" allow-none="1">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="update" c:identifier="gtk_spin_button_update">
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="adjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="climb-rate">
-        <type name="gdouble" c:type="gdouble"/>
-      </property>
-      <property name="digits">
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="file_chooser_get_file_system"
+              c:identifier="_gtk_file_chooser_get_file_system">
+      <return-value>
+        <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_current_folder_path"
+              c:identifier="_gtk_file_chooser_set_current_folder_path">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="FilePath" c:type="GtkFilePath*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_current_folder_path"
+              c:identifier="_gtk_file_chooser_get_current_folder_path">
+      <return-value>
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_select_path"
+              c:identifier="_gtk_file_chooser_select_path">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="FilePath" c:type="GtkFilePath*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_unselect_path"
+              c:identifier="_gtk_file_chooser_unselect_path">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="FilePath" c:type="GtkFilePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_paths"
+              c:identifier="_gtk_file_chooser_get_paths">
+      <return-value>
+        <type name="GSList*" c:type="GSList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_preview_path"
+              c:identifier="_gtk_file_chooser_get_preview_path">
+      <return-value>
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkFileChooserWidgetPrivate"
+            c:type="_GtkFileChooserWidgetPrivate"/>
+    <enumeration name="loadstate" c:type="LoadState">
+      <member name="empty" value="0" c:identifier="LOAD_EMPTY"/>
+      <member name="preload" value="1" c:identifier="LOAD_PRELOAD"/>
+      <member name="loading" value="2" c:identifier="LOAD_LOADING"/>
+      <member name="finished" value="3" c:identifier="LOAD_FINISHED"/>
+    </enumeration>
+    <enumeration name="reloadstate" c:type="ReloadState">
+      <member name="empty" value="0" c:identifier="RELOAD_EMPTY"/>
+      <member name="has_folder" value="1" c:identifier="RELOAD_HAS_FOLDER"/>
+      <member name="was_unmapped"
+              value="2"
+              c:identifier="RELOAD_WAS_UNMAPPED"/>
+    </enumeration>
+    <enumeration name="locationmode" c:type="LocationMode">
+      <member name="e_path_bar"
+              value="0"
+              c:identifier="LOCATION_MODE_PATH_BAR"/>
+      <member name="e_filename_entry"
+              value="1"
+              c:identifier="LOCATION_MODE_FILENAME_ENTRY"/>
+    </enumeration>
+    <enumeration name="operationmode" c:type="OperationMode">
+      <member name="e_browse" value="0" c:identifier="OPERATION_MODE_BROWSE"/>
+      <member name="e_search" value="1" c:identifier="OPERATION_MODE_SEARCH"/>
+      <member name="e_recent" value="2" c:identifier="OPERATION_MODE_RECENT"/>
+    </enumeration>
+    <record name="GtkFileChooserDefault" c:type="_GtkFileChooserDefault">
+      <field name="parent_instance">
+        <type name="GtkVBox" c:type="GtkVBox"/>
+      </field>
+      <field name="action">
+        <type name="GtkFileChooserAction" c:type="GtkFileChooserAction"/>
+      </field>
+      <field name="file_system">
+        <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+      </field>
+      <field name="save_widgets">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="save_folder_label">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="save_folder_combo">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="save_expander">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="browse_widgets">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="browse_shortcuts_tree_view">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="browse_shortcuts_add_button">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="browse_shortcuts_remove_button">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="browse_shortcuts_popup_menu">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="browse_shortcuts_popup_menu_remove_item">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="browse_shortcuts_popup_menu_rename_item">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="browse_files_tree_view">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="browse_files_popup_menu">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="browse_files_popup_menu_add_shortcut_item">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="browse_files_popup_menu_hidden_files_item">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="browse_new_folder_button">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="browse_path_bar_hbox">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="browse_path_bar">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="browse_files_model">
+        <type name="GtkFileSystemModel*" c:type="GtkFileSystemModel*"/>
+      </field>
+      <field name="browse_files_last_selected_name">
+        <type name="string" c:type="char*"/>
+      </field>
+      <field name="search_hbox">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="search_entry">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="search_engine">
+        <type name="GtkSearchEngine*" c:type="GtkSearchEngine*"/>
+      </field>
+      <field name="search_query">
+        <type name="GtkQuery*" c:type="GtkQuery*"/>
+      </field>
+      <field name="search_model">
+        <type name="GtkListStore*" c:type="GtkListStore*"/>
+      </field>
+      <field name="search_model_filter">
+        <type name="GtkTreeModelFilter*" c:type="GtkTreeModelFilter*"/>
+      </field>
+      <field name="search_model_sort">
+        <type name="GtkTreeModelSort*" c:type="GtkTreeModelSort*"/>
+      </field>
+      <field name="recent_manager">
+        <type name="GtkRecentManager*" c:type="GtkRecentManager*"/>
+      </field>
+      <field name="recent_model">
+        <type name="GtkListStore*" c:type="GtkListStore*"/>
+      </field>
+      <field name="load_recent_id">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="recent_model_filter">
+        <type name="GtkTreeModelFilter*" c:type="GtkTreeModelFilter*"/>
+      </field>
+      <field name="recent_model_sort">
+        <type name="GtkTreeModelSort*" c:type="GtkTreeModelSort*"/>
+      </field>
+      <field name="filter_combo_hbox">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="filter_combo">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="preview_box">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="preview_label">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="preview_widget">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="extra_align">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="extra_widget">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="location_button">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="location_entry_box">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="location_label">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="location_entry">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="location_mode">
+        <type name="LocationMode" c:type="LocationMode"/>
+      </field>
+      <field name="shortcuts_model">
+        <type name="GtkListStore*" c:type="GtkListStore*"/>
+      </field>
+      <field name="shortcuts_pane_filter_model">
+        <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+      </field>
+      <field name="shortcuts_combo_filter_model">
+        <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+      </field>
+      <field name="sort_model">
+        <type name="GtkTreeModelSort*" c:type="GtkTreeModelSort*"/>
+      </field>
+      <field name="loading_shortcuts">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
+      <field name="reload_icon_handles">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
+      <field name="file_list_drag_data_received_handle">
+        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+      </field>
+      <field name="update_current_folder_handle">
+        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+      </field>
+      <field name="show_and_select_paths_handle">
+        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+      </field>
+      <field name="should_respond_get_info_handle">
+        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+      </field>
+      <field name="file_exists_get_info_handle">
+        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+      </field>
+      <field name="update_from_entry_handle">
+        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+      </field>
+      <field name="shortcuts_activate_iter_handle">
+        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+      </field>
+      <field name="pending_handles">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
+      <field name="load_state">
+        <type name="LoadState" c:type="LoadState"/>
+      </field>
+      <field name="reload_state">
+        <type name="ReloadState" c:type="ReloadState"/>
+      </field>
+      <field name="load_timeout_id">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="operation_mode">
+        <type name="OperationMode" c:type="OperationMode"/>
+      </field>
+      <field name="pending_select_paths">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
+      <field name="current_filter">
+        <type name="GtkFileFilter*" c:type="GtkFileFilter*"/>
+      </field>
+      <field name="filters">
+        <type name="GSList*" c:type="GSList*"/>
+      </field>
+      <field name="tooltips">
+        <type name="GtkTooltips*" c:type="GtkTooltips*"/>
+      </field>
+      <field name="num_volumes">
+        <type name="int32" c:type="int"/>
+      </field>
+      <field name="num_shortcuts">
+        <type name="int32" c:type="int"/>
+      </field>
+      <field name="num_bookmarks">
+        <type name="int32" c:type="int"/>
+      </field>
+      <field name="volumes_changed_id">
+        <type name="ulong" c:type="gulong"/>
+      </field>
+      <field name="bookmarks_changed_id">
+        <type name="ulong" c:type="gulong"/>
+      </field>
+      <field name="current_volume_path">
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+      </field>
+      <field name="current_folder">
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+      </field>
+      <field name="preview_path">
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+      </field>
+      <field name="preview_display_name">
+        <type name="string" c:type="char*"/>
+      </field>
+      <field name="list_name_column">
+        <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+      </field>
+      <field name="list_name_renderer">
+        <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+      </field>
+      <field name="list_mtime_column">
+        <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+      </field>
+      <field name="edited_idle">
+        <type name="GSource*" c:type="GSource*"/>
+      </field>
+      <field name="edited_new_text">
+        <type name="string" c:type="char*"/>
+      </field>
+      <field name="settings_signal_id">
+        <type name="ulong" c:type="gulong"/>
+      </field>
+      <field name="icon_size">
+        <type name="int32" c:type="int"/>
+      </field>
+      <field name="toplevel_set_focus_id">
+        <type name="ulong" c:type="gulong"/>
+      </field>
+      <field name="toplevel_last_focus_widget">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="default_width">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="default_height">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="local_only">
         <type name="guint" c:type="guint"/>
-      </property>
-      <property name="snap-to-ticks">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="numeric">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="wrap">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="update-policy">
-        <type name="GtkSpinButtonUpdatePolicy"
-                c:type="GtkSpinButtonUpdatePolicy"/>
-      </property>
-      <property name="value">
-        <type name="gdouble" c:type="gdouble"/>
-      </property>
-      <callback name="input">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="spin_button">
-            <type name="GtkSpinButton*" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="new_value">
-            <type name="gdouble*" c:type="gdouble*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="output">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="spin_button">
-            <type name="GtkSpinButton*" c:type="GtkSpinButton*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="value_changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="spin_button">
-            <type name="GtkSpinButton*" c:type="GtkSpinButton*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="change_value">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="spin_button">
-            <type name="GtkSpinButton*" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="scroll">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="wrapped">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="spin_button">
-            <type name="GtkSpinButton*" c:type="GtkSpinButton*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="value-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="change-value">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="input">
-        <return-value>
-          <type name="gint" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="output">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="wrapped">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="spin_button_new" c:identifier="gtk_spin_button_new">
+      </field>
+      <field name="preview_widget_active">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="use_preview_label">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="select_multiple">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="show_hidden">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="do_overwrite_confirmation">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="list_sort_ascending">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="changing_folder">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="shortcuts_current_folder_active">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="expand_folders">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="has_home">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="has_desktop">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="has_search">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="has_recent">
+        <type name="guint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="FileModelNode" c:type="FileModelNode">
+      <field name="path">
+        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+      </field>
+      <field name="next">
+        <type name="FileModelNode*" c:type="FileModelNode*"/>
+      </field>
+      <field name="info">
+        <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
+      </field>
+      <field name="folder">
+        <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+      </field>
+      <field name="children">
+        <type name="FileModelNode*" c:type="FileModelNode*"/>
+      </field>
+      <field name="parent">
+        <type name="FileModelNode*" c:type="FileModelNode*"/>
+      </field>
+      <field name="model">
+        <type name="GtkFileSystemModel*" c:type="GtkFileSystemModel*"/>
+      </field>
+      <field name="ref_count">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="n_referenced_children">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="depth">
+        <type name="gushort" c:type="gushort"/>
+      </field>
+      <field name="has_dummy">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_dummy">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="is_visible">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="loaded">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="idle_clear">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="load_pending">
+        <type name="guint" c:type="guint"/>
+      </field>
+    </record>
+    <enumeration name="FileChooserProp" c:type="GtkFileChooserProp">
+      <member name="p_first"
+              value="4096"
+              c:identifier="GTK_FILE_CHOOSER_PROP_FIRST"/>
+      <member name="p_action"
+              value="4096"
+              c:identifier="GTK_FILE_CHOOSER_PROP_ACTION"/>
+      <member name="p_file_system_backend"
+              value="4097"
+              c:identifier="GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND"/>
+      <member name="p_filter"
+              value="4098"
+              c:identifier="GTK_FILE_CHOOSER_PROP_FILTER"/>
+      <member name="p_local_only"
+              value="4099"
+              c:identifier="GTK_FILE_CHOOSER_PROP_LOCAL_ONLY"/>
+      <member name="p_preview_widget"
+              value="4100"
+              c:identifier="GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET"/>
+      <member name="p_preview_widget_active"
+              value="4101"
+              c:identifier="GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE"/>
+      <member name="p_use_preview_label"
+              value="4102"
+              c:identifier="GTK_FILE_CHOOSER_PROP_USE_PREVIEW_LABEL"/>
+      <member name="p_extra_widget"
+              value="4103"
+              c:identifier="GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET"/>
+      <member name="p_select_multiple"
+              value="4104"
+              c:identifier="GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE"/>
+      <member name="p_show_hidden"
+              value="4105"
+              c:identifier="GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN"/>
+      <member name="p_do_overwrite_confirmation"
+              value="4106"
+              c:identifier="GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION"/>
+      <member name="p_last"
+              value="4106"
+              c:identifier="GTK_FILE_CHOOSER_PROP_LAST"/>
+    </enumeration>
+    <function name="file_chooser_install_properties"
+              c:identifier="_gtk_file_chooser_install_properties">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="adjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="klass">
+          <type name="GObjectClass" c:type="GObjectClass*"/>
         </parameter>
-        <parameter name="climb_rate">
-          <type name="gdouble" c:type="gdouble"/>
+      </parameters>
+    </function>
+    <function name="file_chooser_delegate_iface_init"
+              c:identifier="_gtk_file_chooser_delegate_iface_init">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="iface">
+          <type name="GtkFileChooserIface" c:type="GtkFileChooserIface*"/>
         </parameter>
-        <parameter name="digits">
-          <type name="guint" c:type="guint"/>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_delegate"
+              c:identifier="_gtk_file_chooser_set_delegate">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="receiver">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="delegate">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="spin_button_new_with_range"
-              c:identifier="gtk_spin_button_new_with_range">
+    <function name="file_chooser_delegate_get_quark"
+              c:identifier="_gtk_file_chooser_delegate_get_quark">
+      <return-value>
+        <type name="GQuark" c:type="GQuark"/>
+      </return-value>
+    </function>
+    <class name="FileChooserWidget"
+           c:type="GtkFileChooserWidget"
+           parent="VBox"
+           glib:type-name="GtkFileChooserWidget"
+           glib:get-type="gtk_file_chooser_widget_get_type">
+    </class>
+    <function name="file_chooser_widget_new"
+              c:identifier="gtk_file_chooser_widget_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="min">
-          <type name="gdouble" c:type="gdouble"/>
+        <parameter name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
         </parameter>
-        <parameter name="max">
-          <type name="gdouble" c:type="gdouble"/>
+      </parameters>
+    </function>
+    <function name="file_chooser_widget_new_with_backend"
+              c:identifier="gtk_file_chooser_widget_new_with_backend">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
         </parameter>
-        <parameter name="step">
-          <type name="gdouble" c:type="gdouble"/>
+        <parameter name="backend">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="Statusbar"
-           c:type="GtkStatusbar"
-           parent="HBox"
-           glib:type-name="GtkStatusbar"
-           glib:get-type="gtk_statusbar_get_type">
-      <method name="get_context_id" c:identifier="gtk_statusbar_get_context_id">
+    <class name="FileSelection"
+           c:type="GtkFileSelection"
+           parent="Dialog"
+           glib:type-name="GtkFileSelection"
+           glib:get-type="gtk_file_selection_get_type">
+      <method name="set_filename"
+              c:identifier="gtk_file_selection_set_filename">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
-          <parameter name="context_description">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="push" c:identifier="gtk_statusbar_push">
+      <method name="get_filename"
+              c:identifier="gtk_file_selection_get_filename">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
-          </parameter>
-          <parameter name="context_id">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="pop" c:identifier="gtk_statusbar_pop">
+      <method name="complete" c:identifier="gtk_file_selection_complete">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
-          <parameter name="context_id">
-            <type name="guint" c:type="guint"/>
+          <parameter name="pattern">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove" c:identifier="gtk_statusbar_remove">
+      <method name="show_fileop_buttons"
+              c:identifier="gtk_file_selection_show_fileop_buttons">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
-          </parameter>
-          <parameter name="context_id">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="message_id">
-            <type name="guint" c:type="guint"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_has_resize_grip"
-              c:identifier="gtk_statusbar_set_has_resize_grip">
+      <method name="hide_fileop_buttons"
+              c:identifier="gtk_file_selection_hide_fileop_buttons">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_has_resize_grip"
-              c:identifier="gtk_statusbar_get_has_resize_grip">
+      <method name="get_selections"
+              c:identifier="gtk_file_selection_get_selections">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="gchar" c:type="gchar**"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="has-resize-grip">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <field name="reserved">
-        <type name="gpointer" c:type="gpointer"/>
-      </field>
-      <callback name="text_pushed">
+      <method name="set_select_multiple"
+              c:identifier="gtk_file_selection_set_select_multiple">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="GtkStatusbar*" c:type="GtkStatusbar*"/>
-          </parameter>
-          <parameter name="context_id">
-            <type name="guint" c:type="guint"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
-          <parameter name="text">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="select_multiple">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="text_popped">
+      </method>
+      <method name="get_select_multiple"
+              c:identifier="gtk_file_selection_get_select_multiple">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="GtkStatusbar*" c:type="GtkStatusbar*"/>
-          </parameter>
-          <parameter name="context_id">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
         </parameters>
-      </callback>
+      </method>
+      <property name="show-fileops">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="filename">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="select-multiple">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="text-pushed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gchararray" c:type="gchararray"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="text-popped">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gchararray" c:type="gchararray"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
     </class>
-    <function name="statusbar_new" c:identifier="gtk_statusbar_new">
+    <function name="file_selection_new" c:identifier="gtk_file_selection_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
+      <parameters>
+        <parameter name="title">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
     </function>
-    <record name="GtkStatusIconPrivate" c:type="GtkStatusIconPrivate"/>
-    <class name="StatusIcon"
-           c:type="GtkStatusIcon"
-           parent="GLib.Object"
-           glib:type-name="GtkStatusIcon"
-           glib:get-type="gtk_status_icon_get_type">
-      <constructor name="new" c:identifier="gtk_status_icon_new">
-        <return-value>
-          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-        </return-value>
-      </constructor>
-      <constructor name="new_from_pixbuf"
-                   c:identifier="gtk_status_icon_new_from_pixbuf">
-        <return-value>
-          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-        </return-value>
-        <parameters>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="new_from_file"
-                   c:identifier="gtk_status_icon_new_from_file">
-        <return-value>
-          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-        </return-value>
-        <parameters>
-          <parameter name="filename">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="new_from_stock"
-                   c:identifier="gtk_status_icon_new_from_stock">
-        <return-value>
-          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-        </return-value>
-        <parameters>
-          <parameter name="stock_id">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="new_from_icon_name"
-                   c:identifier="gtk_status_icon_new_from_icon_name">
-        <return-value>
-          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="set_from_pixbuf"
-              c:identifier="gtk_status_icon_set_from_pixbuf">
+    <record name="GtkFixedChild" c:type="GtkFixedChild">
+      <field name="widget">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="x">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="y">
+        <type name="int32" c:type="gint"/>
+      </field>
+    </record>
+    <class name="Fixed"
+           c:type="GtkFixed"
+           parent="Container"
+           glib:type-name="GtkFixed"
+           glib:get-type="gtk_fixed_get_type">
+      <method name="put" c:identifier="gtk_fixed_put">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
           </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="set_from_file" c:identifier="gtk_status_icon_set_from_file">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="filename">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_from_stock"
-              c:identifier="gtk_status_icon_set_from_stock">
+      <method name="move" c:identifier="gtk_fixed_move">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-          </parameter>
-          <parameter name="stock_id">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="set_from_icon_name"
-              c:identifier="gtk_status_icon_set_from_icon_name">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="icon_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_storage_type"
-              c:identifier="gtk_status_icon_get_storage_type">
-        <return-value>
-          <type name="ImageType" c:type="GtkImageType"/>
-        </return-value>
-        <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_pixbuf" c:identifier="gtk_status_icon_get_pixbuf">
+      <method name="set_has_window" c:identifier="gtk_fixed_set_has_window">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
+          </parameter>
+          <parameter name="has_window">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_stock" c:identifier="gtk_status_icon_get_stock">
+      <method name="get_has_window" c:identifier="gtk_fixed_get_has_window">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_icon_name" c:identifier="gtk_status_icon_get_icon_name">
+    </class>
+    <function name="fixed_new" c:identifier="gtk_fixed_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <record name="GtkFontButtonPrivate" c:type="GtkFontButtonPrivate"/>
+    <class name="FontButton"
+           c:type="GtkFontButton"
+           parent="Button"
+           glib:type-name="GtkFontButton"
+           glib:get-type="gtk_font_button_get_type">
+      <method name="get_title" c:identifier="gtk_font_button_get_title">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size" c:identifier="gtk_status_icon_get_size">
+      <method name="set_title" c:identifier="gtk_font_button_set_title">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
+          </parameter>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_screen" c:identifier="gtk_status_icon_set_screen">
+      <method name="get_use_font" c:identifier="gtk_font_button_get_use_font">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_screen" c:identifier="gtk_status_icon_get_screen">
+      <method name="set_use_font" c:identifier="gtk_font_button_set_use_font">
         <return-value>
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
+          </parameter>
+          <parameter name="use_font">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip" c:identifier="gtk_status_icon_set_tooltip">
+      <method name="get_use_size" c:identifier="gtk_font_button_get_use_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_visible" c:identifier="gtk_status_icon_set_visible">
+      <method name="set_use_size" c:identifier="gtk_font_button_set_use_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="visible">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="use_size">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visible" c:identifier="gtk_status_icon_get_visible">
+      <method name="get_font_name"
+              c:identifier="gtk_font_button_get_font_name">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_blinking" c:identifier="gtk_status_icon_set_blinking">
+      <method name="set_font_name"
+              c:identifier="gtk_font_button_set_font_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="blinking">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="fontname">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_blinking" c:identifier="gtk_status_icon_get_blinking">
+      <method name="get_show_style"
+              c:identifier="gtk_font_button_get_show_style">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_embedded" c:identifier="gtk_status_icon_is_embedded">
+      <method name="set_show_style"
+              c:identifier="gtk_font_button_set_show_style">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
+          </parameter>
+          <parameter name="show_style">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_geometry" c:identifier="gtk_status_icon_get_geometry">
+      <method name="get_show_size"
+              c:identifier="gtk_font_button_get_show_size">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen**"/>
-          </parameter>
-          <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="orientation">
-            <type name="Orientation" c:type="GtkOrientation*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_x11_window_id"
-              c:identifier="gtk_status_icon_get_x11_window_id">
+      <method name="set_show_size"
+              c:identifier="gtk_font_button_set_show_size">
         <return-value>
-          <type name="guint32" c:type="guint32"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
+          </parameter>
+          <parameter name="show_size">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <property name="pixbuf">
-        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
-      </property>
-      <property name="file">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="stock">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="icon-name">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="storage-type">
-        <type name="GtkImageType" c:type="GtkImageType"/>
-      </property>
-      <property name="size">
-        <type name="gint" c:type="gint"/>
+      <property name="title">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <property name="screen">
-        <type name="GdkScreen" c:type="GdkScreen"/>
+      <property name="font-name">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <property name="visible">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="use-font">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="orientation">
-        <type name="GtkOrientation" c:type="GtkOrientation"/>
+      <property name="use-size">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="embedded">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="show-style">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="blinking">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="show-size">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="activate">
+      <callback name="font_set">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="GtkStatusIcon*" c:type="GtkStatusIcon*"/>
+          <parameter name="gfp">
+            <type name="GtkFontButton*" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="popup_menu">
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="status_icon">
-            <type name="GtkStatusIcon*" c:type="GtkStatusIcon*"/>
-          </parameter>
-          <parameter name="button">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="activate_time">
-            <type name="guint32" c:type="guint32"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="size_changed">
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="status_icon">
-            <type name="GtkStatusIcon*" c:type="GtkStatusIcon*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
       </callback>
-      <field name="__gtk_reserved1">
-        <type name="void*" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved2">
-        <type name="void*" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved3">
-        <type name="void*" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved4">
-        <type name="void*" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved5">
-        <type name="void*" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved6">
-        <type name="void*" c:type="void*"/>
-      </field>
-      <glib:signal name="popup-menu">
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="activate">
+      </callback>
+      <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="size-changed">
+      </callback>
+      <glib:signal name="font-set">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
       </glib:signal>
     </class>
-    <function name="status_icon_position_menu"
-              c:identifier="gtk_status_icon_position_menu">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="menu">
-          <type name="Menu" c:type="GtkMenu*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="y">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="push_in">
-          <type name="gboolean" c:type="gboolean*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkStockItem" c:type="GtkStockItem">
-      <field name="stock_id">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="label">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="modifier">
-        <type name="GdkModifierType" c:type="GdkModifierType"/>
-      </field>
-      <field name="keyval">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="translation_domain">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-    </record>
-    <function name="stock_add" c:identifier="gtk_stock_add">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="items">
-          <type name="GtkStockItem" c:type="GtkStockItem*"/>
-        </parameter>
-        <parameter name="n_items">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="stock_add_static" c:identifier="gtk_stock_add_static">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="items">
-          <type name="GtkStockItem" c:type="GtkStockItem*"/>
-        </parameter>
-        <parameter name="n_items">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="stock_lookup" c:identifier="gtk_stock_lookup">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="stock_id">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="item">
-          <type name="GtkStockItem" c:type="GtkStockItem*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="stock_list_ids" c:identifier="gtk_stock_list_ids">
-      <return-value>
-        <type name="GSList*" c:type="GSList*"/>
-      </return-value>
-    </function>
-    <function name="stock_item_copy" c:identifier="gtk_stock_item_copy">
-      <return-value>
-        <type name="GtkStockItem*" c:type="GtkStockItem*"/>
-      </return-value>
-      <parameters>
-        <parameter name="item">
-          <type name="GtkStockItem" c:type="GtkStockItem*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="stock_item_free" c:identifier="gtk_stock_item_free">
+    <function name="font_button_new" c:identifier="gtk_font_button_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="item">
-          <type name="GtkStockItem" c:type="GtkStockItem*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="stock_set_translate_func"
-              c:identifier="gtk_stock_set_translate_func">
+    <function name="font_button_new_with_font"
+              c:identifier="gtk_font_button_new_with_font">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="domain">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkTranslateFunc" c:type="GtkTranslateFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="notify">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        <parameter name="fontname">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkTableChild" c:type="GtkTableChild">
-      <field name="widget">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </field>
-      <field name="left_attach">
-        <type name="guint16" c:type="guint16"/>
-      </field>
-      <field name="right_attach">
-        <type name="guint16" c:type="guint16"/>
-      </field>
-      <field name="top_attach">
-        <type name="guint16" c:type="guint16"/>
-      </field>
-      <field name="bottom_attach">
-        <type name="guint16" c:type="guint16"/>
-      </field>
-      <field name="xpadding">
-        <type name="guint16" c:type="guint16"/>
-      </field>
-      <field name="ypadding">
-        <type name="guint16" c:type="guint16"/>
-      </field>
-      <field name="xexpand">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="yexpand">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="xshrink">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="yshrink">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="xfill">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="yfill">
-        <type name="guint" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkTableRowCol" c:type="GtkTableRowCol">
-      <field name="requisition">
-        <type name="guint16" c:type="guint16"/>
-      </field>
-      <field name="allocation">
-        <type name="guint16" c:type="guint16"/>
-      </field>
-      <field name="spacing">
-        <type name="guint16" c:type="guint16"/>
-      </field>
-      <field name="need_expand">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="need_shrink">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="expand">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="shrink">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="empty">
-        <type name="guint" c:type="guint"/>
-      </field>
-    </record>
-    <class name="Table"
-           c:type="GtkTable"
-           parent="Container"
-           glib:type-name="GtkTable"
-           glib:get-type="gtk_table_get_type">
-      <method name="resize" c:identifier="gtk_table_resize">
+    <class name="FontSelection"
+           c:type="GtkFontSelection"
+           parent="VBox"
+           glib:type-name="GtkFontSelection"
+           glib:get-type="gtk_font_selection_get_type">
+      <method name="get_font_name"
+              c:identifier="gtk_font_selection_get_font_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="rows">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="columns">
-            <type name="guint" c:type="guint"/>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="attach" c:identifier="gtk_table_attach">
+      <method name="get_font" c:identifier="gtk_font_selection_get_font">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GdkFont" c:type="GdkFont*"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="left_attach">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="right_attach">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="top_attach">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="bottom_attach">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="xoptions">
-            <type name="AttachOptions" c:type="GtkAttachOptions"/>
-          </parameter>
-          <parameter name="yoptions">
-            <type name="AttachOptions" c:type="GtkAttachOptions"/>
-          </parameter>
-          <parameter name="xpadding">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="ypadding">
-            <type name="guint" c:type="guint"/>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="attach_defaults" c:identifier="gtk_table_attach_defaults">
+      <method name="set_font_name"
+              c:identifier="gtk_font_selection_set_font_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="left_attach">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="right_attach">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="top_attach">
-            <type name="guint" c:type="guint"/>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
-          <parameter name="bottom_attach">
-            <type name="guint" c:type="guint"/>
+          <parameter name="fontname">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_row_spacing" c:identifier="gtk_table_set_row_spacing">
+      <method name="get_preview_text"
+              c:identifier="gtk_font_selection_get_preview_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="spacing">
-            <type name="guint" c:type="guint"/>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_row_spacing" c:identifier="gtk_table_get_row_spacing">
+      <method name="set_preview_text"
+              c:identifier="gtk_font_selection_set_preview_text">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
-          <parameter name="row">
-            <type name="guint" c:type="guint"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_col_spacing" c:identifier="gtk_table_set_col_spacing">
+      <property name="font-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="font">
+        <type name="GdkFont" c:type="GdkFont"/>
+      </property>
+      <property name="preview-text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="font_selection_new" c:identifier="gtk_font_selection_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="FontSelectionDialog"
+           c:type="GtkFontSelectionDialog"
+           parent="Dialog"
+           glib:type-name="GtkFontSelectionDialog"
+           glib:get-type="gtk_font_selection_dialog_get_type">
+      <method name="get_font_name"
+              c:identifier="gtk_font_selection_dialog_get_font_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="spacing">
-            <type name="guint" c:type="guint"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_col_spacing" c:identifier="gtk_table_get_col_spacing">
+      <method name="get_font"
+              c:identifier="gtk_font_selection_dialog_get_font">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="GdkFont" c:type="GdkFont*"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="guint" c:type="guint"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_row_spacings" c:identifier="gtk_table_set_row_spacings">
+      <method name="set_font_name"
+              c:identifier="gtk_font_selection_dialog_set_font_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
-          <parameter name="spacing">
-            <type name="guint" c:type="guint"/>
+          <parameter name="fontname">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_default_row_spacing"
-              c:identifier="gtk_table_get_default_row_spacing">
+      <method name="get_preview_text"
+              c:identifier="gtk_font_selection_dialog_get_preview_text">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_col_spacings" c:identifier="gtk_table_set_col_spacings">
+      <method name="set_preview_text"
+              c:identifier="gtk_font_selection_dialog_set_preview_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
-          <parameter name="spacing">
-            <type name="guint" c:type="guint"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_default_col_spacing"
-              c:identifier="gtk_table_get_default_col_spacing">
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_homogeneous" c:identifier="gtk_table_set_homogeneous">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="homogeneous">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_homogeneous" c:identifier="gtk_table_get_homogeneous">
+      </callback>
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="n-rows">
-        <type name="guint" c:type="guint"/>
-      </property>
-      <property name="n-columns">
-        <type name="guint" c:type="guint"/>
-      </property>
-      <property name="column-spacing">
-        <type name="guint" c:type="guint"/>
-      </property>
-      <property name="row-spacing">
-        <type name="guint" c:type="guint"/>
-      </property>
-      <property name="homogeneous">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
     </class>
-    <function name="table_new" c:identifier="gtk_table_new">
+    <function name="font_selection_dialog_new"
+              c:identifier="gtk_font_selection_dialog_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="rows">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="columns">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="homogeneous">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="title">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="TearoffMenuItem"
-           c:type="GtkTearoffMenuItem"
-           parent="MenuItem"
-           glib:type-name="GtkTearoffMenuItem"
-           glib:get-type="gtk_tearoff_menu_item_get_type">
+    <class name="GammaCurve"
+           c:type="GtkGammaCurve"
+           parent="VBox"
+           glib:type-name="GtkGammaCurve"
+           glib:get-type="gtk_gamma_curve_get_type">
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
-    <function name="tearoff_menu_item_new"
-              c:identifier="gtk_tearoff_menu_item_new">
+    <function name="gamma_curve_new" c:identifier="gtk_gamma_curve_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
     </function>
-    <callback name="GtkTextTagTableForeach">
+    <function name="gc_get" c:identifier="gtk_gc_get">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GdkGC*" c:type="GdkGC*"/>
       </return-value>
       <parameters>
-        <parameter name="tag">
-          <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+        <parameter name="depth">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="colormap">
+          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+        </parameter>
+        <parameter name="values">
+          <type name="GdkGCValues" c:type="GdkGCValues*"/>
+        </parameter>
+        <parameter name="values_mask">
+          <type name="GdkGCValuesMask" c:type="GdkGCValuesMask"/>
         </parameter>
       </parameters>
-    </callback>
-    <class name="TextTagTable"
-           c:type="GtkTextTagTable"
-           parent="GLib.Object"
-           glib:type-name="GtkTextTagTable"
-           glib:get-type="gtk_text_tag_table_get_type">
-      <constructor name="new" c:identifier="gtk_text_tag_table_new">
-        <return-value>
-          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
-        </return-value>
-      </constructor>
-      <method name="add" c:identifier="gtk_text_tag_table_add">
+    </function>
+    <function name="gc_release" c:identifier="gtk_gc_release">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="gc">
+          <type name="Gdk.GC" c:type="GdkGC*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="HandleBox"
+           c:type="GtkHandleBox"
+           parent="Bin"
+           glib:type-name="GtkHandleBox"
+           glib:get-type="gtk_handle_box_get_type">
+      <method name="set_shadow_type"
+              c:identifier="gtk_handle_box_set_shadow_type">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove" c:identifier="gtk_text_tag_table_remove">
+      <method name="get_shadow_type"
+              c:identifier="gtk_handle_box_get_shadow_type">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="ShadowType" c:type="GtkShadowType"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
-          </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="foreach" c:identifier="gtk_text_tag_table_foreach">
+      <method name="set_handle_position"
+              c:identifier="gtk_handle_box_set_handle_position">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTextTagTableForeach"
-                    c:type="GtkTextTagTableForeach"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="position">
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size" c:identifier="gtk_text_tag_table_get_size">
+      <method name="get_handle_position"
+              c:identifier="gtk_handle_box_get_handle_position">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="PositionType" c:type="GtkPositionType"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="tag_changed">
+      <method name="set_snap_edge" c:identifier="gtk_handle_box_set_snap_edge">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="GtkTextTagTable*" c:type="GtkTextTagTable*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
-          <parameter name="tag">
-            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+          <parameter name="edge">
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
-          <parameter name="size_changed">
-            <type name="gboolean" c:type="gboolean"/>
+        </parameters>
+      </method>
+      <method name="get_snap_edge" c:identifier="gtk_handle_box_get_snap_edge">
+        <return-value>
+          <type name="PositionType" c:type="GtkPositionType"/>
+        </return-value>
+        <parameters>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="tag_added">
+      </method>
+      <property name="shadow">
+        <type name="GtkShadowType" c:type="GtkShadowType"/>
+      </property>
+      <property name="shadow-type">
+        <type name="GtkShadowType" c:type="GtkShadowType"/>
+      </property>
+      <property name="handle-position">
+        <type name="GtkPositionType" c:type="GtkPositionType"/>
+      </property>
+      <property name="snap-edge">
+        <type name="GtkPositionType" c:type="GtkPositionType"/>
+      </property>
+      <property name="snap-edge-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="child_attached">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="GtkTextTagTable*" c:type="GtkTextTagTable*"/>
+          <parameter name="handle_box">
+            <type name="GtkHandleBox*" c:type="GtkHandleBox*"/>
           </parameter>
-          <parameter name="tag">
-            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+          <parameter name="child">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="tag_removed">
+      <callback name="child_detached">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="GtkTextTagTable*" c:type="GtkTextTagTable*"/>
+          <parameter name="handle_box">
+            <type name="GtkHandleBox*" c:type="GtkHandleBox*"/>
           </parameter>
-          <parameter name="tag">
-            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+          <parameter name="child">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="tag-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkTextTag" c:type="GtkTextTag"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="tag-added">
+      <glib:signal name="child-attached">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTextTag" c:type="GtkTextTag"/>
+            <type name="GtkWidget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="tag-removed">
+      <glib:signal name="child-detached">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTextTag" c:type="GtkTextTag"/>
+            <type name="GtkWidget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
     </class>
-    <function name="text_tag_table_add_buffer"
-              c:identifier="_gtk_text_tag_table_add_buffer">
+    <function name="handle_box_new" c:identifier="gtk_handle_box_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="HButtonBox"
+           c:type="GtkHButtonBox"
+           parent="ButtonBox"
+           glib:type-name="GtkHButtonBox"
+           glib:get-type="gtk_hbutton_box_get_type">
+    </class>
+    <function name="hbutton_box_new" c:identifier="gtk_hbutton_box_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="hbutton_box_get_spacing_default"
+              c:identifier="gtk_hbutton_box_get_spacing_default">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+    </function>
+    <function name="hbutton_box_get_layout_default"
+              c:identifier="gtk_hbutton_box_get_layout_default">
+      <return-value>
+        <type name="GtkButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
+      </return-value>
+    </function>
+    <function name="hbutton_box_set_spacing_default"
+              c:identifier="gtk_hbutton_box_set_spacing_default">
+      <return-value>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="table">
-          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="spacing">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_tag_table_remove_buffer"
-              c:identifier="_gtk_text_tag_table_remove_buffer">
+    <function name="hbutton_box_set_layout_default"
+              c:identifier="gtk_hbutton_box_set_layout_default">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="table">
-          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="layout">
+          <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
         </parameter>
       </parameters>
     </function>
-    <class name="TextMark"
-           c:type="GtkTextMark"
-           parent="GLib.Object"
-           glib:type-name="GtkTextMark"
-           glib:get-type="gtk_text_mark_get_type">
-      <constructor name="new" c:identifier="gtk_text_mark_new">
+    <record name="GtkPanedPrivate" c:type="GtkPanedPrivate"/>
+    <class name="Paned"
+           c:type="GtkPaned"
+           parent="Container"
+           glib:type-name="GtkPaned"
+           glib:get-type="gtk_paned_get_type">
+      <method name="add1" c:identifier="gtk_paned_add1">
         <return-value>
-          <type name="TextMark" c:type="GtkTextMark*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
-          <parameter name="left_gravity">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="set_visible" c:identifier="gtk_text_mark_set_visible">
+      </method>
+      <method name="add2" c:identifier="gtk_paned_add2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visible" c:identifier="gtk_text_mark_get_visible">
+      <method name="pack1" c:identifier="gtk_paned_pack1">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="resize">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="shrink">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_name" c:identifier="gtk_text_mark_get_name">
+      <method name="pack2" c:identifier="gtk_paned_pack2">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="resize">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="shrink">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_deleted" c:identifier="gtk_text_mark_get_deleted">
+      <method name="get_position" c:identifier="gtk_paned_get_position">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_buffer" c:identifier="gtk_text_mark_get_buffer">
+      <method name="set_position" c:identifier="gtk_paned_set_position">
         <return-value>
-          <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_left_gravity"
-              c:identifier="gtk_text_mark_get_left_gravity">
+      <method name="get_child1" c:identifier="gtk_paned_get_child1">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="name">
-        <type name="gchararray" c:type="gchararray"/>
+      <method name="get_child2" c:identifier="gtk_paned_get_child2">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="compute_position"
+              c:identifier="gtk_paned_compute_position">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+          <parameter name="allocation">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="child1_req">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="child2_req">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="position">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="left-gravity">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="position-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="min-position">
+        <type name="int32" c:type="gint"/>
       </property>
+      <property name="max-position">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <callback name="cycle_child_focus">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="paned">
+            <type name="GtkPaned*" c:type="GtkPaned*"/>
+          </parameter>
+          <parameter name="reverse">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="toggle_handle_focus">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="paned">
+            <type name="GtkPaned*" c:type="GtkPaned*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="move_handle">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="paned">
+            <type name="GtkPaned*" c:type="GtkPaned*"/>
+          </parameter>
+          <parameter name="scroll">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="cycle_handle_focus">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="paned">
+            <type name="GtkPaned*" c:type="GtkPaned*"/>
+          </parameter>
+          <parameter name="reverse">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="accept_position">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="paned">
+            <type name="GtkPaned*" c:type="GtkPaned*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="cancel_position">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="paned">
+            <type name="GtkPaned*" c:type="GtkPaned*"/>
+          </parameter>
+        </parameters>
+      </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-    </class>
-    <record name="GtkTextBTree" c:type="GtkTextBTree"/>
-    <record name="GtkTextLogAttrCache" c:type="GtkTextLogAttrCache"/>
-    <class name="TextBuffer"
-           c:type="GtkTextBuffer"
-           parent="GLib.Object"
-           glib:type-name="GtkTextBuffer"
-           glib:get-type="gtk_text_buffer_get_type">
-      <constructor name="new" c:identifier="gtk_text_buffer_new">
+      <glib:signal name="cycle-child-focus">
         <return-value>
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="get_line_count"
-              c:identifier="gtk_text_buffer_get_line_count">
+      </glib:signal>
+      <glib:signal name="toggle-handle-focus">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_char_count"
-              c:identifier="gtk_text_buffer_get_char_count">
+      </glib:signal>
+      <glib:signal name="move-handle">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="object">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_tag_table" c:identifier="gtk_text_buffer_get_tag_table">
+      </glib:signal>
+      <glib:signal name="cycle-handle-focus">
         <return-value>
-          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_text" c:identifier="gtk_text_buffer_set_text">
+      </glib:signal>
+      <glib:signal name="accept-position">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="cancel-position">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <class name="HPaned"
+           c:type="GtkHPaned"
+           parent="Paned"
+           glib:type-name="GtkHPaned"
+           glib:get-type="gtk_hpaned_get_type">
+    </class>
+    <function name="hpaned_new" c:identifier="gtk_hpaned_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <record name="GtkRulerMetric" c:type="GtkRulerMetric">
+      <field name="metric_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="abbrev">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="pixels_per_unit">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="ruler_scale">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="subdivide">
+        <type name="int32" c:type="gint"/>
+      </field>
+    </record>
+    <class name="Ruler"
+           c:type="GtkRuler"
+           parent="Widget"
+           glib:type-name="GtkRuler"
+           glib:get-type="gtk_ruler_get_type">
+      <method name="set_metric" c:identifier="gtk_ruler_set_metric">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
-          <parameter name="len">
-            <type name="gint" c:type="gint"/>
+          <parameter name="metric">
+            <type name="MetricType" c:type="GtkMetricType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert" c:identifier="gtk_text_buffer_insert">
+      <method name="set_range" c:identifier="gtk_ruler_set_range">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="lower">
+            <type name="double" c:type="gdouble"/>
           </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="upper">
+            <type name="double" c:type="gdouble"/>
           </parameter>
-          <parameter name="len">
-            <type name="gint" c:type="gint"/>
+          <parameter name="position">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="max_size">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_at_cursor"
-              c:identifier="gtk_text_buffer_insert_at_cursor">
+      <method name="draw_ticks" c:identifier="gtk_ruler_draw_ticks">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="len">
-            <type name="gint" c:type="gint"/>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_interactive"
-              c:identifier="gtk_text_buffer_insert_interactive">
+      <method name="draw_pos" c:identifier="gtk_ruler_draw_pos">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="len">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="default_editable">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_interactive_at_cursor"
-              c:identifier="gtk_text_buffer_insert_interactive_at_cursor">
+      <method name="get_metric" c:identifier="gtk_ruler_get_metric">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="MetricType" c:type="GtkMetricType"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="len">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="default_editable">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_range" c:identifier="gtk_text_buffer_insert_range">
+      <method name="get_range" c:identifier="gtk_ruler_get_range">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="lower">
+            <type name="gdouble" c:type="gdouble*"/>
           </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="upper">
+            <type name="gdouble" c:type="gdouble*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="position">
+            <type name="gdouble" c:type="gdouble*"/>
+          </parameter>
+          <parameter name="max_size">
+            <type name="gdouble" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_range_interactive"
-              c:identifier="gtk_text_buffer_insert_range_interactive">
+      <property name="lower">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="upper">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="position">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="max-size">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="metric">
+        <type name="GtkMetricType" c:type="GtkMetricType"/>
+      </property>
+      <callback name="draw_ticks">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="default_editable">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="ruler">
+            <type name="GtkRuler*" c:type="GtkRuler*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="insert_with_tags"
-              c:identifier="gtk_text_buffer_insert_with_tags">
+      </callback>
+      <callback name="draw_pos">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="len">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="first_tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="ruler">
+            <type name="GtkRuler*" c:type="GtkRuler*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="insert_with_tags_by_name"
-              c:identifier="gtk_text_buffer_insert_with_tags_by_name">
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <class name="HRuler"
+           c:type="GtkHRuler"
+           parent="Ruler"
+           glib:type-name="GtkHRuler"
+           glib:get-type="gtk_hruler_get_type">
+    </class>
+    <function name="hruler_new" c:identifier="gtk_hruler_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="Scale"
+           c:type="GtkScale"
+           parent="Range"
+           glib:type-name="GtkScale"
+           glib:get-type="gtk_scale_get_type">
+      <method name="set_digits" c:identifier="gtk_scale_set_digits">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="len">
-            <type name="gint" c:type="gint"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
-          <parameter name="first_tag_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="digits">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="delete" c:identifier="gtk_text_buffer_delete">
+      <method name="get_digits" c:identifier="gtk_scale_get_digits">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="delete_interactive"
-              c:identifier="gtk_text_buffer_delete_interactive">
+      <method name="set_draw_value" c:identifier="gtk_scale_set_draw_value">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="start_iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end_iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
-          <parameter name="default_editable">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="draw_value">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backspace" c:identifier="gtk_text_buffer_backspace">
+      <method name="get_draw_value" c:identifier="gtk_scale_get_draw_value">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="interactive">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="default_editable">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_text" c:identifier="gtk_text_buffer_get_text">
+      <method name="set_value_pos" c:identifier="gtk_scale_set_value_pos">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
-          <parameter name="include_hidden_chars">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="pos">
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_slice" c:identifier="gtk_text_buffer_get_slice">
+      <method name="get_value_pos" c:identifier="gtk_scale_get_value_pos">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="PositionType" c:type="GtkPositionType"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="include_hidden_chars">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_pixbuf" c:identifier="gtk_text_buffer_insert_pixbuf">
+      <method name="get_layout" c:identifier="gtk_scale_get_layout">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_child_anchor"
-              c:identifier="gtk_text_buffer_insert_child_anchor">
+      <method name="get_layout_offsets"
+              c:identifier="gtk_scale_get_layout_offsets">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="x">
+            <type name="gint" c:type="gint*"/>
           </parameter>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <parameter name="y">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_child_anchor"
-              c:identifier="gtk_text_buffer_create_child_anchor">
+      <property name="digits">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="draw-value">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="value-pos">
+        <type name="GtkPositionType" c:type="GtkPositionType"/>
+      </property>
+      <callback name="format_value">
         <return-value>
-          <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="scale">
+            <type name="GtkScale*" c:type="GtkScale*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="add_mark" c:identifier="gtk_text_buffer_add_mark">
+      </callback>
+      <callback name="draw_value">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
-          </parameter>
-          <parameter name="where">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="scale">
+            <type name="GtkScale*" c:type="GtkScale*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="create_mark" c:identifier="gtk_text_buffer_create_mark">
+      </callback>
+      <callback name="get_layout_offsets">
         <return-value>
-          <type name="TextMark" c:type="GtkTextMark*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="scale">
+            <type name="GtkScale*" c:type="GtkScale*"/>
           </parameter>
-          <parameter name="mark_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="x">
+            <type name="gint*" c:type="gint*"/>
           </parameter>
-          <parameter name="where">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="y">
+            <type name="gint*" c:type="gint*"/>
           </parameter>
-          <parameter name="left_gravity">
-            <type name="gboolean" c:type="gboolean"/>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="format-value">
+        <return-value>
+          <type name="string" c:type="gchararray"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="move_mark" c:identifier="gtk_text_buffer_move_mark">
+      </glib:signal>
+    </class>
+    <function name="scale_clear_layout" c:identifier="_gtk_scale_clear_layout">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="scale">
+          <type name="Scale" c:type="GtkScale*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="scale_get_value_size"
+              c:identifier="_gtk_scale_get_value_size">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="scale">
+          <type name="Scale" c:type="GtkScale*"/>
+        </parameter>
+        <parameter name="width">
+          <type name="gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="height">
+          <type name="gint" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="scale_format_value" c:identifier="_gtk_scale_format_value">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="scale">
+          <type name="Scale" c:type="GtkScale*"/>
+        </parameter>
+        <parameter name="value">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="HScale"
+           c:type="GtkHScale"
+           parent="Scale"
+           glib:type-name="GtkHScale"
+           glib:get-type="gtk_hscale_get_type">
+    </class>
+    <function name="hscale_new" c:identifier="gtk_hscale_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="adjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="hscale_new_with_range"
+              c:identifier="gtk_hscale_new_with_range">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="min">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="max">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="step">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Separator"
+           c:type="GtkSeparator"
+           parent="Widget"
+           glib:type-name="GtkSeparator"
+           glib:get-type="gtk_separator_get_type">
+    </class>
+    <class name="HSeparator"
+           c:type="GtkHSeparator"
+           parent="Separator"
+           glib:type-name="GtkHSeparator"
+           glib:get-type="gtk_hseparator_get_type">
+    </class>
+    <function name="hseparator_new" c:identifier="gtk_hseparator_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="IconFactory"
+           c:type="GtkIconFactory"
+           parent="GLib.Object"
+           glib:type-name="GtkIconFactory"
+           glib:get-type="gtk_icon_factory_get_type">
+      <constructor name="new" c:identifier="gtk_icon_factory_new">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="IconFactory" c:type="GtkIconFactory*"/>
         </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
-          </parameter>
-          <parameter name="where">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="delete_mark" c:identifier="gtk_text_buffer_delete_mark">
+      </constructor>
+      <method name="add" c:identifier="gtk_icon_factory_add">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_mark" c:identifier="gtk_text_buffer_get_mark">
-        <return-value>
-          <type name="TextMark" c:type="GtkTextMark*"/>
-        </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="icon_set">
+            <type name="GtkIconSet" c:type="GtkIconSet*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_mark_by_name"
-              c:identifier="gtk_text_buffer_move_mark_by_name">
+      <method name="lookup" c:identifier="gtk_icon_factory_lookup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkIconSet" c:type="GtkIconSet*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
           </parameter>
-          <parameter name="where">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="delete_mark_by_name"
-              c:identifier="gtk_text_buffer_delete_mark_by_name">
+      <method name="add_default" c:identifier="gtk_icon_factory_add_default">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_insert" c:identifier="gtk_text_buffer_get_insert">
+      <method name="remove_default"
+              c:identifier="gtk_icon_factory_remove_default">
         <return-value>
-          <type name="TextMark" c:type="GtkTextMark*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_selection_bound"
-              c:identifier="gtk_text_buffer_get_selection_bound">
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="TextMark" c:type="GtkTextMark*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="place_cursor" c:identifier="gtk_text_buffer_place_cursor">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="where">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="select_range" c:identifier="gtk_text_buffer_select_range">
+      </callback>
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="ins">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="bound">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="apply_tag" c:identifier="gtk_text_buffer_apply_tag">
+      </callback>
+      <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove_tag" c:identifier="gtk_text_buffer_remove_tag">
+      </callback>
+    </class>
+    <function name="icon_factory_lookup_default"
+              c:identifier="gtk_icon_factory_lookup_default">
+      <return-value>
+        <type name="GtkIconSet*" c:type="GtkIconSet*"/>
+      </return-value>
+      <parameters>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="icon_size_lookup" c:identifier="gtk_icon_size_lookup">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="size">
+          <type name="IconSize" c:type="GtkIconSize"/>
+        </parameter>
+        <parameter name="width">
+          <type name="gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="height">
+          <type name="gint" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="icon_size_lookup_for_settings"
+              c:identifier="gtk_icon_size_lookup_for_settings">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
+        </parameter>
+        <parameter name="size">
+          <type name="IconSize" c:type="GtkIconSize"/>
+        </parameter>
+        <parameter name="width">
+          <type name="gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="height">
+          <type name="gint" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="icon_size_register" c:identifier="gtk_icon_size_register">
+      <return-value>
+        <type name="GtkIconSize" c:type="GtkIconSize"/>
+      </return-value>
+      <parameters>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="icon_size_register_alias"
+              c:identifier="gtk_icon_size_register_alias">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="alias">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="target">
+          <type name="IconSize" c:type="GtkIconSize"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="icon_size_from_name"
+              c:identifier="gtk_icon_size_from_name">
+      <return-value>
+        <type name="GtkIconSize" c:type="GtkIconSize"/>
+      </return-value>
+      <parameters>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="icon_size_get_name" c:identifier="gtk_icon_size_get_name">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="size">
+          <type name="IconSize" c:type="GtkIconSize"/>
+        </parameter>
+      </parameters>
+    </function>
+    <glib:boxed c:type="IconSet"
+                glib:name="IconSet"
+                glib:type-name="GtkIconSet"
+                glib:get-type="gtk_icon_set_get_type">
+      <constructor name="new" c:identifier="gtk_icon_set_new">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="IconSet" c:type="GtkIconSet*"/>
         </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="apply_tag_by_name"
-              c:identifier="gtk_text_buffer_apply_tag_by_name">
+      </constructor>
+      <constructor name="new_from_pixbuf"
+                   c:identifier="gtk_icon_set_new_from_pixbuf">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="IconSet" c:type="GtkIconSet*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="remove_tag_by_name"
-              c:identifier="gtk_text_buffer_remove_tag_by_name">
+      </constructor>
+      <constructor name="ref" c:identifier="gtk_icon_set_ref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="IconSet" c:type="GtkIconSet*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="remove_all_tags"
-              c:identifier="gtk_text_buffer_remove_all_tags">
+      </constructor>
+      <constructor name="copy" c:identifier="gtk_icon_set_copy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="IconSet" c:type="GtkIconSet*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="create_tag" c:identifier="gtk_text_buffer_create_tag">
+      </constructor>
+      <method name="unref" c:identifier="gtk_icon_set_unref">
         <return-value>
-          <type name="TextTag" c:type="GtkTextTag*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="tag_name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="first_property_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_line_offset"
-              c:identifier="gtk_text_buffer_get_iter_at_line_offset">
+      <method name="render_icon" c:identifier="gtk_icon_set_render_icon">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
-          <parameter name="line_number">
-            <type name="gint" c:type="gint"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <parameter name="char_offset">
-            <type name="gint" c:type="gint"/>
+          <parameter name="direction">
+            <type name="TextDirection" c:type="GtkTextDirection"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_iter_at_line_index"
-              c:identifier="gtk_text_buffer_get_iter_at_line_index">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="state">
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize"/>
           </parameter>
-          <parameter name="line_number">
-            <type name="gint" c:type="gint"/>
+          <parameter name="widget" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="byte_index">
-            <type name="gint" c:type="gint"/>
+          <parameter name="detail" allow-none="1">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_offset"
-              c:identifier="gtk_text_buffer_get_iter_at_offset">
+      <method name="add_source" c:identifier="gtk_icon_set_add_source">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
-          <parameter name="char_offset">
-            <type name="gint" c:type="gint"/>
+          <parameter name="source">
+            <type name="GtkIconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_line"
-              c:identifier="gtk_text_buffer_get_iter_at_line">
+      <method name="get_sizes" c:identifier="gtk_icon_set_get_sizes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="sizes">
+            <type name="IconSize" c:type="GtkIconSize**"/>
           </parameter>
-          <parameter name="line_number">
-            <type name="gint" c:type="gint"/>
+          <parameter name="n_sizes">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_start_iter"
-              c:identifier="gtk_text_buffer_get_start_iter">
+    </glib:boxed>
+    <glib:boxed c:type="IconSource"
+                glib:name="IconSource"
+                glib:type-name="GtkIconSource"
+                glib:get-type="gtk_icon_source_get_type">
+      <constructor name="new" c:identifier="gtk_icon_source_new">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="IconSource" c:type="GtkIconSource*"/>
         </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_end_iter" c:identifier="gtk_text_buffer_get_end_iter">
+      </constructor>
+      <constructor name="copy" c:identifier="gtk_icon_source_copy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="IconSource" c:type="GtkIconSource*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_bounds" c:identifier="gtk_text_buffer_get_bounds">
+      </constructor>
+      <method name="free" c:identifier="gtk_icon_source_free">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_mark"
-              c:identifier="gtk_text_buffer_get_iter_at_mark">
+      <method name="set_filename" c:identifier="gtk_icon_source_set_filename">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_child_anchor"
-              c:identifier="gtk_text_buffer_get_iter_at_child_anchor">
+      <method name="set_icon_name"
+              c:identifier="gtk_icon_source_set_icon_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_modified" c:identifier="gtk_text_buffer_get_modified">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="icon_name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_modified" c:identifier="gtk_text_buffer_set_modified">
+      <method name="set_pixbuf" c:identifier="gtk_icon_source_set_pixbuf">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_has_selection"
-              c:identifier="gtk_text_buffer_get_has_selection">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_selection_clipboard"
-              c:identifier="gtk_text_buffer_add_selection_clipboard">
+      <method name="get_filename" c:identifier="gtk_icon_source_get_filename">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_selection_clipboard"
-              c:identifier="gtk_text_buffer_remove_selection_clipboard">
+      <method name="get_icon_name"
+              c:identifier="gtk_icon_source_get_icon_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="cut_clipboard" c:identifier="gtk_text_buffer_cut_clipboard">
+      <method name="get_pixbuf" c:identifier="gtk_icon_source_get_pixbuf">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="default_editable">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="copy_clipboard"
-              c:identifier="gtk_text_buffer_copy_clipboard">
+      <method name="set_direction_wildcarded"
+              c:identifier="gtk_icon_source_set_direction_wildcarded">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="paste_clipboard"
-              c:identifier="gtk_text_buffer_paste_clipboard">
+      <method name="set_state_wildcarded"
+              c:identifier="gtk_icon_source_set_state_wildcarded">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="override_location">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-          <parameter name="default_editable">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_selection_bounds"
-              c:identifier="gtk_text_buffer_get_selection_bounds">
+      <method name="set_size_wildcarded"
+              c:identifier="gtk_icon_source_set_size_wildcarded">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="delete_selection"
-              c:identifier="gtk_text_buffer_delete_selection">
+      <method name="get_size_wildcarded"
+              c:identifier="gtk_icon_source_get_size_wildcarded">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="interactive">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="default_editable">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="begin_user_action"
-              c:identifier="gtk_text_buffer_begin_user_action">
+      <method name="get_state_wildcarded"
+              c:identifier="gtk_icon_source_get_state_wildcarded">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="end_user_action"
-              c:identifier="gtk_text_buffer_end_user_action">
+      <method name="get_direction_wildcarded"
+              c:identifier="gtk_icon_source_get_direction_wildcarded">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_copy_target_list"
-              c:identifier="gtk_text_buffer_get_copy_target_list">
+      <method name="set_direction"
+              c:identifier="gtk_icon_source_set_direction">
         <return-value>
-          <type name="TargetList" c:type="GtkTargetList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+          <parameter name="direction">
+            <type name="TextDirection" c:type="GtkTextDirection"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paste_target_list"
-              c:identifier="gtk_text_buffer_get_paste_target_list">
+      <method name="set_state" c:identifier="gtk_icon_source_set_state">
         <return-value>
-          <type name="TargetList" c:type="GtkTargetList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+          <parameter name="state">
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="register_serialize_format"
-              c:identifier="gtk_text_buffer_register_serialize_format">
+      <method name="set_size" c:identifier="gtk_icon_source_set_size">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="mime_type">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="function">
-            <type name="GtkTextBufferSerializeFunc"
-                    c:type="GtkTextBufferSerializeFunc"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-          <parameter name="user_data_destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize"/>
           </parameter>
         </parameters>
       </method>
-      <method name="register_serialize_tagset"
-              c:identifier="gtk_text_buffer_register_serialize_tagset">
+      <method name="get_direction"
+              c:identifier="gtk_icon_source_get_direction">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="TextDirection" c:type="GtkTextDirection"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="tagset_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="register_deserialize_format"
-              c:identifier="gtk_text_buffer_register_deserialize_format">
+      <method name="get_state" c:identifier="gtk_icon_source_get_state">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="StateType" c:type="GtkStateType"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="mime_type">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="function">
-            <type name="GtkTextBufferDeserializeFunc"
-                    c:type="GtkTextBufferDeserializeFunc"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="user_data_destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="register_deserialize_tagset"
-              c:identifier="gtk_text_buffer_register_deserialize_tagset">
+      <method name="get_size" c:identifier="gtk_icon_source_get_size">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="IconSize" c:type="GtkIconSize"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="tagset_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unregister_serialize_format"
-              c:identifier="gtk_text_buffer_unregister_serialize_format">
+    </glib:boxed>
+    <function name="icon_set_invalidate_caches"
+              c:identifier="_gtk_icon_set_invalidate_caches">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="icon_factory_list_ids"
+              c:identifier="_gtk_icon_factory_list_ids">
+      <return-value>
+        <type name="GList*" c:type="GList*"/>
+      </return-value>
+    </function>
+    <function name="icon_factory_ensure_default_icons"
+              c:identifier="_gtk_icon_factory_ensure_default_icons">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <record name="GtkIconThemePrivate" c:type="GtkIconThemePrivate"/>
+    <function name="icon_theme_error_quark"
+              c:identifier="gtk_icon_theme_error_quark">
+      <return-value>
+        <type name="GQuark" c:type="GQuark"/>
+      </return-value>
+    </function>
+    <class name="IconTheme"
+           c:type="GtkIconTheme"
+           parent="GLib.Object"
+           glib:type-name="GtkIconTheme"
+           glib:get-type="gtk_icon_theme_get_type">
+      <constructor name="new" c:identifier="gtk_icon_theme_new">
+        <return-value>
+          <type name="IconTheme" c:type="GtkIconTheme*"/>
+        </return-value>
+      </constructor>
+      <constructor name="get_default"
+                   c:identifier="gtk_icon_theme_get_default">
+        <return-value>
+          <type name="IconTheme" c:type="GtkIconTheme*"/>
+        </return-value>
+      </constructor>
+      <constructor name="get_for_screen"
+                   c:identifier="gtk_icon_theme_get_for_screen">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="IconTheme" c:type="GtkIconTheme*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="unregister_deserialize_format"
-              c:identifier="gtk_text_buffer_unregister_deserialize_format">
+      </constructor>
+      <method name="set_screen" c:identifier="gtk_icon_theme_set_screen">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="deserialize_set_can_create_tags"
-              c:identifier="gtk_text_buffer_deserialize_set_can_create_tags">
+      <method name="set_search_path"
+              c:identifier="gtk_icon_theme_set_search_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="can_create_tags">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="n_elements">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="deserialize_get_can_create_tags"
-              c:identifier="gtk_text_buffer_deserialize_get_can_create_tags">
+      <method name="get_search_path"
+              c:identifier="gtk_icon_theme_get_search_path">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="path">
+            <type name="gchar" c:type="gchar**"/>
+          </parameter>
+          <parameter name="n_elements">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_serialize_formats"
-              c:identifier="gtk_text_buffer_get_serialize_formats">
+      <method name="append_search_path"
+              c:identifier="gtk_icon_theme_append_search_path">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="n_formats">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_deserialize_formats"
-              c:identifier="gtk_text_buffer_get_deserialize_formats">
+      <method name="prepend_search_path"
+              c:identifier="gtk_icon_theme_prepend_search_path">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="n_formats">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="serialize" c:identifier="gtk_text_buffer_serialize">
+      <method name="set_custom_theme"
+              c:identifier="gtk_icon_theme_set_custom_theme">
         <return-value>
-          <type name="guint8" c:type="guint8*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="register_buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="content_buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="length">
-            <type name="gsize" c:type="gsize*"/>
+          <parameter name="theme_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="deserialize" c:identifier="gtk_text_buffer_deserialize">
+      <method name="has_icon" c:identifier="gtk_icon_theme_has_icon">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="register_buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="content_buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="data">
-            <type name="guint8" c:type="guint8*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="gsize" c:type="gsize"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="icon_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="tag-table">
-        <type name="GtkTextTagTable" c:type="GtkTextTagTable"/>
-      </property>
-      <property name="text">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <property name="has-selection">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="cursor-position">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="copy-target-list">
-        <type name="GtkTargetList" c:type="GtkTargetList"/>
-      </property>
-      <property name="paste-target-list">
-        <type name="GtkTargetList" c:type="GtkTargetList"/>
-      </property>
-      <callback name="insert_text">
+      <method name="get_icon_sizes"
+              c:identifier="gtk_icon_theme_get_icon_sizes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="gint" c:type="gint*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="pos">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="length">
-            <type name="gint" c:type="gint"/>
+          <parameter name="icon_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="insert_pixbuf">
+      </method>
+      <method name="lookup_icon" c:identifier="gtk_icon_theme_lookup_icon">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkIconInfo" c:type="GtkIconInfo*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="pos">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          <parameter name="icon_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+          <parameter name="size">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="insert_child_anchor">
+      </method>
+      <method name="choose_icon" c:identifier="gtk_icon_theme_choose_icon">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkIconInfo" c:type="GtkIconInfo*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="pos">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          <parameter name="icon_names">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="anchor">
-            <type name="GtkTextChildAnchor*" c:type="GtkTextChildAnchor*"/>
+          <parameter name="size">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="delete_range">
+      </method>
+      <method name="load_icon" c:identifier="gtk_icon_theme_load_icon">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="start">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          <parameter name="icon_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="end">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          <parameter name="size">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="changed">
+      </method>
+      <method name="list_icons" c:identifier="gtk_icon_theme_list_icons">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GList" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="modified_changed">
+      </method>
+      <method name="list_contexts" c:identifier="gtk_icon_theme_list_contexts">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GList" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="mark_set">
+      </method>
+      <method name="get_example_icon_name"
+              c:identifier="gtk_icon_theme_get_example_icon_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="location">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="mark">
-            <type name="GtkTextMark*" c:type="GtkTextMark*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="mark_deleted">
+      </method>
+      <method name="rescan_if_needed"
+              c:identifier="gtk_icon_theme_rescan_if_needed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="mark">
-            <type name="GtkTextMark*" c:type="GtkTextMark*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="apply_tag">
+      </method>
+      <callback name="changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="tag">
-            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
-          </parameter>
-          <parameter name="start_char">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end_char">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          <parameter name="icon_theme">
+            <type name="GtkIconTheme*" c:type="GtkIconTheme*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="remove_tag">
+      <glib:signal name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="icon_theme_add_builtin_icon"
+              c:identifier="gtk_icon_theme_add_builtin_icon">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="icon_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="size">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="pixbuf">
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <glib:boxed c:type="IconInfo"
+                glib:name="IconInfo"
+                glib:type-name="GtkIconInfo"
+                glib:get-type="gtk_icon_info_get_type">
+      <constructor name="copy" c:identifier="gtk_icon_info_copy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="IconInfo" c:type="GtkIconInfo*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="tag">
-            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
-          </parameter>
-          <parameter name="start_char">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end_char">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="begin_user_action">
+      </constructor>
+      <method name="free" c:identifier="gtk_icon_info_free">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="end_user_action">
+      </method>
+      <method name="get_base_size" c:identifier="gtk_icon_info_get_base_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved5">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved6">
+      </method>
+      <method name="get_filename" c:identifier="gtk_icon_info_get_filename">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
-      </callback>
-      <glib:signal name="changed">
+        <parameters>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_builtin_pixbuf"
+              c:identifier="gtk_icon_info_get_builtin_pixbuf">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="insert-text">
+        <parameters>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="load_icon" c:identifier="gtk_icon_info_load_icon">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gchararray" c:type="gchararray"/>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="gint" c:type="gint"/>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="insert-pixbuf">
+      </method>
+      <method name="set_raw_coordinates"
+              c:identifier="gtk_icon_info_set_raw_coordinates">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="GdkPixbuf" c:type="GdkPixbuf"/>
+          <parameter name="raw_coordinates">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="insert-child-anchor">
+      </method>
+      <method name="get_embedded_rect"
+              c:identifier="gtk_icon_info_get_embedded_rect">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="GtkTextChildAnchor" c:type="GtkTextChildAnchor"/>
+          <parameter name="rectangle">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="delete-range">
+      </method>
+      <method name="get_attach_points"
+              c:identifier="gtk_icon_info_get_attach_points">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          <parameter name="points">
+            <type name="GdkPoint" c:type="GdkPoint**"/>
+          </parameter>
+          <parameter name="n_points">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="modified-changed">
+      </method>
+      <method name="get_display_name"
+              c:identifier="gtk_icon_info_get_display_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="mark-set">
+        <parameters>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <function name="icon_theme_check_reload"
+              c:identifier="_gtk_icon_theme_check_reload">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="display">
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="icon_theme_ensure_builtin_cache"
+              c:identifier="_gtk_icon_theme_ensure_builtin_cache">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <class name="Tooltip"
+           c:type="GtkTooltip"
+           parent="GLib.Object"
+           glib:type-name="GtkTooltip"
+           glib:get-type="gtk_tooltip_get_type">
+      <method name="set_markup" c:identifier="gtk_tooltip_set_markup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="GtkTextMark" c:type="GtkTextMark"/>
+          <parameter name="markup">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="mark-deleted">
+      </method>
+      <method name="set_text" c:identifier="gtk_tooltip_set_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkTextMark" c:type="GtkTextMark"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="apply-tag">
+      </method>
+      <method name="set_icon" c:identifier="gtk_tooltip_set_icon">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkTextTag" c:type="GtkTextTag"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="remove-tag">
+      </method>
+      <method name="set_icon_from_stock"
+              c:identifier="gtk_tooltip_set_icon_from_stock">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkTextTag" c:type="GtkTextTag"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="begin-user-action">
+      </method>
+      <method name="set_custom" c:identifier="gtk_tooltip_set_custom">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="end-user-action">
+        <parameters>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="custom_widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_tip_area" c:identifier="gtk_tooltip_set_tip_area">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
+        <parameters>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="rect">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
+        </parameters>
+      </method>
     </class>
-    <function name="text_buffer_spew" c:identifier="_gtk_text_buffer_spew">
+    <function name="tooltip_trigger_tooltip_query"
+              c:identifier="gtk_tooltip_trigger_tooltip_query">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        <parameter name="display">
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_buffer_get_btree"
-              c:identifier="_gtk_text_buffer_get_btree">
+    <function name="tooltip_focus_in" c:identifier="_gtk_tooltip_focus_in">
       <return-value>
-        <type name="GtkTextBTree*" c:type="GtkTextBTree*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_buffer_get_line_log_attrs"
-              c:identifier="_gtk_text_buffer_get_line_log_attrs">
+    <function name="tooltip_focus_out" c:identifier="_gtk_tooltip_focus_out">
       <return-value>
-        <type name="PangoLogAttr*" c:type="PangoLogAttr*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-        </parameter>
-        <parameter name="anywhere_in_line">
-          <type name="TextIter" c:type="GtkTextIter*"/>
-        </parameter>
-        <parameter name="char_len">
-          <type name="gint" c:type="gint*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_buffer_notify_will_remove_tag"
-              c:identifier="_gtk_text_buffer_notify_will_remove_tag">
+    <function name="tooltip_toggle_keyboard_mode"
+              c:identifier="_gtk_tooltip_toggle_keyboard_mode">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-        </parameter>
-        <parameter name="tag">
-          <type name="TextTag" c:type="GtkTextTag*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GtkTextBufferSerializeFunc">
+    <function name="tooltip_handle_event"
+              c:identifier="_gtk_tooltip_handle_event">
       <return-value>
-        <type name="guint8*" c:type="guint8*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="register_buffer">
-          <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
-        </parameter>
-        <parameter name="content_buffer">
-          <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
-        </parameter>
-        <parameter name="start">
-          <type name="GtkTextIter*" c:type="GtkTextIter*"/>
-        </parameter>
-        <parameter name="end">
-          <type name="GtkTextIter*" c:type="GtkTextIter*"/>
-        </parameter>
-        <parameter name="length">
-          <type name="gsize*" c:type="gsize*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="event">
+          <type name="GdkEvent" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
-    </callback>
-    <callback name="GtkTextBufferDeserializeFunc">
+    </function>
+    <function name="tooltip_hide" c:identifier="_gtk_tooltip_hide">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="register_buffer">
-          <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="content_buffer">
-          <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+      </parameters>
+    </function>
+    <record name="GtkIconViewPrivate" c:type="GtkIconViewPrivate"/>
+    <callback name="GtkIconViewForeachFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="icon_view">
+          <type name="GtkIconView*" c:type="GtkIconView*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+        <parameter name="path">
+          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
         </parameter>
         <parameter name="data">
-          <type name="guint8*" c:type="guint8*"/>
-        </parameter>
-        <parameter name="length">
-          <type name="gsize" c:type="gsize"/>
-        </parameter>
-        <parameter name="create_tags">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError**" c:type="GError**"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
-    <record name="GtkTextWindow" c:type="GtkTextWindow"/>
-    <record name="GtkTextPendingScroll" c:type="GtkTextPendingScroll"/>
-    <class name="TextView"
-           c:type="GtkTextView"
+    <class name="IconView"
+           c:type="GtkIconView"
            parent="Container"
-           glib:type-name="GtkTextView"
-           glib:get-type="gtk_text_view_get_type">
-      <method name="set_buffer" c:identifier="gtk_text_view_set_buffer">
+           glib:type-name="GtkIconView"
+           glib:get-type="gtk_icon_view_get_type">
+      <method name="set_model" c:identifier="gtk_icon_view_set_model">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_buffer" c:identifier="gtk_text_view_get_buffer">
-        <return-value>
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-        </return-value>
-        <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="model" allow-none="1">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="scroll_to_iter" c:identifier="gtk_text_view_scroll_to_iter">
+      <method name="get_model" c:identifier="gtk_icon_view_get_model">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="within_margin">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-          <parameter name="use_align">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="xalign">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-          <parameter name="yalign">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="scroll_to_mark" c:identifier="gtk_text_view_scroll_to_mark">
+      <method name="set_text_column"
+              c:identifier="gtk_icon_view_set_text_column">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
-          </parameter>
-          <parameter name="within_margin">
-            <type name="gdouble" c:type="gdouble"/>
-          </parameter>
-          <parameter name="use_align">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="xalign">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="yalign">
-            <type name="gdouble" c:type="gdouble"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="scroll_mark_onscreen"
-              c:identifier="gtk_text_view_scroll_mark_onscreen">
+      <method name="get_text_column"
+              c:identifier="gtk_icon_view_get_text_column">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_mark_onscreen"
-              c:identifier="gtk_text_view_move_mark_onscreen">
+      <method name="set_markup_column"
+              c:identifier="gtk_icon_view_set_markup_column">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="place_cursor_onscreen"
-              c:identifier="gtk_text_view_place_cursor_onscreen">
+      <method name="get_markup_column"
+              c:identifier="gtk_icon_view_get_markup_column">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visible_rect"
-              c:identifier="gtk_text_view_get_visible_rect">
+      <method name="set_pixbuf_column"
+              c:identifier="gtk_icon_view_set_pixbuf_column">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="visible_rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_cursor_visible"
-              c:identifier="gtk_text_view_set_cursor_visible">
+      <method name="get_pixbuf_column"
+              c:identifier="gtk_icon_view_get_pixbuf_column">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_cursor_visible"
-              c:identifier="gtk_text_view_get_cursor_visible">
+      <method name="set_orientation"
+              c:identifier="gtk_icon_view_set_orientation">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="orientation">
+            <type name="Orientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_location"
-              c:identifier="gtk_text_view_get_iter_location">
+      <method name="get_orientation"
+              c:identifier="gtk_icon_view_get_orientation">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Orientation" c:type="GtkOrientation"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="location">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_location"
-              c:identifier="gtk_text_view_get_iter_at_location">
+      <method name="set_columns" c:identifier="gtk_icon_view_set_columns">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
+          <parameter name="columns">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_position"
-              c:identifier="gtk_text_view_get_iter_at_position">
+      <method name="get_columns" c:identifier="gtk_icon_view_get_columns">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="trailing">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_line_yrange"
-              c:identifier="gtk_text_view_get_line_yrange">
+      <method name="set_item_width"
+              c:identifier="gtk_icon_view_set_item_width">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="height">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="item_width">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_line_at_y" c:identifier="gtk_text_view_get_line_at_y">
+      <method name="get_item_width"
+              c:identifier="gtk_icon_view_get_item_width">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="target_iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="line_top">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="buffer_to_window_coords"
-              c:identifier="gtk_text_view_buffer_to_window_coords">
+      <method name="set_spacing" c:identifier="gtk_icon_view_set_spacing">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="win">
-            <type name="TextWindowType" c:type="GtkTextWindowType"/>
-          </parameter>
-          <parameter name="buffer_x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="buffer_y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="window_x">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="window_y">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="spacing">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="window_to_buffer_coords"
-              c:identifier="gtk_text_view_window_to_buffer_coords">
+      <method name="get_spacing" c:identifier="gtk_icon_view_get_spacing">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="win">
-            <type name="TextWindowType" c:type="GtkTextWindowType"/>
-          </parameter>
-          <parameter name="window_x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="window_y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="buffer_x">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="buffer_y">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_window" c:identifier="gtk_text_view_get_window">
+      <method name="set_row_spacing"
+              c:identifier="gtk_icon_view_set_row_spacing">
         <return-value>
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="win">
-            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          <parameter name="row_spacing">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_window_type"
-              c:identifier="gtk_text_view_get_window_type">
+      <method name="get_row_spacing"
+              c:identifier="gtk_icon_view_get_row_spacing">
         <return-value>
-          <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="window">
-            <type name="Gdk.Window" c:type="GdkWindow*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_border_window_size"
-              c:identifier="gtk_text_view_set_border_window_size">
+      <method name="set_column_spacing"
+              c:identifier="gtk_icon_view_set_column_spacing">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="size">
-            <type name="gint" c:type="gint"/>
+          <parameter name="column_spacing">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_border_window_size"
-              c:identifier="gtk_text_view_get_border_window_size">
+      <method name="get_column_spacing"
+              c:identifier="gtk_icon_view_get_column_spacing">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_display_line"
-              c:identifier="gtk_text_view_forward_display_line">
+      <method name="set_margin" c:identifier="gtk_icon_view_set_margin">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="margin">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_display_line"
-              c:identifier="gtk_text_view_backward_display_line">
+      <method name="get_margin" c:identifier="gtk_icon_view_get_margin">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_display_line_end"
-              c:identifier="gtk_text_view_forward_display_line_end">
+      <method name="get_path_at_pos"
+              c:identifier="gtk_icon_view_get_path_at_pos">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_display_line_start"
-              c:identifier="gtk_text_view_backward_display_line_start">
+      <method name="get_item_at_pos"
+              c:identifier="gtk_icon_view_get_item_at_pos">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="starts_display_line"
-              c:identifier="gtk_text_view_starts_display_line">
+      <method name="get_visible_range"
+              c:identifier="gtk_icon_view_get_visible_range">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="start_path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="end_path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_visually" c:identifier="gtk_text_view_move_visually">
+      <method name="selected_foreach"
+              c:identifier="gtk_icon_view_selected_foreach">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="func">
+            <type name="GtkIconViewForeachFunc"
+                  c:type="GtkIconViewForeachFunc"/>
           </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_child_at_anchor"
-              c:identifier="gtk_text_view_add_child_at_anchor">
+      <method name="set_selection_mode"
+              c:identifier="gtk_icon_view_set_selection_mode">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <parameter name="mode">
+            <type name="SelectionMode" c:type="GtkSelectionMode"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_child_in_window"
-              c:identifier="gtk_text_view_add_child_in_window">
+      <method name="get_selection_mode"
+              c:identifier="gtk_icon_view_get_selection_mode">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="SelectionMode" c:type="GtkSelectionMode"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="which_window">
-            <type name="TextWindowType" c:type="GtkTextWindowType"/>
-          </parameter>
-          <parameter name="xpos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="ypos">
-            <type name="gint" c:type="gint"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_child" c:identifier="gtk_text_view_move_child">
+      <method name="select_path" c:identifier="gtk_icon_view_select_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="xpos">
-            <type name="gint" c:type="gint"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="ypos">
-            <type name="gint" c:type="gint"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_wrap_mode" c:identifier="gtk_text_view_set_wrap_mode">
+      <method name="unselect_path" c:identifier="gtk_icon_view_unselect_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="wrap_mode">
-            <type name="WrapMode" c:type="GtkWrapMode"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_wrap_mode" c:identifier="gtk_text_view_get_wrap_mode">
+      <method name="path_is_selected"
+              c:identifier="gtk_icon_view_path_is_selected">
         <return-value>
-          <type name="WrapMode" c:type="GtkWrapMode"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_editable" c:identifier="gtk_text_view_set_editable">
+      <method name="get_selected_items"
+              c:identifier="gtk_icon_view_get_selected_items">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GList" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_editable" c:identifier="gtk_text_view_get_editable">
+      <method name="select_all" c:identifier="gtk_icon_view_select_all">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_overwrite" c:identifier="gtk_text_view_set_overwrite">
+      <method name="unselect_all" c:identifier="gtk_icon_view_unselect_all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="overwrite">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_overwrite" c:identifier="gtk_text_view_get_overwrite">
+      <method name="item_activated"
+              c:identifier="gtk_icon_view_item_activated">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_accepts_tab"
-              c:identifier="gtk_text_view_set_accepts_tab">
+      <method name="set_cursor" c:identifier="gtk_icon_view_set_cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="accepts_tab">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="cell" allow-none="1">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="start_editing">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_accepts_tab"
-              c:identifier="gtk_text_view_get_accepts_tab">
+      <method name="get_cursor" c:identifier="gtk_icon_view_get_cursor">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_pixels_above_lines"
-              c:identifier="gtk_text_view_set_pixels_above_lines">
+      <method name="scroll_to_path"
+              c:identifier="gtk_icon_view_scroll_to_path">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="pixels_above_lines">
-            <type name="gint" c:type="gint"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="use_align">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="row_align">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="col_align">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_pixels_above_lines"
-              c:identifier="gtk_text_view_get_pixels_above_lines">
+      <method name="enable_model_drag_source"
+              c:identifier="gtk_icon_view_enable_model_drag_source">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="start_button_mask">
+            <type name="GdkModifierType" c:type="GdkModifierType"/>
+          </parameter>
+          <parameter name="targets">
+            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+          </parameter>
+          <parameter name="n_targets">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="actions">
+            <type name="GdkDragAction" c:type="GdkDragAction"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_pixels_below_lines"
-              c:identifier="gtk_text_view_set_pixels_below_lines">
+      <method name="enable_model_drag_dest"
+              c:identifier="gtk_icon_view_enable_model_drag_dest">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="pixels_below_lines">
-            <type name="gint" c:type="gint"/>
+          <parameter name="targets">
+            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+          </parameter>
+          <parameter name="n_targets">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="actions">
+            <type name="GdkDragAction" c:type="GdkDragAction"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_pixels_below_lines"
-              c:identifier="gtk_text_view_get_pixels_below_lines">
+      <method name="unset_model_drag_source"
+              c:identifier="gtk_icon_view_unset_model_drag_source">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_pixels_inside_wrap"
-              c:identifier="gtk_text_view_set_pixels_inside_wrap">
+      <method name="unset_model_drag_dest"
+              c:identifier="gtk_icon_view_unset_model_drag_dest">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="pixels_inside_wrap">
-            <type name="gint" c:type="gint"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_pixels_inside_wrap"
-              c:identifier="gtk_text_view_get_pixels_inside_wrap">
+      <method name="set_reorderable"
+              c:identifier="gtk_icon_view_set_reorderable">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="reorderable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_justification"
-              c:identifier="gtk_text_view_set_justification">
+      <method name="get_reorderable"
+              c:identifier="gtk_icon_view_get_reorderable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="justification">
-            <type name="Justification" c:type="GtkJustification"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_justification"
-              c:identifier="gtk_text_view_get_justification">
+      <method name="set_drag_dest_item"
+              c:identifier="gtk_icon_view_set_drag_dest_item">
         <return-value>
-          <type name="Justification" c:type="GtkJustification"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="path" allow-none="1">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="IconViewDropPosition"
+                  c:type="GtkIconViewDropPosition"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_left_margin"
-              c:identifier="gtk_text_view_set_left_margin">
+      <method name="get_drag_dest_item"
+              c:identifier="gtk_icon_view_get_drag_dest_item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="left_margin">
-            <type name="gint" c:type="gint"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="IconViewDropPosition"
+                  c:type="GtkIconViewDropPosition*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_left_margin"
-              c:identifier="gtk_text_view_get_left_margin">
+      <method name="get_dest_item_at_pos"
+              c:identifier="gtk_icon_view_get_dest_item_at_pos">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="drag_x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="drag_y">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="IconViewDropPosition"
+                  c:type="GtkIconViewDropPosition*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_right_margin"
-              c:identifier="gtk_text_view_set_right_margin">
+      <method name="create_drag_icon"
+              c:identifier="gtk_icon_view_create_drag_icon">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="right_margin">
-            <type name="gint" c:type="gint"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_right_margin"
-              c:identifier="gtk_text_view_get_right_margin">
+      <method name="convert_widget_to_bin_window_coords"
+              c:identifier="gtk_icon_view_convert_widget_to_bin_window_coords">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="wx">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="wy">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="bx">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="by">
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_indent" c:identifier="gtk_text_view_set_indent">
+      <method name="set_tooltip_item"
+              c:identifier="gtk_icon_view_set_tooltip_item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="indent">
-            <type name="gint" c:type="gint"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_indent" c:identifier="gtk_text_view_get_indent">
+      <method name="set_tooltip_cell"
+              c:identifier="gtk_icon_view_set_tooltip_cell">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tabs" c:identifier="gtk_text_view_set_tabs">
+      <method name="get_tooltip_context"
+              c:identifier="gtk_icon_view_get_tooltip_context">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="tabs">
-            <type name="PangoTabArray" c:type="PangoTabArray*"/>
+          <parameter name="x">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="keyboard_tip">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="model">
+            <type name="TreeModel" c:type="GtkTreeModel**"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tabs" c:identifier="gtk_text_view_get_tabs">
+      <method name="set_tooltip_column"
+              c:identifier="gtk_icon_view_set_tooltip_column">
         <return-value>
-          <type name="PangoTabArray" c:type="PangoTabArray*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_default_attributes"
-              c:identifier="gtk_text_view_get_default_attributes">
+      <method name="get_tooltip_column"
+              c:identifier="gtk_icon_view_get_tooltip_column">
         <return-value>
-          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="pixels-above-lines">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="pixels-below-lines">
-        <type name="gint" c:type="gint"/>
+      <property name="pixbuf-column">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="pixels-inside-wrap">
-        <type name="gint" c:type="gint"/>
+      <property name="text-column">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="editable">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="markup-column">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="wrap-mode">
-        <type name="GtkWrapMode" c:type="GtkWrapMode"/>
+      <property name="selection-mode">
+        <type name="GtkSelectionMode" c:type="GtkSelectionMode"/>
       </property>
-      <property name="justification">
-        <type name="GtkJustification" c:type="GtkJustification"/>
+      <property name="orientation">
+        <type name="GtkOrientation" c:type="GtkOrientation"/>
       </property>
-      <property name="left-margin">
-        <type name="gint" c:type="gint"/>
+      <property name="model">
+        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
       </property>
-      <property name="right-margin">
-        <type name="gint" c:type="gint"/>
+      <property name="columns">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="indent">
-        <type name="gint" c:type="gint"/>
+      <property name="item-width">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="tabs">
-        <type name="PangoTabArray" c:type="PangoTabArray"/>
+      <property name="spacing">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="cursor-visible">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="row-spacing">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="buffer">
-        <type name="GtkTextBuffer" c:type="GtkTextBuffer"/>
+      <property name="column-spacing">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="overwrite">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="margin">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="accepts-tab">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="reorderable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="tooltip-column">
+        <type name="int32" c:type="gint"/>
       </property>
       <callback name="set_scroll_adjustments">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="GtkIconView*" c:type="GtkIconView*"/>
           </parameter>
           <parameter name="hadjustment">
             <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
@@ -54592,11351 +49349,17326 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="populate_popup">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="menu">
-            <type name="GtkMenu*" c:type="GtkMenu*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="move_cursor">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="step">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="extend_selection">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="page_horizontally">
+      <callback name="item_activated">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="icon_view">
+            <type name="GtkIconView*" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="extend_selection">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_anchor">
+      <callback name="selection_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="GtkIconView*" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="insert_at_cursor">
+      <callback name="select_all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="str">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="icon_view">
+            <type name="GtkIconView*" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="delete_from_cursor">
+      <callback name="unselect_all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="GtkDeleteType" c:type="GtkDeleteType"/>
-          </parameter>
-          <parameter name="count">
-            <type name="gint" c:type="gint"/>
+          <parameter name="icon_view">
+            <type name="GtkIconView*" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="backspace">
+      <callback name="select_cursor_item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="GtkIconView*" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="cut_clipboard">
+      <callback name="toggle_cursor_item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="GtkIconView*" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="copy_clipboard">
+      <callback name="move_cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+          <parameter name="icon_view">
+            <type name="GtkIconView*" c:type="GtkIconView*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="paste_clipboard">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+          <parameter name="step">
+            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="toggle_overwrite">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="move_focus">
+      <callback name="activate_cursor_item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="direction">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+          <parameter name="icon_view">
+            <type name="GtkIconView*" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved5">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved6">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved7">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
       <glib:signal name="move-cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
             <type name="GtkMovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="p0">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="copy-clipboard">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="populate-popup">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkMenu" c:type="GtkMenu"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="insert-at-cursor">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gchararray" c:type="gchararray"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="delete-from-cursor">
+      <glib:signal name="set-scroll-adjustments">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkDeleteType" c:type="GtkDeleteType"/>
+            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
           </parameter>
           <parameter name="p0">
-            <type name="gint" c:type="gint"/>
+            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="backspace">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="cut-clipboard">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="paste-clipboard">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="toggle-overwrite">
+      <glib:signal name="select-all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="set-scroll-adjustments">
+      <glib:signal name="unselect-all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
-          </parameter>
-        </parameters>
       </glib:signal>
-      <glib:signal name="select-all">
+      <glib:signal name="selection-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
       </glib:signal>
-      <glib:signal name="page-horizontally">
+      <glib:signal name="item-activated">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="GtkTreePath" c:type="GtkTreePath"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="move-viewport">
+      <glib:signal name="select-cursor-item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkScrollStep" c:type="GtkScrollStep"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
       </glib:signal>
-      <glib:signal name="set-anchor">
+      <glib:signal name="toggle-cursor-item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="toggle-cursor-visible">
+      <glib:signal name="activate-cursor-item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
       </glib:signal>
     </class>
-    <function name="text_view_new" c:identifier="gtk_text_view_new">
+    <function name="icon_view_new" c:identifier="gtk_icon_view_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
     </function>
-    <function name="text_view_new_with_buffer"
-              c:identifier="gtk_text_view_new_with_buffer">
+    <function name="icon_view_new_with_model"
+              c:identifier="gtk_icon_view_new_with_model">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkPixmap" c:type="GtkPixmap">
-      <field name="misc">
-        <type name="GtkMisc" c:type="GtkMisc"/>
-      </field>
-      <field name="pixmap">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
-      </field>
-      <field name="mask">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
-      </field>
-      <field name="pixmap_insensitive">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
-      </field>
-      <field name="build_insensitive">
-        <type name="guint" c:type="guint"/>
-      </field>
-    </record>
-    <function name="pixmap_get_type" c:identifier="gtk_pixmap_get_type">
-      <return-value>
-        <type name="GtkType" c:type="GtkType"/>
-      </return-value>
-    </function>
-    <function name="pixmap_new" c:identifier="gtk_pixmap_new">
+    <class name="ImageMenuItem"
+           c:type="GtkImageMenuItem"
+           parent="MenuItem"
+           glib:type-name="GtkImageMenuItem"
+           glib:get-type="gtk_image_menu_item_get_type">
+      <method name="set_image" c:identifier="gtk_image_menu_item_set_image">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="image_menu_item">
+            <type name="ImageMenuItem" c:type="GtkImageMenuItem*"/>
+          </parameter>
+          <parameter name="image" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_image" c:identifier="gtk_image_menu_item_get_image">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="image_menu_item">
+            <type name="ImageMenuItem" c:type="GtkImageMenuItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="image">
+        <type name="GtkWidget" c:type="GtkWidget"/>
+      </property>
+    </class>
+    <function name="image_menu_item_new"
+              c:identifier="gtk_image_menu_item_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="pixmap_set" c:identifier="gtk_pixmap_set">
+    <function name="image_menu_item_new_with_label"
+              c:identifier="gtk_image_menu_item_new_with_label">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="pixmap">
-          <type name="GtkPixmap" c:type="GtkPixmap*"/>
-        </parameter>
-        <parameter name="val">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="pixmap_get" c:identifier="gtk_pixmap_get">
+    <function name="image_menu_item_new_with_mnemonic"
+              c:identifier="gtk_image_menu_item_new_with_mnemonic">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="pixmap">
-          <type name="GtkPixmap" c:type="GtkPixmap*"/>
-        </parameter>
-        <parameter name="val">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="pixmap_set_build_insensitive"
-              c:identifier="gtk_pixmap_set_build_insensitive">
+    <function name="image_menu_item_new_from_stock"
+              c:identifier="gtk_image_menu_item_new_from_stock">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="pixmap">
-          <type name="GtkPixmap" c:type="GtkPixmap*"/>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="build">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="accel_group">
+          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkToolbarChild" c:type="GtkToolbarChild">
-      <field name="type">
-        <type name="GtkToolbarChildType" c:type="GtkToolbarChildType"/>
-      </field>
-      <field name="widget">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </field>
-      <field name="icon">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </field>
-      <field name="label">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </field>
-    </record>
-    <record name="GtkToolbarPrivate" c:type="GtkToolbarPrivate"/>
-    <class name="Toolbar"
-           c:type="GtkToolbar"
-           parent="Container"
-           glib:type-name="GtkToolbar"
-           glib:get-type="gtk_toolbar_get_type">
-      <method name="insert" c:identifier="gtk_toolbar_insert">
+    <class name="IMContextSimple"
+           c:type="GtkIMContextSimple"
+           parent="IMContext"
+           glib:type-name="GtkIMContextSimple"
+           glib:get-type="gtk_im_context_simple_get_type">
+      <method name="add_table" c:identifier="gtk_im_context_simple_add_table">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="context_simple">
+            <type name="IMContextSimple" c:type="GtkIMContextSimple*"/>
           </parameter>
-          <parameter name="item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="data">
+            <type name="guint16" c:type="guint16*"/>
           </parameter>
-          <parameter name="pos">
-            <type name="gint" c:type="gint"/>
+          <parameter name="max_seq_len">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="n_seqs">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_item_index" c:identifier="gtk_toolbar_get_item_index">
+    </class>
+    <record name="GtkIMMulticontextPrivate" c:type="GtkIMMulticontextPrivate"/>
+    <class name="IMMulticontext"
+           c:type="GtkIMMulticontext"
+           parent="IMContext"
+           glib:type-name="GtkIMMulticontext"
+           glib:get-type="gtk_im_multicontext_get_type">
+      <method name="append_menuitems"
+              c:identifier="gtk_im_multicontext_append_menuitems">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="context">
+            <type name="IMMulticontext" c:type="GtkIMMulticontext*"/>
           </parameter>
-          <parameter name="item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="menushell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_n_items" c:identifier="gtk_toolbar_get_n_items">
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_nth_item" c:identifier="gtk_toolbar_get_nth_item">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="ToolItem" c:type="GtkToolItem*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="n">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_show_arrow" c:identifier="gtk_toolbar_get_show_arrow">
+      </callback>
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_show_arrow" c:identifier="gtk_toolbar_set_show_arrow">
+      </callback>
+      <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="show_arrow">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_orientation" c:identifier="gtk_toolbar_get_orientation">
+      </callback>
+    </class>
+    <function name="im_multicontext_new"
+              c:identifier="gtk_im_multicontext_new">
+      <return-value>
+        <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+      </return-value>
+    </function>
+    <class name="InputDialog"
+           c:type="GtkInputDialog"
+           parent="Dialog"
+           glib:type-name="GtkInputDialog"
+           glib:get-type="gtk_input_dialog_get_type">
+      <callback name="enable_device">
         <return-value>
-          <type name="Orientation" c:type="GtkOrientation"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="inputd">
+            <type name="GtkInputDialog*" c:type="GtkInputDialog*"/>
+          </parameter>
+          <parameter name="device">
+            <type name="GdkDevice*" c:type="GdkDevice*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_orientation" c:identifier="gtk_toolbar_set_orientation">
+      </callback>
+      <callback name="disable_device">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="inputd">
+            <type name="GtkInputDialog*" c:type="GtkInputDialog*"/>
           </parameter>
-          <parameter name="orientation">
-            <type name="Orientation" c:type="GtkOrientation"/>
+          <parameter name="device">
+            <type name="GdkDevice*" c:type="GdkDevice*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_tooltips" c:identifier="gtk_toolbar_get_tooltips">
+      </callback>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_tooltips" c:identifier="gtk_toolbar_set_tooltips">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="enable">
-            <type name="gboolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_style" c:identifier="gtk_toolbar_get_style">
+      </callback>
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_style" c:identifier="gtk_toolbar_set_style">
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="enable-device">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="style">
-            <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
+          <parameter name="object">
+            <type name="GdkDevice" c:type="GdkDevice"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="unset_style" c:identifier="gtk_toolbar_unset_style">
+      </glib:signal>
+      <glib:signal name="disable-device">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="object">
+            <type name="GdkDevice" c:type="GdkDevice"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_icon_size" c:identifier="gtk_toolbar_get_icon_size">
+      </glib:signal>
+    </class>
+    <function name="input_dialog_new" c:identifier="gtk_input_dialog_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="Invisible"
+           c:type="GtkInvisible"
+           parent="Widget"
+           glib:type-name="GtkInvisible"
+           glib:get-type="gtk_invisible_get_type">
+      <method name="set_screen" c:identifier="gtk_invisible_set_screen">
         <return-value>
-          <type name="IconSize" c:type="GtkIconSize"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="invisible">
+            <type name="Invisible" c:type="GtkInvisible*"/>
+          </parameter>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_relief_style"
-              c:identifier="gtk_toolbar_get_relief_style">
+      <method name="get_screen" c:identifier="gtk_invisible_get_screen">
         <return-value>
-          <type name="ReliefStyle" c:type="GtkReliefStyle"/>
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="invisible">
+            <type name="Invisible" c:type="GtkInvisible*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_drop_index" c:identifier="gtk_toolbar_get_drop_index">
+      <property name="screen">
+        <type name="GdkScreen" c:type="GdkScreen"/>
+      </property>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_drop_highlight_item"
-              c:identifier="gtk_toolbar_set_drop_highlight_item">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
-          </parameter>
-          <parameter name="index_">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_icon_size" c:identifier="gtk_toolbar_set_icon_size">
+      </callback>
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="icon_size">
-            <type name="IconSize" c:type="GtkIconSize"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unset_icon_size" c:identifier="gtk_toolbar_unset_icon_size">
+      </callback>
+      <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="append_item" c:identifier="gtk_toolbar_append_item">
+      </callback>
+    </class>
+    <function name="invisible_new" c:identifier="gtk_invisible_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="invisible_new_for_screen"
+              c:identifier="gtk_invisible_new_for_screen">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="screen">
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Layout"
+           c:type="GtkLayout"
+           parent="Container"
+           glib:type-name="GtkLayout"
+           glib:get-type="gtk_layout_get_type">
+      <method name="put" c:identifier="gtk_layout_put">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="char" c:type="char*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
-          <parameter name="icon">
+          <parameter name="child_widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prepend_item" c:identifier="gtk_toolbar_prepend_item">
+      <method name="move" c:identifier="gtk_layout_move">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="char" c:type="char*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
-          <parameter name="icon">
+          <parameter name="child_widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_item" c:identifier="gtk_toolbar_insert_item">
+      <method name="set_size" c:identifier="gtk_layout_set_size">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="icon">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="width">
+            <type name="guint" c:type="guint"/>
           </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="height">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_stock" c:identifier="gtk_toolbar_insert_stock">
+      <method name="get_size" c:identifier="gtk_layout_get_size">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="stock_id">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="width">
+            <type name="guint" c:type="guint*"/>
           </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="height">
+            <type name="guint" c:type="guint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="append_space" c:identifier="gtk_toolbar_append_space">
+      <method name="get_hadjustment" c:identifier="gtk_layout_get_hadjustment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prepend_space" c:identifier="gtk_toolbar_prepend_space">
+      <method name="get_vadjustment" c:identifier="gtk_layout_get_vadjustment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_space" c:identifier="gtk_toolbar_insert_space">
+      <method name="set_hadjustment" c:identifier="gtk_layout_set_hadjustment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="adjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_space" c:identifier="gtk_toolbar_remove_space">
+      <method name="set_vadjustment" c:identifier="gtk_layout_set_vadjustment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="adjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="append_element" c:identifier="gtk_toolbar_append_element">
+      <method name="freeze" c:identifier="gtk_layout_freeze">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="icon">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prepend_element" c:identifier="gtk_toolbar_prepend_element">
+      <method name="thaw" c:identifier="gtk_layout_thaw">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="icon">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_element" c:identifier="gtk_toolbar_insert_element">
+      <property name="hadjustment">
+        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="vadjustment">
+        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="width">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <property name="height">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <callback name="set_scroll_adjustments">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="icon">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          <parameter name="layout">
+            <type name="GtkLayout*" c:type="GtkLayout*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="hadjustment">
+            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
           </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="vadjustment">
+            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="append_widget" c:identifier="gtk_toolbar_append_widget">
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="set-scroll-adjustments">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="char" c:type="char*"/>
+          <parameter name="object">
+            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
           </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="char" c:type="char*"/>
+          <parameter name="p0">
+            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="prepend_widget" c:identifier="gtk_toolbar_prepend_widget">
+      </glib:signal>
+    </class>
+    <function name="layout_new" c:identifier="gtk_layout_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="hadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameter>
+        <parameter name="vadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkLinkButtonPrivate" c:type="GtkLinkButtonPrivate"/>
+    <callback name="GtkLinkButtonUriFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="button">
+          <type name="GtkLinkButton*" c:type="GtkLinkButton*"/>
+        </parameter>
+        <parameter name="link_">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="LinkButton"
+           c:type="GtkLinkButton"
+           parent="Button"
+           glib:type-name="GtkLinkButton"
+           glib:get-type="gtk_link_button_get_type">
+      <method name="get_uri" c:identifier="gtk_link_button_get_uri">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="char" c:type="char*"/>
+          <parameter name="link_button">
+            <type name="LinkButton" c:type="GtkLinkButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_widget" c:identifier="gtk_toolbar_insert_widget">
+      <method name="set_uri" c:identifier="gtk_link_button_set_uri">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="char" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="char" c:type="char*"/>
+          <parameter name="link_button">
+            <type name="LinkButton" c:type="GtkLinkButton*"/>
           </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="orientation">
-        <type name="GtkOrientation" c:type="GtkOrientation"/>
-      </property>
-      <property name="toolbar-style">
-        <type name="GtkToolbarStyle" c:type="GtkToolbarStyle"/>
-      </property>
-      <property name="show-arrow">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="tooltips">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="icon-size">
-        <type name="GtkIconSize" c:type="GtkIconSize"/>
-      </property>
-      <property name="icon-size-set">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="uri">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <callback name="orientation_changed">
+      <callback name="_gtk_padding1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_padding2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_padding3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_padding4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="link_button_new" c:identifier="gtk_link_button_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="uri">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="link_button_new_with_label"
+              c:identifier="gtk_link_button_new_with_label">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="uri">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="label" allow-none="1">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="link_button_set_uri_hook"
+              c:identifier="gtk_link_button_set_uri_hook">
+      <return-value>
+        <type name="GtkLinkButtonUriFunc" c:type="GtkLinkButtonUriFunc"/>
+      </return-value>
+      <parameters>
+        <parameter name="func">
+          <type name="GtkLinkButtonUriFunc" c:type="GtkLinkButtonUriFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkListItem" c:type="GtkListItem">
+      <field name="item">
+        <type name="GtkItem" c:type="GtkItem"/>
+      </field>
+      <callback name="toggle_focus_row">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="list_item">
+            <type name="GtkListItem*" c:type="GtkListItem*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="select_all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="GtkToolbar*" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="orientation">
-            <type name="GtkOrientation" c:type="GtkOrientation"/>
+          <parameter name="list_item">
+            <type name="GtkListItem*" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="style_changed">
+      <callback name="unselect_all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="GtkToolbar*" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="style">
-            <type name="GtkToolbarStyle" c:type="GtkToolbarStyle"/>
+          <parameter name="list_item">
+            <type name="GtkListItem*" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="popup_context_menu">
+      <callback name="undo_selection">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="GtkToolbar*" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
+          <parameter name="list_item">
+            <type name="GtkListItem*" c:type="GtkListItem*"/>
           </parameter>
-          <parameter name="button_number">
-            <type name="gint" c:type="gint"/>
+        </parameters>
+      </callback>
+      <callback name="start_selection">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="list_item">
+            <type name="GtkListItem*" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="end_selection">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="list_item">
+            <type name="GtkListItem*" c:type="GtkListItem*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="extend_selection">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="list_item">
+            <type name="GtkListItem*" c:type="GtkListItem*"/>
+          </parameter>
+          <parameter name="scroll_type">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="auto_start_selection">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="scroll_horizontal">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="list_item">
+            <type name="GtkListItem*" c:type="GtkListItem*"/>
+          </parameter>
+          <parameter name="scroll_type">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+        </parameters>
       </callback>
-      <glib:signal name="orientation-changed">
+      <callback name="scroll_vertical">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkOrientation" c:type="GtkOrientation"/>
+          <parameter name="list_item">
+            <type name="GtkListItem*" c:type="GtkListItem*"/>
+          </parameter>
+          <parameter name="scroll_type">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="style-changed">
+      </callback>
+      <callback name="toggle_add_mode">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkToolbarStyle" c:type="GtkToolbarStyle"/>
+          <parameter name="list_item">
+            <type name="GtkListItem*" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="popup-context-menu">
+      </callback>
+    </record>
+    <function name="list_item_get_type" c:identifier="gtk_list_item_get_type">
+      <return-value>
+        <type name="GtkType" c:type="GtkType"/>
+      </return-value>
+    </function>
+    <function name="list_item_new" c:identifier="gtk_list_item_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="list_item_new_with_label"
+              c:identifier="gtk_list_item_new_with_label">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_item_select" c:identifier="gtk_list_item_select">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list_item">
+          <type name="GtkListItem" c:type="GtkListItem*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_item_deselect" c:identifier="gtk_list_item_deselect">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list_item">
+          <type name="GtkListItem" c:type="GtkListItem*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkList" c:type="GtkList">
+      <field name="container">
+        <type name="GtkContainer" c:type="GtkContainer"/>
+      </field>
+      <field name="children">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="selection">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="undo_selection">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="undo_unselection">
+        <type name="GList*" c:type="GList*"/>
+      </field>
+      <field name="last_focus_child">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="undo_focus_child">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="htimer">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="vtimer">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="anchor">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="drag_pos">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="anchor_state">
+        <type name="GtkStateType" c:type="GtkStateType"/>
+      </field>
+      <field name="selection_mode">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="drag_selection">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="add_mode">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <callback name="selection_changed">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gint" c:type="gint"/>
+          <parameter name="list">
+            <type name="GtkList*" c:type="GtkList*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="gint" c:type="gint"/>
+        </parameters>
+      </callback>
+      <callback name="select_child">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="list">
+            <type name="GtkList*" c:type="GtkList*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="gint" c:type="gint"/>
+          <parameter name="child">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="focus-home-or-end">
+      </callback>
+      <callback name="unselect_child">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="list">
+            <type name="GtkList*" c:type="GtkList*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="toolbar_new" c:identifier="gtk_toolbar_new">
+      </callback>
+    </record>
+    <function name="list_get_type" c:identifier="gtk_list_get_type">
+      <return-value>
+        <type name="GtkType" c:type="GtkType"/>
+      </return-value>
+    </function>
+    <function name="list_new" c:identifier="gtk_list_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="list_insert_items" c:identifier="gtk_list_insert_items">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="items">
+          <type name="GList" c:type="GList*"/>
+        </parameter>
+        <parameter name="position">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_append_items" c:identifier="gtk_list_append_items">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="items">
+          <type name="GList" c:type="GList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_prepend_items" c:identifier="gtk_list_prepend_items">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="items">
+          <type name="GList" c:type="GList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_remove_items" c:identifier="gtk_list_remove_items">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="items">
+          <type name="GList" c:type="GList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_remove_items_no_unref"
+              c:identifier="gtk_list_remove_items_no_unref">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="items">
+          <type name="GList" c:type="GList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_clear_items" c:identifier="gtk_list_clear_items">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="start">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="end">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_select_item" c:identifier="gtk_list_select_item">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="item">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_unselect_item" c:identifier="gtk_list_unselect_item">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="item">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_select_child" c:identifier="gtk_list_select_child">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="child">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_unselect_child"
+              c:identifier="gtk_list_unselect_child">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="child">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_child_position"
+              c:identifier="gtk_list_child_position">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="child">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_set_selection_mode"
+              c:identifier="gtk_list_set_selection_mode">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="mode">
+          <type name="SelectionMode" c:type="GtkSelectionMode"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_extend_selection"
+              c:identifier="gtk_list_extend_selection">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="scroll_type">
+          <type name="ScrollType" c:type="GtkScrollType"/>
+        </parameter>
+        <parameter name="position">
+          <type name="float" c:type="gfloat"/>
+        </parameter>
+        <parameter name="auto_start_selection">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_start_selection"
+              c:identifier="gtk_list_start_selection">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_end_selection" c:identifier="gtk_list_end_selection">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_select_all" c:identifier="gtk_list_select_all">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_unselect_all" c:identifier="gtk_list_unselect_all">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_scroll_horizontal"
+              c:identifier="gtk_list_scroll_horizontal">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="scroll_type">
+          <type name="ScrollType" c:type="GtkScrollType"/>
+        </parameter>
+        <parameter name="position">
+          <type name="float" c:type="gfloat"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_scroll_vertical"
+              c:identifier="gtk_list_scroll_vertical">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="scroll_type">
+          <type name="ScrollType" c:type="GtkScrollType"/>
+        </parameter>
+        <parameter name="position">
+          <type name="float" c:type="gfloat"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_toggle_add_mode"
+              c:identifier="gtk_list_toggle_add_mode">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_toggle_focus_row"
+              c:identifier="gtk_list_toggle_focus_row">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_toggle_row" c:identifier="gtk_list_toggle_row">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="item">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_undo_selection"
+              c:identifier="gtk_list_undo_selection">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="list_end_drag_selection"
+              c:identifier="gtk_list_end_drag_selection">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <callback name="GtkKeySnoopFunc">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="grab_widget">
+          <type name="GtkWidget*" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="event">
+          <type name="GdkEventKey*" c:type="GdkEventKey*"/>
+        </parameter>
+        <parameter name="func_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <function name="check_version" c:identifier="gtk_check_version">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="required_major">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="required_minor">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="required_micro">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="parse_args" c:identifier="gtk_parse_args">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
+      <parameters>
+        <parameter name="argc">
+          <type name="int" c:type="int*"/>
+        </parameter>
+        <parameter name="argv">
+          <type name="char" c:type="char***"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="toolbar_elide_underscores"
-              c:identifier="_gtk_toolbar_elide_underscores">
+    <function name="init" c:identifier="gtk_init">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="original">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="argc">
+          <type name="int" c:type="int*"/>
+        </parameter>
+        <parameter name="argv">
+          <type name="char" c:type="char***"/>
         </parameter>
       </parameters>
     </function>
-    <function name="toolbar_paint_space_line"
-              c:identifier="_gtk_toolbar_paint_space_line">
+    <function name="init_check" c:identifier="gtk_init_check">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="argc">
+          <type name="int" c:type="int*"/>
         </parameter>
-        <parameter name="toolbar">
-          <type name="Toolbar" c:type="GtkToolbar*"/>
+        <parameter name="argv">
+          <type name="char" c:type="char***"/>
         </parameter>
-        <parameter name="area">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+      </parameters>
+    </function>
+    <function name="init_with_args" c:identifier="gtk_init_with_args">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="argc">
+          <type name="int" c:type="int*"/>
         </parameter>
-        <parameter name="allocation">
-          <type name="GtkAllocation" c:type="GtkAllocation*"/>
+        <parameter name="argv">
+          <type name="char" c:type="char***"/>
+        </parameter>
+        <parameter name="parameter_string">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="entries">
+          <type name="GOptionEntry" c:type="GOptionEntry*"/>
+        </parameter>
+        <parameter name="translation_domain">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="toolbar_get_default_space_size"
-              c:identifier="_gtk_toolbar_get_default_space_size">
+    <function name="get_option_group" c:identifier="gtk_get_option_group">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="GOptionGroup*" c:type="GOptionGroup*"/>
       </return-value>
+      <parameters>
+        <parameter name="open_default_display">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
     </function>
-    <record name="GtkToolShell" c:type="GtkToolShell"/>
-    <interface name="ToolShell"
-               c:type="GtkToolShell"
-               glib:type-name="GtkToolShell"
-               glib:get-type="gtk_tool_shell_get_type">
-      <callback name="get_icon_size">
-        <return-value>
-          <type name="GtkIconSize" c:type="GtkIconSize"/>
-        </return-value>
-        <parameters>
-          <parameter name="shell">
-            <type name="GtkToolShell*" c:type="GtkToolShell*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_orientation">
-        <return-value>
-          <type name="GtkOrientation" c:type="GtkOrientation"/>
-        </return-value>
-        <parameters>
-          <parameter name="shell">
-            <type name="GtkToolShell*" c:type="GtkToolShell*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_style">
-        <return-value>
-          <type name="GtkToolbarStyle" c:type="GtkToolbarStyle"/>
-        </return-value>
-        <parameters>
-          <parameter name="shell">
-            <type name="GtkToolShell*" c:type="GtkToolShell*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_relief_style">
-        <return-value>
-          <type name="GtkReliefStyle" c:type="GtkReliefStyle"/>
-        </return-value>
-        <parameters>
-          <parameter name="shell">
-            <type name="GtkToolShell*" c:type="GtkToolShell*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="rebuild_menu">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="shell">
-            <type name="GtkToolShell*" c:type="GtkToolShell*"/>
-          </parameter>
-        </parameters>
-      </callback>
-    </interface>
-    <function name="tool_shell_get_icon_size"
-              c:identifier="gtk_tool_shell_get_icon_size">
+    <function name="exit" c:identifier="gtk_exit">
       <return-value>
-        <type name="GtkIconSize" c:type="GtkIconSize"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="shell">
-          <type name="ToolShell" c:type="GtkToolShell*"/>
+        <parameter name="error_code">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tool_shell_get_orientation"
-              c:identifier="gtk_tool_shell_get_orientation">
+    <function name="disable_setlocale" c:identifier="gtk_disable_setlocale">
       <return-value>
-        <type name="GtkOrientation" c:type="GtkOrientation"/>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="set_locale" c:identifier="gtk_set_locale">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+    </function>
+    <function name="get_default_language"
+              c:identifier="gtk_get_default_language">
+      <return-value>
+        <type name="PangoLanguage*" c:type="PangoLanguage*"/>
+      </return-value>
+    </function>
+    <function name="events_pending" c:identifier="gtk_events_pending">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+    </function>
+    <function name="main_do_event" c:identifier="gtk_main_do_event">
+      <return-value>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="shell">
-          <type name="ToolShell" c:type="GtkToolShell*"/>
+        <parameter name="event">
+          <type name="GdkEvent" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tool_shell_get_style"
-              c:identifier="gtk_tool_shell_get_style">
+    <function name="main" c:identifier="gtk_main">
       <return-value>
-        <type name="GtkToolbarStyle" c:type="GtkToolbarStyle"/>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="main_level" c:identifier="gtk_main_level">
+      <return-value>
+        <type name="guint" c:type="guint"/>
+      </return-value>
+    </function>
+    <function name="main_quit" c:identifier="gtk_main_quit">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="main_iteration" c:identifier="gtk_main_iteration">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+    </function>
+    <function name="main_iteration_do" c:identifier="gtk_main_iteration_do">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="shell">
-          <type name="ToolShell" c:type="GtkToolShell*"/>
+        <parameter name="blocking">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tool_shell_get_relief_style"
-              c:identifier="gtk_tool_shell_get_relief_style">
+    <function name="true" c:identifier="gtk_true">
       <return-value>
-        <type name="GtkReliefStyle" c:type="GtkReliefStyle"/>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+    </function>
+    <function name="false" c:identifier="gtk_false">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+    </function>
+    <function name="grab_add" c:identifier="gtk_grab_add">
+      <return-value>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="shell">
-          <type name="ToolShell" c:type="GtkToolShell*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tool_shell_rebuild_menu"
-              c:identifier="gtk_tool_shell_rebuild_menu">
+    <function name="grab_get_current" c:identifier="gtk_grab_get_current">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="grab_remove" c:identifier="gtk_grab_remove">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="shell">
-          <type name="ToolShell" c:type="GtkToolShell*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="test_init" c:identifier="gtk_test_init">
+    <function name="init_add" c:identifier="gtk_init_add">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="argcp">
-          <type name="int" c:type="int*"/>
+        <parameter name="function">
+          <type name="GtkFunction" c:type="GtkFunction"/>
         </parameter>
-        <parameter name="argvp">
-          <type name="char" c:type="char***"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="test_register_all_types"
-              c:identifier="gtk_test_register_all_types">
+    <function name="quit_add_destroy" c:identifier="gtk_quit_add_destroy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="main_level">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="object">
+          <type name="GtkObject" c:type="GtkObject*"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="test_list_all_types" c:identifier="gtk_test_list_all_types">
+    <function name="quit_add" c:identifier="gtk_quit_add">
       <return-value>
-        <type name="GType*" c:type="GType*"/>
+        <type name="guint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="n_types">
-          <type name="guint" c:type="guint*"/>
+        <parameter name="main_level">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="function">
+          <type name="GtkFunction" c:type="GtkFunction"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="test_find_widget" c:identifier="gtk_test_find_widget">
+    <function name="quit_add_full" c:identifier="gtk_quit_add_full">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="guint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="main_level">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="label_pattern">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="function">
+          <type name="GtkFunction" c:type="GtkFunction"/>
         </parameter>
-        <parameter name="widget_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="marshal">
+          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
-    <function name="test_create_widget" c:identifier="gtk_test_create_widget">
+    <function name="quit_remove" c:identifier="gtk_quit_remove">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="quit_handler_id">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="first_property_name">
-          <type name="gchar" c:type="gchar*"/>
+      </parameters>
+    </function>
+    <function name="quit_remove_by_data"
+              c:identifier="gtk_quit_remove_by_data">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="test_create_simple_window"
-              c:identifier="gtk_test_create_simple_window">
+    <function name="timeout_add" c:identifier="gtk_timeout_add">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="guint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="window_title">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="interval">
+          <type name="uint32" c:type="guint32"/>
         </parameter>
-        <parameter name="dialog_text">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="function">
+          <type name="GtkFunction" c:type="GtkFunction"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="test_display_button_window"
-              c:identifier="gtk_test_display_button_window">
+    <function name="timeout_add_full" c:identifier="gtk_timeout_add_full">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="guint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="window_title">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="interval">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+        <parameter name="function">
+          <type name="GtkFunction" c:type="GtkFunction"/>
+        </parameter>
+        <parameter name="marshal">
+          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="dialog_text">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="destroy">
+          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
-    <function name="test_slider_set_perc"
-              c:identifier="gtk_test_slider_set_perc">
+    <function name="timeout_remove" c:identifier="gtk_timeout_remove">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="percentage">
-          <type name="double" c:type="double"/>
+        <parameter name="timeout_handler_id">
+          <type name="guint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="test_slider_get_value"
-              c:identifier="gtk_test_slider_get_value">
+    <function name="idle_add" c:identifier="gtk_idle_add">
       <return-value>
-        <type name="double" c:type="double"/>
+        <type name="guint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="function">
+          <type name="GtkFunction" c:type="GtkFunction"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="test_spin_button_click"
-              c:identifier="gtk_test_spin_button_click">
+    <function name="idle_add_priority" c:identifier="gtk_idle_add_priority">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="guint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="spinner">
-          <type name="SpinButton" c:type="GtkSpinButton*"/>
+        <parameter name="priority">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="button">
-          <type name="guint" c:type="guint"/>
+        <parameter name="function">
+          <type name="GtkFunction" c:type="GtkFunction"/>
         </parameter>
-        <parameter name="upwards">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="test_widget_click" c:identifier="gtk_test_widget_click">
+    <function name="idle_add_full" c:identifier="gtk_idle_add_full">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="guint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="priority">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="button">
+        <parameter name="function">
+          <type name="GtkFunction" c:type="GtkFunction"/>
+        </parameter>
+        <parameter name="marshal">
+          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="idle_remove" c:identifier="gtk_idle_remove">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="idle_handler_id">
           <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="modifiers">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
+      </parameters>
+    </function>
+    <function name="idle_remove_by_data"
+              c:identifier="gtk_idle_remove_by_data">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="test_widget_send_key"
-              c:identifier="gtk_test_widget_send_key">
+    <function name="input_add_full" c:identifier="gtk_input_add_full">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="guint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="source">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="keyval">
+        <parameter name="condition">
+          <type name="GdkInputCondition" c:type="GdkInputCondition"/>
+        </parameter>
+        <parameter name="function">
+          <type name="GdkInputFunction" c:type="GdkInputFunction"/>
+        </parameter>
+        <parameter name="marshal">
+          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="input_remove" c:identifier="gtk_input_remove">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="input_handler_id">
           <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="modifiers">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
+      </parameters>
+    </function>
+    <function name="key_snooper_install"
+              c:identifier="gtk_key_snooper_install">
+      <return-value>
+        <type name="guint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="snooper">
+          <type name="GtkKeySnoopFunc" c:type="GtkKeySnoopFunc"/>
+        </parameter>
+        <parameter name="func_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="test_text_set" c:identifier="gtk_test_text_set">
+    <function name="key_snooper_remove" c:identifier="gtk_key_snooper_remove">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="snooper_handler_id">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="string">
-          <type name="gchar" c:type="gchar*"/>
+      </parameters>
+    </function>
+    <function name="get_current_event" c:identifier="gtk_get_current_event">
+      <return-value>
+        <type name="GdkEvent*" c:type="GdkEvent*"/>
+      </return-value>
+    </function>
+    <function name="get_current_event_time"
+              c:identifier="gtk_get_current_event_time">
+      <return-value>
+        <type name="uint32" c:type="guint32"/>
+      </return-value>
+    </function>
+    <function name="get_current_event_state"
+              c:identifier="gtk_get_current_event_state">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="state">
+          <type name="GdkModifierType" c:type="GdkModifierType*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="get_event_widget" c:identifier="gtk_get_event_widget">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="event">
+          <type name="GdkEvent" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="test_text_get" c:identifier="gtk_test_text_get">
+    <function name="propagate_event" c:identifier="gtk_propagate_event">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="widget">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
+        <parameter name="event">
+          <type name="GdkEvent" c:type="GdkEvent*"/>
+        </parameter>
       </parameters>
     </function>
-    <function name="test_find_sibling" c:identifier="gtk_test_find_sibling">
+    <function name="boolean_handled_accumulator"
+              c:identifier="_gtk_boolean_handled_accumulator">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="base_widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="ihint">
+          <type name="GSignalInvocationHint" c:type="GSignalInvocationHint*"/>
         </parameter>
-        <parameter name="widget_type">
-          <type name="GType" c:type="GType"/>
+        <parameter name="return_accu">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="handler_return">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="dummy">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="test_find_label" c:identifier="gtk_test_find_label">
+    <function name="get_lc_ctype" c:identifier="_gtk_get_lc_ctype">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+    </function>
+    <class name="MenuBar"
+           c:type="GtkMenuBar"
+           parent="MenuShell"
+           glib:type-name="GtkMenuBar"
+           glib:get-type="gtk_menu_bar_get_type">
+      <method name="get_pack_direction"
+              c:identifier="gtk_menu_bar_get_pack_direction">
+        <return-value>
+          <type name="PackDirection" c:type="GtkPackDirection"/>
+        </return-value>
+        <parameters>
+          <parameter name="menubar">
+            <type name="MenuBar" c:type="GtkMenuBar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_pack_direction"
+              c:identifier="gtk_menu_bar_set_pack_direction">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menubar">
+            <type name="MenuBar" c:type="GtkMenuBar*"/>
+          </parameter>
+          <parameter name="pack_dir">
+            <type name="PackDirection" c:type="GtkPackDirection"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_child_pack_direction"
+              c:identifier="gtk_menu_bar_get_child_pack_direction">
+        <return-value>
+          <type name="PackDirection" c:type="GtkPackDirection"/>
+        </return-value>
+        <parameters>
+          <parameter name="menubar">
+            <type name="MenuBar" c:type="GtkMenuBar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_child_pack_direction"
+              c:identifier="gtk_menu_bar_set_child_pack_direction">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menubar">
+            <type name="MenuBar" c:type="GtkMenuBar*"/>
+          </parameter>
+          <parameter name="child_pack_dir">
+            <type name="PackDirection" c:type="GtkPackDirection"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="pack-direction">
+        <type name="GtkPackDirection" c:type="GtkPackDirection"/>
+      </property>
+      <property name="child-pack-direction">
+        <type name="GtkPackDirection" c:type="GtkPackDirection"/>
+      </property>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="menu_bar_new" c:identifier="gtk_menu_bar_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
+    </function>
+    <function name="menu_bar_cycle_focus"
+              c:identifier="_gtk_menu_bar_cycle_focus">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="menubar">
+          <type name="MenuBar" c:type="GtkMenuBar*"/>
         </parameter>
-        <parameter name="label_pattern">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="dir">
+          <type name="DirectionType" c:type="GtkDirectionType"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkTreeDragSource" c:type="GtkTreeDragSource"/>
-    <interface name="TreeDragSource"
-               c:type="GtkTreeDragSource"
-               glib:type-name="GtkTreeDragSource"
-               glib:get-type="gtk_tree_drag_source_get_type">
-      <callback name="row_draggable">
+    <record name="GtkToolItemPrivate" c:type="GtkToolItemPrivate"/>
+    <class name="ToolItem"
+           c:type="GtkToolItem"
+           parent="Bin"
+           glib:type-name="GtkToolItem"
+           glib:get-type="gtk_tool_item_get_type">
+      <constructor name="new" c:identifier="gtk_tool_item_new">
+        <return-value>
+          <type name="ToolItem" c:type="GtkToolItem*"/>
+        </return-value>
+      </constructor>
+      <method name="set_homogeneous"
+              c:identifier="gtk_tool_item_set_homogeneous">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
+          </parameter>
+          <parameter name="homogeneous">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_homogeneous"
+              c:identifier="gtk_tool_item_get_homogeneous">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="drag_source">
-            <type name="GtkTreeDragSource*" c:type="GtkTreeDragSource*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+        </parameters>
+      </method>
+      <method name="set_expand" c:identifier="gtk_tool_item_set_expand">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
+          </parameter>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_data_get">
+      </method>
+      <method name="get_expand" c:identifier="gtk_tool_item_get_expand">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="drag_source">
-            <type name="GtkTreeDragSource*" c:type="GtkTreeDragSource*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+        </parameters>
+      </method>
+      <method name="set_tooltip" c:identifier="gtk_tool_item_set_tooltip">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="selection_data">
-            <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
+          </parameter>
+          <parameter name="tip_text" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="tip_private" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_data_delete">
+      </method>
+      <method name="set_tooltip_text"
+              c:identifier="gtk_tool_item_set_tooltip_text">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="drag_source">
-            <type name="GtkTreeDragSource*" c:type="GtkTreeDragSource*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-    </interface>
-    <function name="tree_drag_source_row_draggable"
-              c:identifier="gtk_tree_drag_source_row_draggable">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drag_source">
-          <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_drag_source_drag_data_delete"
-              c:identifier="gtk_tree_drag_source_drag_data_delete">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drag_source">
-          <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_drag_source_drag_data_get"
-              c:identifier="gtk_tree_drag_source_drag_data_get">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drag_source">
-          <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkTreeDragDest" c:type="GtkTreeDragDest"/>
-    <interface name="TreeDragDest"
-               c:type="GtkTreeDragDest"
-               glib:type-name="GtkTreeDragDest"
-               glib:get-type="gtk_tree_drag_dest_get_type">
-      <callback name="drag_data_received">
+      </method>
+      <method name="set_tooltip_markup"
+              c:identifier="gtk_tool_item_set_tooltip_markup">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="drag_dest">
-            <type name="GtkTreeDragDest*" c:type="GtkTreeDragDest*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="dest">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          <parameter name="markup">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="selection_data">
-            <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+        </parameters>
+      </method>
+      <method name="set_use_drag_window"
+              c:identifier="gtk_tool_item_set_use_drag_window">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
+          </parameter>
+          <parameter name="use_drag_window">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="row_drop_possible">
+      </method>
+      <method name="get_use_drag_window"
+              c:identifier="gtk_tool_item_get_use_drag_window">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="drag_dest">
-            <type name="GtkTreeDragDest*" c:type="GtkTreeDragDest*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="dest_path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+        </parameters>
+      </method>
+      <method name="set_visible_horizontal"
+              c:identifier="gtk_tool_item_set_visible_horizontal">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="selection_data">
-            <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+          <parameter name="visible_horizontal">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-    </interface>
-    <function name="tree_drag_dest_drag_data_received"
-              c:identifier="gtk_tree_drag_dest_drag_data_received">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drag_dest">
-          <type name="TreeDragDest" c:type="GtkTreeDragDest*"/>
-        </parameter>
-        <parameter name="dest">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_drag_dest_row_drop_possible"
-              c:identifier="gtk_tree_drag_dest_row_drop_possible">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drag_dest">
-          <type name="TreeDragDest" c:type="GtkTreeDragDest*"/>
-        </parameter>
-        <parameter name="dest_path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_set_row_drag_data"
-              c:identifier="gtk_tree_set_row_drag_data">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_get_row_drag_data"
-              c:identifier="gtk_tree_get_row_drag_data">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel**"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="TreeModelSort"
-           c:type="GtkTreeModelSort"
-           parent="GLib.Object"
-           glib:type-name="GtkTreeModelSort"
-           glib:get-type="gtk_tree_model_sort_get_type">
-      <method name="get_model" c:identifier="gtk_tree_model_sort_get_model">
+      </method>
+      <method name="get_visible_horizontal"
+              c:identifier="gtk_tool_item_get_visible_horizontal">
         <return-value>
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="convert_child_path_to_path"
-              c:identifier="gtk_tree_model_sort_convert_child_path_to_path">
+      <method name="set_visible_vertical"
+              c:identifier="gtk_tool_item_set_visible_vertical">
         <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="child_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="visible_vertical">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="convert_child_iter_to_iter"
-              c:identifier="gtk_tree_model_sort_convert_child_iter_to_iter">
+      <method name="get_visible_vertical"
+              c:identifier="gtk_tool_item_get_visible_vertical">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
-          </parameter>
-          <parameter name="sort_iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="child_iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameters>
+      </method>
+      <method name="get_is_important"
+              c:identifier="gtk_tool_item_get_is_important">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="convert_path_to_child_path"
-              c:identifier="gtk_tree_model_sort_convert_path_to_child_path">
+      <method name="set_is_important"
+              c:identifier="gtk_tool_item_set_is_important">
         <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="sorted_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="is_important">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="convert_iter_to_child_iter"
-              c:identifier="gtk_tree_model_sort_convert_iter_to_child_iter">
+      <method name="get_icon_size" c:identifier="gtk_tool_item_get_icon_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="IconSize" c:type="GtkIconSize"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="child_iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameters>
+      </method>
+      <method name="get_orientation"
+              c:identifier="gtk_tool_item_get_orientation">
+        <return-value>
+          <type name="Orientation" c:type="GtkOrientation"/>
+        </return-value>
+        <parameters>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="sorted_iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameters>
+      </method>
+      <method name="get_toolbar_style"
+              c:identifier="gtk_tool_item_get_toolbar_style">
+        <return-value>
+          <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
+        </return-value>
+        <parameters>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="reset_default_sort_func"
-              c:identifier="gtk_tree_model_sort_reset_default_sort_func">
+      <method name="get_relief_style"
+              c:identifier="gtk_tool_item_get_relief_style">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="ReliefStyle" c:type="GtkReliefStyle"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="retrieve_proxy_menu_item"
+              c:identifier="gtk_tool_item_retrieve_proxy_menu_item">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clear_cache" c:identifier="gtk_tree_model_sort_clear_cache">
+      <method name="get_proxy_menu_item"
+              c:identifier="gtk_tool_item_get_proxy_menu_item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
+          </parameter>
+          <parameter name="menu_item_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="iter_is_valid"
-              c:identifier="gtk_tree_model_sort_iter_is_valid">
+      <method name="set_proxy_menu_item"
+              c:identifier="gtk_tool_item_set_proxy_menu_item">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="menu_item_id">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="menu_item" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+      <method name="rebuild_menu" c:identifier="gtk_tool_item_rebuild_menu">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="visible-horizontal">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="visible-vertical">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="is-important">
+        <type name="boolean" c:type="gboolean"/>
       </property>
+      <callback name="create_menu_proxy">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tool_item">
+            <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="toolbar_reconfigured">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tool_item">
+            <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_tooltip">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tool_item">
+            <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+          </parameter>
+          <parameter name="tooltips">
+            <type name="GtkTooltips*" c:type="GtkTooltips*"/>
+          </parameter>
+          <parameter name="tip_text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="tip_private">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
+      <glib:signal name="create-menu-proxy">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="toolbar-reconfigured">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="set-tooltip">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTooltips" c:type="GtkTooltips"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
     </class>
-    <function name="tree_model_sort_new_with_model"
-              c:identifier="gtk_tree_model_sort_new_with_model">
+    <function name="tool_item_toolbar_reconfigured"
+              c:identifier="_gtk_tool_item_toolbar_reconfigured">
       <return-value>
-        <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="child_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="tool_item">
+          <type name="ToolItem" c:type="GtkToolItem*"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GtkTreeSelectionFunc">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection">
-          <type name="GtkTreeSelection*" c:type="GtkTreeSelection*"/>
-        </parameter>
-        <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-        </parameter>
-        <parameter name="path_currently_selected">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkTreeSelectionForeachFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="TreeSelection"
-           c:type="GtkTreeSelection"
-           parent="GLib.Object"
-           glib:type-name="GtkTreeSelection"
-           glib:get-type="gtk_tree_selection_get_type">
-      <method name="set_mode" c:identifier="gtk_tree_selection_set_mode">
+    <record name="GtkToolButtonPrivate" c:type="GtkToolButtonPrivate"/>
+    <class name="ToolButton"
+           c:type="GtkToolButton"
+           parent="ToolItem"
+           glib:type-name="GtkToolButton"
+           glib:get-type="gtk_tool_button_get_type">
+      <method name="set_label" c:identifier="gtk_tool_button_set_label">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="SelectionMode" c:type="GtkSelectionMode"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_mode" c:identifier="gtk_tree_selection_get_mode">
-        <return-value>
-          <type name="SelectionMode" c:type="GtkSelectionMode"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="label" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_select_function"
-              c:identifier="gtk_tree_selection_set_select_function">
+      <method name="get_label" c:identifier="gtk_tool_button_get_label">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeSelectionFunc" c:type="GtkTreeSelectionFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_user_data"
-              c:identifier="gtk_tree_selection_get_user_data">
+      </method>
+      <method name="set_use_underline"
+              c:identifier="gtk_tool_button_set_use_underline">
         <return-value>
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
+          </parameter>
+          <parameter name="use_underline">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tree_view"
-              c:identifier="gtk_tree_selection_get_tree_view">
+      <method name="get_use_underline"
+              c:identifier="gtk_tool_button_get_use_underline">
         <return-value>
-          <type name="TreeView" c:type="GtkTreeView*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_selected"
-              c:identifier="gtk_tree_selection_get_selected">
+      <method name="set_stock_id" c:identifier="gtk_tool_button_set_stock_id">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel**"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="stock_id" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_selected_rows"
-              c:identifier="gtk_tree_selection_get_selected_rows">
+      <method name="get_stock_id" c:identifier="gtk_tool_button_get_stock_id">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel**"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="count_selected_rows"
-              c:identifier="gtk_tree_selection_count_selected_rows">
+      <method name="set_icon_name"
+              c:identifier="gtk_tool_button_set_icon_name">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
+          </parameter>
+          <parameter name="icon_name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="selected_foreach"
-              c:identifier="gtk_tree_selection_selected_foreach">
+      <method name="get_icon_name"
+              c:identifier="gtk_tool_button_get_icon_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeSelectionForeachFunc"
-                    c:type="GtkTreeSelectionForeachFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_path" c:identifier="gtk_tree_selection_select_path">
+      <method name="set_icon_widget"
+              c:identifier="gtk_tool_button_set_icon_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="icon_widget" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unselect_path"
-              c:identifier="gtk_tree_selection_unselect_path">
+      <method name="get_icon_widget"
+              c:identifier="gtk_tool_button_get_icon_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_iter" c:identifier="gtk_tree_selection_select_iter">
+      <method name="set_label_widget"
+              c:identifier="gtk_tool_button_set_label_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="label_widget" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unselect_iter"
-              c:identifier="gtk_tree_selection_unselect_iter">
+      <method name="get_label_widget"
+              c:identifier="gtk_tool_button_get_label_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="path_is_selected"
-              c:identifier="gtk_tree_selection_path_is_selected">
+      <property name="label">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="use-underline">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="label-widget">
+        <type name="GtkWidget" c:type="GtkWidget"/>
+      </property>
+      <property name="stock-id">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="icon-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="icon-widget">
+        <type name="GtkWidget" c:type="GtkWidget"/>
+      </property>
+      <field name="button_type">
+        <type name="GType" c:type="GType"/>
+      </field>
+      <callback name="clicked">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="tool_item">
+            <type name="GtkToolButton*" c:type="GtkToolButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="iter_is_selected"
-              c:identifier="gtk_tree_selection_iter_is_selected">
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="clicked">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="tool_button_new" c:identifier="gtk_tool_button_new">
+      <return-value>
+        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+      </return-value>
+      <parameters>
+        <parameter name="icon_widget" allow-none="1">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="label" allow-none="1">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tool_button_new_from_stock"
+              c:identifier="gtk_tool_button_new_from_stock">
+      <return-value>
+        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+      </return-value>
+      <parameters>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tool_button_get_button"
+              c:identifier="_gtk_tool_button_get_button">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="button">
+          <type name="ToolButton" c:type="GtkToolButton*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkMenuToolButtonPrivate" c:type="GtkMenuToolButtonPrivate"/>
+    <class name="MenuToolButton"
+           c:type="GtkMenuToolButton"
+           parent="ToolButton"
+           glib:type-name="GtkMenuToolButton"
+           glib:get-type="gtk_menu_tool_button_get_type">
+      <method name="set_menu" c:identifier="gtk_menu_tool_button_set_menu">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="button">
+            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="menu">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_all" c:identifier="gtk_tree_selection_select_all">
+      <method name="get_menu" c:identifier="gtk_menu_tool_button_get_menu">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="button">
+            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unselect_all"
-              c:identifier="gtk_tree_selection_unselect_all">
+      <method name="set_arrow_tooltip"
+              c:identifier="gtk_menu_tool_button_set_arrow_tooltip">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="button">
+            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
+          </parameter>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
+          </parameter>
+          <parameter name="tip_text" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="tip_private" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_range"
-              c:identifier="gtk_tree_selection_select_range">
+      <method name="set_arrow_tooltip_text"
+              c:identifier="gtk_menu_tool_button_set_arrow_tooltip_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="start_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="button">
+            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
           </parameter>
-          <parameter name="end_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unselect_range"
-              c:identifier="gtk_tree_selection_unselect_range">
+      <method name="set_arrow_tooltip_markup"
+              c:identifier="gtk_menu_tool_button_set_arrow_tooltip_markup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="start_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="button">
+            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
           </parameter>
-          <parameter name="end_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="markup">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="changed">
+      <property name="menu">
+        <type name="GtkMenu" c:type="GtkMenu"/>
+      </property>
+      <callback name="show_menu">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="GtkTreeSelection*" c:type="GtkTreeSelection*"/>
+          <parameter name="button">
+            <type name="GtkMenuToolButton*" c:type="GtkMenuToolButton*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="changed">
+      <glib:signal name="show-menu">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
     </class>
-    <class name="TreeStore"
-           c:type="GtkTreeStore"
-           parent="GLib.Object"
-           glib:type-name="GtkTreeStore"
-           glib:get-type="gtk_tree_store_get_type">
-      <constructor name="new" c:identifier="gtk_tree_store_new">
+    <function name="menu_tool_button_new"
+              c:identifier="gtk_menu_tool_button_new">
+      <return-value>
+        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+      </return-value>
+      <parameters>
+        <parameter name="icon_widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="menu_tool_button_new_from_stock"
+              c:identifier="gtk_menu_tool_button_new_from_stock">
+      <return-value>
+        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+      </return-value>
+      <parameters>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="MessageDialog"
+           c:type="GtkMessageDialog"
+           parent="Dialog"
+           glib:type-name="GtkMessageDialog"
+           glib:get-type="gtk_message_dialog_get_type">
+      <method name="set_image" c:identifier="gtk_message_dialog_set_image">
         <return-value>
-          <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="n_columns">
-            <type name="gint" c:type="gint"/>
+          <parameter name="dialog">
+            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
+          </parameter>
+          <parameter name="image">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="newv" c:identifier="gtk_tree_store_newv">
+      </method>
+      <method name="set_markup" c:identifier="gtk_message_dialog_set_markup">
         <return-value>
-          <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="n_columns">
-            <type name="gint" c:type="gint"/>
+          <parameter name="message_dialog">
+            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
           </parameter>
-          <parameter name="types">
-            <type name="GType" c:type="GType*"/>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="set_column_types"
-              c:identifier="gtk_tree_store_set_column_types">
+      </method>
+      <method name="format_secondary_text"
+              c:identifier="gtk_message_dialog_format_secondary_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="message_dialog">
+            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
+          </parameter>
+          <parameter name="message_format">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="format_secondary_markup"
+              c:identifier="gtk_message_dialog_format_secondary_markup">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="message_dialog">
+            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
+          </parameter>
+          <parameter name="message_format">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="message-type">
+        <type name="GtkMessageType" c:type="GtkMessageType"/>
+      </property>
+      <property name="buttons">
+        <type name="GtkButtonsType" c:type="GtkButtonsType"/>
+      </property>
+      <property name="text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="use-markup">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="secondary-text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="secondary-use-markup">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="image">
+        <type name="GtkWidget" c:type="GtkWidget"/>
+      </property>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="message_dialog_new" c:identifier="gtk_message_dialog_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="parent" allow-none="1">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="DialogFlags" c:type="GtkDialogFlags"/>
+        </parameter>
+        <parameter name="type">
+          <type name="MessageType" c:type="GtkMessageType"/>
+        </parameter>
+        <parameter name="buttons">
+          <type name="ButtonsType" c:type="GtkButtonsType"/>
+        </parameter>
+        <parameter name="message_format" allow-none="1">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="message_dialog_new_with_markup"
+              c:identifier="gtk_message_dialog_new_with_markup">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="parent">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="DialogFlags" c:type="GtkDialogFlags"/>
+        </parameter>
+        <parameter name="type">
+          <type name="MessageType" c:type="GtkMessageType"/>
+        </parameter>
+        <parameter name="buttons">
+          <type name="ButtonsType" c:type="GtkButtonsType"/>
+        </parameter>
+        <parameter name="message_format">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="find_module" c:identifier="_gtk_find_module">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="type">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="get_module_path" c:identifier="_gtk_get_module_path">
+      <return-value>
+        <type name="gchar**" c:type="gchar**"/>
+      </return-value>
+      <parameters>
+        <parameter name="type">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="modules_init" c:identifier="_gtk_modules_init">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="argc">
+          <type name="gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="argv">
+          <type name="gchar" c:type="gchar***"/>
+        </parameter>
+        <parameter name="gtk_modules_args">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="modules_settings_changed"
+              c:identifier="_gtk_modules_settings_changed">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
+        </parameter>
+        <parameter name="modules">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <callback name="GtkModuleInitFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="argc">
+          <type name="gint*" c:type="gint*"/>
+        </parameter>
+        <parameter name="argv">
+          <type name="gchar***" c:type="gchar***"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GtkModuleDisplayInitFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="display">
+          <type name="GdkDisplay*" c:type="GdkDisplay*"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <record name="GtkNotebookPage" c:type="GtkNotebookPage"/>
+    <callback name="GtkNotebookWindowCreationFunc">
+      <return-value>
+        <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+      </return-value>
+      <parameters>
+        <parameter name="source">
+          <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+        </parameter>
+        <parameter name="page">
+          <type name="GtkWidget*" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="Notebook"
+           c:type="GtkNotebook"
+           parent="Container"
+           glib:type-name="GtkNotebook"
+           glib:get-type="gtk_notebook_get_type">
+      <method name="append_page" c:identifier="gtk_notebook_append_page">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="n_columns">
-            <type name="gint" c:type="gint"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="types">
-            <type name="GType" c:type="GType*"/>
+          <parameter name="tab_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_value" c:identifier="gtk_tree_store_set_value">
+      <method name="append_page_menu"
+              c:identifier="gtk_notebook_append_page_menu">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
+          <parameter name="tab_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
+          <parameter name="menu_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set" c:identifier="gtk_tree_store_set">
+      <method name="prepend_page" c:identifier="gtk_notebook_prepend_page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tab_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_valuesv" c:identifier="gtk_tree_store_set_valuesv">
+      <method name="prepend_page_menu"
+              c:identifier="gtk_notebook_prepend_page_menu">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="columns">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="values">
-            <type name="GValue" c:type="GValue*"/>
+          <parameter name="tab_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="n_values">
-            <type name="gint" c:type="gint"/>
+          <parameter name="menu_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_valist" c:identifier="gtk_tree_store_set_valist">
+      <method name="insert_page" c:identifier="gtk_notebook_insert_page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="var_args">
-            <type name="va_list" c:type="va_list"/>
+          <parameter name="tab_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove" c:identifier="gtk_tree_store_remove">
+      <method name="insert_page_menu"
+              c:identifier="gtk_notebook_insert_page_menu">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tab_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="menu_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert" c:identifier="gtk_tree_store_insert">
+      <method name="remove_page" c:identifier="gtk_notebook_remove_page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="page_num">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_before" c:identifier="gtk_tree_store_insert_before">
+      <method name="set_group_id" c:identifier="gtk_notebook_set_group_id">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="sibling">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="group_id">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_after" c:identifier="gtk_tree_store_insert_after">
+      <method name="get_group_id" c:identifier="gtk_notebook_get_group_id">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="sibling">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_with_values"
-              c:identifier="gtk_tree_store_insert_with_values">
+      <method name="set_group" c:identifier="gtk_notebook_set_group">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="group">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_with_valuesv"
-              c:identifier="gtk_tree_store_insert_with_valuesv">
+      <method name="get_group" c:identifier="gtk_notebook_get_group">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="any" c:type="gpointer"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="columns">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="values">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
-          <parameter name="n_values">
-            <type name="gint" c:type="gint"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prepend" c:identifier="gtk_tree_store_prepend">
+      <method name="get_current_page"
+              c:identifier="gtk_notebook_get_current_page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="append" c:identifier="gtk_tree_store_append">
+      <method name="get_nth_page" c:identifier="gtk_notebook_get_nth_page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="page_num">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_ancestor" c:identifier="gtk_tree_store_is_ancestor">
+      <method name="get_n_pages" c:identifier="gtk_notebook_get_n_pages">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="descendant">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="iter_depth" c:identifier="gtk_tree_store_iter_depth">
+      <method name="page_num" c:identifier="gtk_notebook_page_num">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clear" c:identifier="gtk_tree_store_clear">
+      <method name="set_current_page"
+              c:identifier="gtk_notebook_set_current_page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="page_num">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="iter_is_valid" c:identifier="gtk_tree_store_iter_is_valid">
+      <method name="next_page" c:identifier="gtk_notebook_next_page">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="reorder" c:identifier="gtk_tree_store_reorder">
+      <method name="prev_page" c:identifier="gtk_notebook_prev_page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="new_order">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="swap" c:identifier="gtk_tree_store_swap">
+      <method name="set_show_border"
+              c:identifier="gtk_notebook_set_show_border">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="a">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="b">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="show_border">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_before" c:identifier="gtk_tree_store_move_before">
+      <method name="get_show_border"
+              c:identifier="gtk_notebook_get_show_border">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_after" c:identifier="gtk_tree_store_move_after">
+      <method name="set_show_tabs" c:identifier="gtk_notebook_set_show_tabs">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="position">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="show_tabs">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <record name="GtkUIManagerPrivate" c:type="GtkUIManagerPrivate"/>
-    <class name="UIManager"
-           c:type="GtkUIManager"
-           parent="GLib.Object"
-           glib:type-name="GtkUIManager"
-           glib:get-type="gtk_ui_manager_get_type">
-      <constructor name="new" c:identifier="gtk_ui_manager_new">
+      <method name="get_show_tabs" c:identifier="gtk_notebook_get_show_tabs">
         <return-value>
-          <type name="UIManager" c:type="GtkUIManager*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </constructor>
-      <method name="set_add_tearoffs"
-              c:identifier="gtk_ui_manager_set_add_tearoffs">
+        <parameters>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_tab_pos" c:identifier="gtk_notebook_set_tab_pos">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="add_tearoffs">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="pos">
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_add_tearoffs"
-              c:identifier="gtk_ui_manager_get_add_tearoffs">
+      <method name="get_tab_pos" c:identifier="gtk_notebook_get_tab_pos">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="PositionType" c:type="GtkPositionType"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_action_group"
-              c:identifier="gtk_ui_manager_insert_action_group">
+      <method name="set_homogeneous_tabs"
+              c:identifier="gtk_notebook_set_homogeneous_tabs">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="pos">
-            <type name="gint" c:type="gint"/>
+          <parameter name="homogeneous">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_action_group"
-              c:identifier="gtk_ui_manager_remove_action_group">
+      <method name="set_tab_border" c:identifier="gtk_notebook_set_tab_border">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
+          <parameter name="border_width">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_action_groups"
-              c:identifier="gtk_ui_manager_get_action_groups">
+      <method name="set_tab_hborder"
+              c:identifier="gtk_notebook_set_tab_hborder">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="tab_hborder">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_accel_group"
-              c:identifier="gtk_ui_manager_get_accel_group">
+      <method name="set_tab_vborder"
+              c:identifier="gtk_notebook_set_tab_vborder">
         <return-value>
-          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="tab_vborder">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_widget" c:identifier="gtk_ui_manager_get_widget">
+      <method name="set_scrollable" c:identifier="gtk_notebook_set_scrollable">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="path">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="scrollable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_toplevels" c:identifier="gtk_ui_manager_get_toplevels">
+      <method name="get_scrollable" c:identifier="gtk_notebook_get_scrollable">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="types">
-            <type name="UIManagerItemType" c:type="GtkUIManagerItemType"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_action" c:identifier="gtk_ui_manager_get_action">
+      <method name="popup_enable" c:identifier="gtk_notebook_popup_enable">
         <return-value>
-          <type name="Action" c:type="GtkAction*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_ui_from_string"
-              c:identifier="gtk_ui_manager_add_ui_from_string">
+      <method name="popup_disable" c:identifier="gtk_notebook_popup_disable">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="buffer">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="gssize" c:type="gssize"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_ui_from_file"
-              c:identifier="gtk_ui_manager_add_ui_from_file">
+      <method name="get_tab_label" c:identifier="gtk_notebook_get_tab_label">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="filename">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_ui" c:identifier="gtk_ui_manager_add_ui">
+      <method name="set_tab_label" c:identifier="gtk_notebook_set_tab_label">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="merge_id">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="path">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="action">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="type">
-            <type name="UIManagerItemType" c:type="GtkUIManagerItemType"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="top">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="tab_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_ui" c:identifier="gtk_ui_manager_remove_ui">
+      <method name="set_tab_label_text"
+              c:identifier="gtk_notebook_set_tab_label_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="merge_id">
-            <type name="guint" c:type="guint"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tab_text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_ui" c:identifier="gtk_ui_manager_get_ui">
+      <method name="get_tab_label_text"
+              c:identifier="gtk_notebook_get_tab_label_text">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="ensure_update" c:identifier="gtk_ui_manager_ensure_update">
+      <method name="get_menu_label" c:identifier="gtk_notebook_get_menu_label">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="new_merge_id" c:identifier="gtk_ui_manager_new_merge_id">
+      <method name="set_menu_label" c:identifier="gtk_notebook_set_menu_label">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="menu_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="add-tearoffs">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="ui">
-        <type name="gchararray" c:type="gchararray"/>
-      </property>
-      <callback name="add_widget">
+      <method name="set_menu_label_text"
+              c:identifier="gtk_notebook_set_menu_label_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="merge">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="menu_text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="actions_changed">
+      </method>
+      <method name="get_menu_label_text"
+              c:identifier="gtk_notebook_get_menu_label_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="merge">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="connect_proxy">
+      </method>
+      <method name="query_tab_label_packing"
+              c:identifier="gtk_notebook_query_tab_label_packing">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="merge">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="action">
-            <type name="GtkAction*" c:type="GtkAction*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="proxy">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <parameter name="expand">
+            <type name="gboolean" c:type="gboolean*"/>
+          </parameter>
+          <parameter name="fill">
+            <type name="gboolean" c:type="gboolean*"/>
+          </parameter>
+          <parameter name="pack_type">
+            <type name="PackType" c:type="GtkPackType*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="disconnect_proxy">
+      </method>
+      <method name="set_tab_label_packing"
+              c:identifier="gtk_notebook_set_tab_label_packing">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="merge">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="action">
-            <type name="GtkAction*" c:type="GtkAction*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="proxy">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="fill">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="pack_type">
+            <type name="PackType" c:type="GtkPackType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="pre_activate">
+      </method>
+      <method name="reorder_child" c:identifier="gtk_notebook_reorder_child">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="merge">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="action">
-            <type name="GtkAction*" c:type="GtkAction*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="post_activate">
+      </method>
+      <method name="get_tab_reorderable"
+              c:identifier="gtk_notebook_get_tab_reorderable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="merge">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="action">
-            <type name="GtkAction*" c:type="GtkAction*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_widget">
+      </method>
+      <method name="set_tab_reorderable"
+              c:identifier="gtk_notebook_set_tab_reorderable">
         <return-value>
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="path">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="reorderable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_action">
+      </method>
+      <method name="get_tab_detachable"
+              c:identifier="gtk_notebook_get_tab_detachable">
         <return-value>
-          <type name="GtkAction*" c:type="GtkAction*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="path">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="connect-proxy">
+      </method>
+      <method name="set_tab_detachable"
+              c:identifier="gtk_notebook_set_tab_detachable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkAction" c:type="GtkAction"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detachable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="disconnect-proxy">
+      </method>
+      <property name="tab-pos">
+        <type name="GtkPositionType" c:type="GtkPositionType"/>
+      </property>
+      <property name="show-tabs">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-border">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="scrollable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="tab-border">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <property name="tab-hborder">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <property name="tab-vborder">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <property name="page">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="enable-popup">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="group-id">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="group">
+        <type name="any" c:type="gpointer"/>
+      </property>
+      <property name="homogeneous">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="switch_page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkAction" c:type="GtkAction"/>
+          <parameter name="notebook">
+            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+          <parameter name="page">
+            <type name="GtkNotebookPage*" c:type="GtkNotebookPage*"/>
+          </parameter>
+          <parameter name="page_num">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="pre-activate">
+      </callback>
+      <callback name="select_page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkAction" c:type="GtkAction"/>
+          <parameter name="notebook">
+            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="move_focus">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="post-activate">
+      </callback>
+      <callback name="focus_tab">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkAction" c:type="GtkAction"/>
+          <parameter name="notebook">
+            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="GtkNotebookTab" c:type="GtkNotebookTab"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="add-widget">
+      </callback>
+      <callback name="change_current_page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+          <parameter name="notebook">
+            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="actions-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <class name="VButtonBox"
-           c:type="GtkVButtonBox"
-           parent="ButtonBox"
-           glib:type-name="GtkVButtonBox"
-           glib:get-type="gtk_vbutton_box_get_type">
-    </class>
-    <function name="vbutton_box_new" c:identifier="gtk_vbutton_box_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="vbutton_box_get_spacing_default"
-              c:identifier="gtk_vbutton_box_get_spacing_default">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-    </function>
-    <function name="vbutton_box_set_spacing_default"
-              c:identifier="gtk_vbutton_box_set_spacing_default">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="spacing">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="vbutton_box_get_layout_default"
-              c:identifier="gtk_vbutton_box_get_layout_default">
-      <return-value>
-        <type name="GtkButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
-      </return-value>
-    </function>
-    <function name="vbutton_box_set_layout_default"
-              c:identifier="gtk_vbutton_box_set_layout_default">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="layout">
-          <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="VolumeButton"
-           c:type="GtkVolumeButton"
-           parent="ScaleButton"
-           glib:type-name="GtkVolumeButton"
-           glib:get-type="gtk_volume_button_get_type">
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
       </callback>
-    </class>
-    <function name="volume_button_new" c:identifier="gtk_volume_button_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="VPaned"
-           c:type="GtkVPaned"
-           parent="Paned"
-           glib:type-name="GtkVPaned"
-           glib:get-type="gtk_vpaned_get_type">
-    </class>
-    <function name="vpaned_new" c:identifier="gtk_vpaned_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="VRuler"
-           c:type="GtkVRuler"
-           parent="Ruler"
-           glib:type-name="GtkVRuler"
-           glib:get-type="gtk_vruler_get_type">
-    </class>
-    <function name="vruler_new" c:identifier="gtk_vruler_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="VScale"
-           c:type="GtkVScale"
-           parent="Scale"
-           glib:type-name="GtkVScale"
-           glib:get-type="gtk_vscale_get_type">
-    </class>
-    <function name="vscale_new" c:identifier="gtk_vscale_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="adjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="vscale_new_with_range"
-              c:identifier="gtk_vscale_new_with_range">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="min">
-          <type name="gdouble" c:type="gdouble"/>
-        </parameter>
-        <parameter name="max">
-          <type name="gdouble" c:type="gdouble"/>
-        </parameter>
-        <parameter name="step">
-          <type name="gdouble" c:type="gdouble"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="VSeparator"
-           c:type="GtkVSeparator"
-           parent="Separator"
-           glib:type-name="GtkVSeparator"
-           glib:get-type="gtk_vseparator_get_type">
-    </class>
-    <function name="vseparator_new" c:identifier="gtk_vseparator_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <record name="GtkCList" c:type="GtkCList">
-      <field name="container">
-        <type name="GtkContainer" c:type="GtkContainer"/>
-      </field>
-      <field name="flags">
-        <type name="guint16" c:type="guint16"/>
-      </field>
-      <field name="reserved1">
-        <type name="gpointer" c:type="gpointer"/>
-      </field>
-      <field name="reserved2">
-        <type name="gpointer" c:type="gpointer"/>
-      </field>
-      <field name="freeze_count">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="internal_allocation">
-        <type name="GdkRectangle" c:type="GdkRectangle"/>
-      </field>
-      <field name="rows">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="row_height">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="row_list">
-        <type name="GList*" c:type="GList*"/>
-      </field>
-      <field name="row_list_end">
-        <type name="GList*" c:type="GList*"/>
-      </field>
-      <field name="columns">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="column_title_area">
-        <type name="GdkRectangle" c:type="GdkRectangle"/>
-      </field>
-      <field name="title_window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="column">
-        <type name="GtkCListColumn*" c:type="GtkCListColumn*"/>
-      </field>
-      <field name="clist_window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="clist_window_width">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="clist_window_height">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="hoffset">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="voffset">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="shadow_type">
-        <type name="GtkShadowType" c:type="GtkShadowType"/>
-      </field>
-      <field name="selection_mode">
-        <type name="GtkSelectionMode" c:type="GtkSelectionMode"/>
-      </field>
-      <field name="selection">
-        <type name="GList*" c:type="GList*"/>
-      </field>
-      <field name="selection_end">
-        <type name="GList*" c:type="GList*"/>
-      </field>
-      <field name="undo_selection">
-        <type name="GList*" c:type="GList*"/>
-      </field>
-      <field name="undo_unselection">
-        <type name="GList*" c:type="GList*"/>
-      </field>
-      <field name="undo_anchor">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="button_actions">
-        <type name="guint8" c:type="guint8"/>
-      </field>
-      <field name="drag_button">
-        <type name="guint8" c:type="guint8"/>
-      </field>
-      <field name="click_cell">
-        <type name="GtkCListCellInfo" c:type="GtkCListCellInfo"/>
-      </field>
-      <field name="hadjustment">
-        <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
-      </field>
-      <field name="vadjustment">
-        <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
-      </field>
-      <field name="xor_gc">
-        <type name="GdkGC*" c:type="GdkGC*"/>
-      </field>
-      <field name="fg_gc">
-        <type name="GdkGC*" c:type="GdkGC*"/>
-      </field>
-      <field name="bg_gc">
-        <type name="GdkGC*" c:type="GdkGC*"/>
-      </field>
-      <field name="cursor_drag">
-        <type name="GdkCursor*" c:type="GdkCursor*"/>
-      </field>
-      <field name="x_drag">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="focus_row">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="focus_header_column">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="anchor">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="anchor_state">
-        <type name="GtkStateType" c:type="GtkStateType"/>
-      </field>
-      <field name="drag_pos">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="htimer">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="vtimer">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="sort_type">
-        <type name="GtkSortType" c:type="GtkSortType"/>
-      </field>
-      <field name="compare">
-        <type name="GtkCListCompareFunc" c:type="GtkCListCompareFunc"/>
-      </field>
-      <field name="sort_column">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="drag_highlight_row">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="drag_highlight_pos">
-        <type name="GtkCListDragPos" c:type="GtkCListDragPos"/>
-      </field>
-      <callback name="set_scroll_adjustments">
+      <callback name="move_focus_out">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="hadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+          <parameter name="notebook">
+            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="vadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+          <parameter name="direction">
+            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="refresh">
+      <callback name="reorder_tab">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="notebook">
+            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="direction">
+            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+          </parameter>
+          <parameter name="move_to_last">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="select_row">
+      <callback name="insert_page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="notebook">
+            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
+          <parameter name="child">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tab_label">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
+          <parameter name="menu_label">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="unselect_row">
+      <callback name="create_window">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkNotebook*" c:type="GtkNotebook*"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="notebook">
+            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
+          <parameter name="page">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="row_move">
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="switch-page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="source_row">
-            <type name="gint" c:type="gint"/>
+          <parameter name="object">
+            <type name="any" c:type="gpointer"/>
           </parameter>
-          <parameter name="dest_row">
-            <type name="gint" c:type="gint"/>
+          <parameter name="p0">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="click_column">
+      </glib:signal>
+      <glib:signal name="focus-tab">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
+          <parameter name="object">
+            <type name="GtkNotebookTab" c:type="GtkNotebookTab"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="resize_column">
+      </glib:signal>
+      <glib:signal name="select-page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="width">
-            <type name="gint" c:type="gint"/>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="toggle_focus_row">
+      </glib:signal>
+      <glib:signal name="change-current-page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="object">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="select_all">
+      </glib:signal>
+      <glib:signal name="move-focus-out">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="object">
+            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="unselect_all">
+      </glib:signal>
+      <glib:signal name="reorder-tab">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="object">
+            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="undo_selection">
+      </glib:signal>
+      <glib:signal name="page-reordered">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="object">
+            <type name="GtkWidget" c:type="GtkWidget"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="start_selection">
+      </glib:signal>
+      <glib:signal name="page-removed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="object">
+            <type name="GtkWidget" c:type="GtkWidget"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="end_selection">
+      </glib:signal>
+      <glib:signal name="page-added">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="object">
+            <type name="GtkWidget" c:type="GtkWidget"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="extend_selection">
+      </glib:signal>
+      <glib:signal name="create-window">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkNotebook" c:type="GtkNotebook"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="object">
+            <type name="GtkWidget" c:type="GtkWidget"/>
           </parameter>
-          <parameter name="scroll_type">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="position">
-            <type name="gfloat" c:type="gfloat"/>
+          <parameter name="p1">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="auto_start_selection">
-            <type name="gboolean" c:type="gboolean"/>
+        </parameters>
+      </glib:signal>
+    </class>
+    <function name="notebook_new" c:identifier="gtk_notebook_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="notebook_set_window_creation_hook"
+              c:identifier="gtk_notebook_set_window_creation_hook">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="func">
+          <type name="GtkNotebookWindowCreationFunc"
+                c:type="GtkNotebookWindowCreationFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkOldEditable" c:type="GtkOldEditable">
+      <field name="widget">
+        <type name="GtkWidget" c:type="GtkWidget"/>
+      </field>
+      <field name="current_pos">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="selection_start_pos">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="selection_end_pos">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="has_selection">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="editable">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="visible">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="clipboard_text">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <callback name="activate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="scroll_horizontal">
+      <callback name="set_editable">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="scroll_type">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="position">
-            <type name="gfloat" c:type="gfloat"/>
+          <parameter name="is_editable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="scroll_vertical">
+      <callback name="move_cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="scroll_type">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="position">
-            <type name="gfloat" c:type="gfloat"/>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="toggle_add_mode">
+      <callback name="move_word">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="n">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="abort_column_resize">
+      <callback name="move_page">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="resync_selection">
+      <callback name="move_to_row">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
+          <parameter name="row">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="selection_find">
+      <callback name="move_to_column">
         <return-value>
-          <type name="GList*" c:type="GList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="row_number">
-            <type name="gint" c:type="gint"/>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="row_list_element">
-            <type name="GList*" c:type="GList*"/>
+          <parameter name="row">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_row">
+      <callback name="kill_char">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="clist_row">
-            <type name="GtkCListRow*" c:type="GtkCListRow*"/>
+          <parameter name="direction">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_drag_highlight">
+      <callback name="kill_word">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="target_row">
-            <type name="GtkCListRow*" c:type="GtkCListRow*"/>
+          <parameter name="direction">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="target_row_number">
-            <type name="gint" c:type="gint"/>
+        </parameters>
+      </callback>
+      <callback name="kill_line">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="drag_pos">
-            <type name="GtkCListDragPos" c:type="GtkCListDragPos"/>
+          <parameter name="direction">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="clear">
+      <callback name="cut_clipboard">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="fake_unselect_all">
+      <callback name="copy_clipboard">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="sort_list">
+      <callback name="paste_clipboard">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="insert_row">
+      <callback name="update_text">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
+          <parameter name="start_pos">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="text">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="end_pos">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="remove_row">
+      <callback name="get_chars">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
+          <parameter name="start_pos">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="end_pos">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_cell_contents">
+      <callback name="set_selection">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="clist_row">
-            <type name="GtkCListRow*" c:type="GtkCListRow*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="type">
-            <type name="GtkCellType" c:type="GtkCellType"/>
-          </parameter>
-          <parameter name="text">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-          <parameter name="spacing">
-            <type name="guint8" c:type="guint8"/>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="pixmap">
-            <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+          <parameter name="start_pos">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="mask">
-            <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+          <parameter name="end_pos">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="cell_size_request">
+      <callback name="set_position">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="clist_row">
-            <type name="GtkCListRow*" c:type="GtkCListRow*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
+          <parameter name="editable">
+            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="requisition">
-            <type name="GtkRequisition*" c:type="GtkRequisition*"/>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
     </record>
-    <record name="GtkCListColumn" c:type="GtkCListColumn">
-      <field name="title">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="area">
-        <type name="GdkRectangle" c:type="GdkRectangle"/>
-      </field>
-      <field name="button">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="width">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="min_width">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="max_width">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="justification">
-        <type name="GtkJustification" c:type="GtkJustification"/>
-      </field>
-      <field name="visible">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="width_set">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="resizeable">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="auto_resize">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="button_passive">
-        <type name="guint" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkCListRow" c:type="GtkCListRow">
-      <field name="cell">
-        <type name="GtkCell*" c:type="GtkCell*"/>
-      </field>
-      <field name="state">
-        <type name="GtkStateType" c:type="GtkStateType"/>
-      </field>
-      <field name="foreground">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </field>
-      <field name="background">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </field>
-      <field name="style">
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
-      </field>
-      <field name="data">
-        <type name="gpointer" c:type="gpointer"/>
-      </field>
-      <field name="destroy">
-        <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-      </field>
-      <field name="fg_set">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="bg_set">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="selectable">
-        <type name="guint" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkCell" c:type="GtkCell">
-      <field name="type">
-        <type name="GtkCellType" c:type="GtkCellType"/>
-      </field>
-      <field name="vertical">
-        <type name="gint16" c:type="gint16"/>
-      </field>
-      <field name="horizontal">
-        <type name="gint16" c:type="gint16"/>
-      </field>
-      <field name="style">
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
-      </field>
-      <field name="u">
-        <type name="???" c:type="???"/>
-      </field>
-    </record>
-    <record name="GtkCellText" c:type="GtkCellText">
-      <field name="type">
-        <type name="GtkCellType" c:type="GtkCellType"/>
-      </field>
-      <field name="vertical">
-        <type name="gint16" c:type="gint16"/>
-      </field>
-      <field name="horizontal">
-        <type name="gint16" c:type="gint16"/>
-      </field>
-      <field name="style">
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
-      </field>
-      <field name="text">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-    </record>
-    <record name="GtkCellPixmap" c:type="GtkCellPixmap">
-      <field name="type">
-        <type name="GtkCellType" c:type="GtkCellType"/>
-      </field>
-      <field name="vertical">
-        <type name="gint16" c:type="gint16"/>
-      </field>
-      <field name="horizontal">
-        <type name="gint16" c:type="gint16"/>
-      </field>
-      <field name="style">
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
-      </field>
-      <field name="pixmap">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
-      </field>
-      <field name="mask">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
-      </field>
-    </record>
-    <record name="GtkCellPixText" c:type="GtkCellPixText">
-      <field name="type">
-        <type name="GtkCellType" c:type="GtkCellType"/>
-      </field>
-      <field name="vertical">
-        <type name="gint16" c:type="gint16"/>
-      </field>
-      <field name="horizontal">
-        <type name="gint16" c:type="gint16"/>
-      </field>
-      <field name="style">
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
-      </field>
-      <field name="text">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="spacing">
-        <type name="guint8" c:type="guint8"/>
-      </field>
-      <field name="pixmap">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
-      </field>
-      <field name="mask">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
-      </field>
-    </record>
-    <record name="GtkCellWidget" c:type="GtkCellWidget">
-      <field name="type">
-        <type name="GtkCellType" c:type="GtkCellType"/>
-      </field>
-      <field name="vertical">
-        <type name="gint16" c:type="gint16"/>
-      </field>
-      <field name="horizontal">
-        <type name="gint16" c:type="gint16"/>
-      </field>
-      <field name="style">
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
-      </field>
-      <field name="widget">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </field>
-    </record>
-    <callback name="GtkCListCompareFunc">
+    <callback name="GtkTextFunction">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList*" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="ptr1">
-          <type name="gconstpointer" c:type="gconstpointer"/>
+        <parameter name="editable">
+          <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
         </parameter>
-        <parameter name="ptr2">
-          <type name="gconstpointer" c:type="gconstpointer"/>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </callback>
-    <record name="GtkCListCellInfo" c:type="GtkCListCellInfo">
-      <field name="row">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="column">
-        <type name="gint" c:type="gint"/>
-      </field>
-    </record>
-    <record name="GtkCListDestInfo" c:type="GtkCListDestInfo">
-      <field name="cell">
-        <type name="GtkCListCellInfo" c:type="GtkCListCellInfo"/>
-      </field>
-      <field name="insert_pos">
-        <type name="GtkCListDragPos" c:type="GtkCListDragPos"/>
-      </field>
-    </record>
-    <function name="clist_get_type" c:identifier="gtk_clist_get_type">
+    <function name="old_editable_get_type"
+              c:identifier="gtk_old_editable_get_type">
       <return-value>
         <type name="GtkType" c:type="GtkType"/>
       </return-value>
     </function>
-    <function name="clist_new" c:identifier="gtk_clist_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="columns">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_new_with_titles"
-              c:identifier="gtk_clist_new_with_titles">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="columns">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="titles">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_hadjustment"
-              c:identifier="gtk_clist_set_hadjustment">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="adjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_vadjustment"
-              c:identifier="gtk_clist_set_vadjustment">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="adjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_hadjustment"
-              c:identifier="gtk_clist_get_hadjustment">
-      <return-value>
-        <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_vadjustment"
-              c:identifier="gtk_clist_get_vadjustment">
-      <return-value>
-        <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_shadow_type"
-              c:identifier="gtk_clist_set_shadow_type">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_selection_mode"
-              c:identifier="gtk_clist_set_selection_mode">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="mode">
-          <type name="SelectionMode" c:type="GtkSelectionMode"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_reorderable"
-              c:identifier="gtk_clist_set_reorderable">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="reorderable">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_use_drag_icons"
-              c:identifier="gtk_clist_set_use_drag_icons">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="use_icons">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_button_actions"
-              c:identifier="gtk_clist_set_button_actions">
+    <function name="old_editable_claim_selection"
+              c:identifier="gtk_old_editable_claim_selection">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="button">
-          <type name="guint" c:type="guint"/>
+        <parameter name="old_editable">
+          <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
         </parameter>
-        <parameter name="button_actions">
-          <type name="guint8" c:type="guint8"/>
+        <parameter name="claim">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="clist_freeze" c:identifier="gtk_clist_freeze">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_thaw" c:identifier="gtk_clist_thaw">
+    <function name="old_editable_changed"
+              c:identifier="gtk_old_editable_changed">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="old_editable">
+          <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_column_titles_show"
-              c:identifier="gtk_clist_column_titles_show">
+    <class name="OptionMenu"
+           c:type="GtkOptionMenu"
+           parent="Button"
+           glib:type-name="GtkOptionMenu"
+           glib:get-type="gtk_option_menu_get_type">
+      <method name="get_menu" c:identifier="gtk_option_menu_get_menu">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="option_menu">
+            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_menu" c:identifier="gtk_option_menu_set_menu">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="option_menu">
+            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
+          </parameter>
+          <parameter name="menu">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_menu" c:identifier="gtk_option_menu_remove_menu">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="option_menu">
+            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_history" c:identifier="gtk_option_menu_get_history">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="option_menu">
+            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_history" c:identifier="gtk_option_menu_set_history">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="option_menu">
+            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
+          </parameter>
+          <parameter name="index_">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="menu">
+        <type name="GtkMenu" c:type="GtkMenu"/>
+      </property>
+      <callback name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="option_menu">
+            <type name="GtkOptionMenu*" c:type="GtkOptionMenu*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="option_menu_new" c:identifier="gtk_option_menu_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="clist_column_titles_hide"
-              c:identifier="gtk_clist_column_titles_hide">
+    <record name="GtkPixmap" c:type="GtkPixmap">
+      <field name="misc">
+        <type name="GtkMisc" c:type="GtkMisc"/>
+      </field>
+      <field name="pixmap">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="mask">
+        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+      </field>
+      <field name="pixmap_insensitive">
+        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+      </field>
+      <field name="build_insensitive">
+        <type name="guint" c:type="guint"/>
+      </field>
+    </record>
+    <function name="pixmap_get_type" c:identifier="gtk_pixmap_get_type">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkType" c:type="GtkType"/>
       </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="clist_column_title_active"
-              c:identifier="gtk_clist_column_title_active">
+    <function name="pixmap_new" c:identifier="gtk_pixmap_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="mask" allow-none="1">
+          <type name="GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_column_title_passive"
-              c:identifier="gtk_clist_column_title_passive">
+    <function name="pixmap_set" c:identifier="gtk_pixmap_set">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="pixmap">
+          <type name="GtkPixmap" c:type="GtkPixmap*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="clist_column_titles_active"
-              c:identifier="gtk_clist_column_titles_active">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="val">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="clist_column_titles_passive"
-              c:identifier="gtk_clist_column_titles_passive">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="mask" allow-none="1">
+          <type name="GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_column_title"
-              c:identifier="gtk_clist_set_column_title">
+    <function name="pixmap_get" c:identifier="gtk_pixmap_get">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="pixmap">
+          <type name="GtkPixmap" c:type="GtkPixmap*"/>
         </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="val">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
         </parameter>
-        <parameter name="title">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="mask">
+          <type name="GdkBitmap" c:type="GdkBitmap**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_get_column_title"
-              c:identifier="gtk_clist_get_column_title">
+    <function name="pixmap_set_build_insensitive"
+              c:identifier="gtk_pixmap_set_build_insensitive">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="pixmap">
+          <type name="GtkPixmap" c:type="GtkPixmap*"/>
         </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="build">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_column_widget"
-              c:identifier="gtk_clist_set_column_widget">
+    <class name="Socket"
+           c:type="GtkSocket"
+           parent="Container"
+           glib:type-name="GtkSocket"
+           glib:get-type="gtk_socket_get_type">
+      <method name="add_id" c:identifier="gtk_socket_add_id">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="socket_">
+            <type name="Socket" c:type="GtkSocket*"/>
+          </parameter>
+          <parameter name="window_id">
+            <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_id" c:identifier="gtk_socket_get_id">
+        <return-value>
+          <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+        </return-value>
+        <parameters>
+          <parameter name="socket_">
+            <type name="Socket" c:type="GtkSocket*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="steal" c:identifier="gtk_socket_steal">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="socket_">
+            <type name="Socket" c:type="GtkSocket*"/>
+          </parameter>
+          <parameter name="wid">
+            <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="plug_added">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="socket_">
+            <type name="GtkSocket*" c:type="GtkSocket*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="plug_removed">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="socket_">
+            <type name="GtkSocket*" c:type="GtkSocket*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="plug-added">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="plug-removed">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="socket_new" c:identifier="gtk_socket_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="clist_get_column_widget"
-              c:identifier="gtk_clist_get_column_widget">
+    <class name="Plug"
+           c:type="GtkPlug"
+           parent="Window"
+           glib:type-name="GtkPlug"
+           glib:get-type="gtk_plug_get_type">
+      <method name="construct" c:identifier="gtk_plug_construct">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="plug">
+            <type name="Plug" c:type="GtkPlug*"/>
+          </parameter>
+          <parameter name="socket_id">
+            <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="construct_for_display"
+              c:identifier="gtk_plug_construct_for_display">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="plug">
+            <type name="Plug" c:type="GtkPlug*"/>
+          </parameter>
+          <parameter name="display">
+            <type name="Gdk.Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="socket_id">
+            <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_id" c:identifier="gtk_plug_get_id">
+        <return-value>
+          <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+        </return-value>
+        <parameters>
+          <parameter name="plug">
+            <type name="Plug" c:type="GtkPlug*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="embedded">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="embedded">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="plug">
+            <type name="GtkPlug*" c:type="GtkPlug*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="embedded">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="plug_new" c:identifier="gtk_plug_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="socket_id">
+          <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_column_justification"
-              c:identifier="gtk_clist_set_column_justification">
+    <function name="plug_new_for_display"
+              c:identifier="gtk_plug_new_for_display">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="display">
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
         </parameter>
-        <parameter name="justification">
-          <type name="Justification" c:type="GtkJustification"/>
+        <parameter name="socket_id">
+          <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_column_visibility"
-              c:identifier="gtk_clist_set_column_visibility">
+    <function name="plug_add_to_socket" c:identifier="_gtk_plug_add_to_socket">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="plug">
+          <type name="Plug" c:type="GtkPlug*"/>
         </parameter>
-        <parameter name="visible">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="socket_">
+          <type name="Socket" c:type="GtkSocket*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_column_resizeable"
-              c:identifier="gtk_clist_set_column_resizeable">
+    <function name="plug_remove_from_socket"
+              c:identifier="_gtk_plug_remove_from_socket">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="plug">
+          <type name="Plug" c:type="GtkPlug*"/>
         </parameter>
-        <parameter name="resizeable">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="socket_">
+          <type name="Socket" c:type="GtkSocket*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_column_auto_resize"
-              c:identifier="gtk_clist_set_column_auto_resize">
+    <record name="GtkPreview" c:type="GtkPreview">
+      <field name="widget">
+        <type name="GtkWidget" c:type="GtkWidget"/>
+      </field>
+      <field name="buffer">
+        <type name="guchar*" c:type="guchar*"/>
+      </field>
+      <field name="buffer_width">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="buffer_height">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="bpp">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="rowstride">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="dither">
+        <type name="GdkRgbDither" c:type="GdkRgbDither"/>
+      </field>
+      <field name="type">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="expand">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="info">
+        <type name="GtkPreviewInfo" c:type="GtkPreviewInfo"/>
+      </field>
+    </record>
+    <record name="GtkPreviewInfo" c:type="GtkPreviewInfo">
+      <field name="lookup">
+        <type name="guchar*" c:type="guchar*"/>
+      </field>
+      <field name="gamma">
+        <type name="double" c:type="gdouble"/>
+      </field>
+    </record>
+    <function name="preview_get_type" c:identifier="gtk_preview_get_type">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkType" c:type="GtkType"/>
       </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="auto_resize">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="clist_columns_autosize"
-              c:identifier="gtk_clist_columns_autosize">
+    <function name="preview_uninit" c:identifier="gtk_preview_uninit">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="clist_optimal_column_width"
-              c:identifier="gtk_clist_optimal_column_width">
+    <function name="preview_new" c:identifier="gtk_preview_new">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="type">
+          <type name="PreviewType" c:type="GtkPreviewType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_column_width"
-              c:identifier="gtk_clist_set_column_width">
+    <function name="preview_size" c:identifier="gtk_preview_size">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="preview">
+          <type name="GtkPreview" c:type="GtkPreview*"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_column_min_width"
-              c:identifier="gtk_clist_set_column_min_width">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="min_width">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_column_max_width"
-              c:identifier="gtk_clist_set_column_max_width">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="max_width">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_row_height"
-              c:identifier="gtk_clist_set_row_height">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="guint" c:type="guint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_moveto" c:identifier="gtk_clist_moveto">
+    <function name="preview_put" c:identifier="gtk_preview_put">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
+        <parameter name="preview">
+          <type name="GtkPreview" c:type="GtkPreview*"/>
         </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
-        <parameter name="row_align">
-          <type name="gfloat" c:type="gfloat"/>
+        <parameter name="gc">
+          <type name="Gdk.GC" c:type="GdkGC*"/>
         </parameter>
-        <parameter name="col_align">
-          <type name="gfloat" c:type="gfloat"/>
+        <parameter name="srcx">
+          <type name="int32" c:type="gint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="clist_row_is_visible"
-              c:identifier="gtk_clist_row_is_visible">
-      <return-value>
-        <type name="GtkVisibility" c:type="GtkVisibility"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="srcy">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
+        <parameter name="destx">
+          <type name="int32" c:type="gint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_cell_type" c:identifier="gtk_clist_get_cell_type">
-      <return-value>
-        <type name="GtkCellType" c:type="GtkCellType"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="desty">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
+        <parameter name="width">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="height">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_text" c:identifier="gtk_clist_set_text">
+    <function name="preview_draw_row" c:identifier="gtk_preview_draw_row">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="preview">
+          <type name="GtkPreview" c:type="GtkPreview*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_text" c:identifier="gtk_clist_get_text">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="data">
+          <type name="guchar" c:type="guchar*"/>
         </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
+        <parameter name="x">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="y">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="text">
-          <type name="gchar" c:type="gchar**"/>
+        <parameter name="w">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_pixmap" c:identifier="gtk_clist_set_pixmap">
+    <function name="preview_set_expand" c:identifier="gtk_preview_set_expand">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        <parameter name="preview">
+          <type name="GtkPreview" c:type="GtkPreview*"/>
         </parameter>
-        <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+        <parameter name="expand">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_get_pixmap" c:identifier="gtk_clist_get_pixmap">
+    <function name="preview_set_gamma" c:identifier="gtk_preview_set_gamma">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+        <parameter name="gamma_">
+          <type name="double" c:type="double"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_pixtext" c:identifier="gtk_clist_set_pixtext">
+    <function name="preview_set_color_cube"
+              c:identifier="gtk_preview_set_color_cube">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="nred_shades">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="spacing">
-          <type name="guint8" c:type="guint8"/>
+        <parameter name="ngreen_shades">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        <parameter name="nblue_shades">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+        <parameter name="ngray_shades">
+          <type name="guint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_get_pixtext" c:identifier="gtk_clist_get_pixtext">
+    <function name="preview_set_install_cmap"
+              c:identifier="gtk_preview_set_install_cmap">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="text">
-          <type name="gchar" c:type="gchar**"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="guint8" c:type="guint8*"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+        <parameter name="install_cmap">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_foreground"
-              c:identifier="gtk_clist_set_foreground">
+    <function name="preview_set_reserved"
+              c:identifier="gtk_preview_set_reserved">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
+        <parameter name="nreserved">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_background"
-              c:identifier="gtk_clist_set_background">
+    <function name="preview_set_dither" c:identifier="gtk_preview_set_dither">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
+        <parameter name="preview">
+          <type name="GtkPreview" c:type="GtkPreview*"/>
         </parameter>
-        <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
+        <parameter name="dither">
+          <type name="GdkRgbDither" c:type="GdkRgbDither"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_cell_style"
-              c:identifier="gtk_clist_set_cell_style">
+    <function name="preview_get_visual" c:identifier="gtk_preview_get_visual">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GdkVisual*" c:type="GdkVisual*"/>
       </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="clist_get_cell_style"
-              c:identifier="gtk_clist_get_cell_style">
+    <function name="preview_get_cmap" c:identifier="gtk_preview_get_cmap">
       <return-value>
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="GdkColormap*" c:type="GdkColormap*"/>
       </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="clist_set_row_style" c:identifier="gtk_clist_set_row_style">
+    <function name="preview_get_info" c:identifier="gtk_preview_get_info">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkPreviewInfo*" c:type="GtkPreviewInfo*"/>
       </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="clist_get_row_style" c:identifier="gtk_clist_get_row_style">
+    <function name="preview_reset" c:identifier="gtk_preview_reset">
       <return-value>
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="none" c:type="void"/>
       </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="clist_set_shift" c:identifier="gtk_clist_set_shift">
+    <glib:boxed c:type="PaperSize"
+                glib:name="PaperSize"
+                glib:type-name="GtkPaperSize"
+                glib:get-type="gtk_paper_size_get_type">
+      <constructor name="new" c:identifier="gtk_paper_size_new">
+        <return-value>
+          <type name="PaperSize" c:type="GtkPaperSize*"/>
+        </return-value>
+        <parameters>
+          <parameter name="name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new_from_ppd"
+                   c:identifier="gtk_paper_size_new_from_ppd">
+        <return-value>
+          <type name="PaperSize" c:type="GtkPaperSize*"/>
+        </return-value>
+        <parameters>
+          <parameter name="ppd_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="ppd_display_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="height">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new_custom" c:identifier="gtk_paper_size_new_custom">
+        <return-value>
+          <type name="PaperSize" c:type="GtkPaperSize*"/>
+        </return-value>
+        <parameters>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="display_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="height">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="copy" c:identifier="gtk_paper_size_copy">
+        <return-value>
+          <type name="PaperSize" c:type="GtkPaperSize*"/>
+        </return-value>
+        <parameters>
+          <parameter name="other">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new_from_key_file"
+                   c:identifier="gtk_paper_size_new_from_key_file">
+        <return-value>
+          <type name="PaperSize" c:type="GtkPaperSize*"/>
+        </return-value>
+        <parameters>
+          <parameter name="key_file">
+            <type name="GKeyFile" c:type="GKeyFile*"/>
+          </parameter>
+          <parameter name="group_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="free" c:identifier="gtk_paper_size_free">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_equal" c:identifier="gtk_paper_size_is_equal">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="size1">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+          <parameter name="size2">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_name" c:identifier="gtk_paper_size_get_name">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_display_name"
+              c:identifier="gtk_paper_size_get_display_name">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_ppd_name" c:identifier="gtk_paper_size_get_ppd_name">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_width" c:identifier="gtk_paper_size_get_width">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_height" c:identifier="gtk_paper_size_get_height">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_custom" c:identifier="gtk_paper_size_is_custom">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_size" c:identifier="gtk_paper_size_set_size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="height">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_default_top_margin"
+              c:identifier="gtk_paper_size_get_default_top_margin">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_default_bottom_margin"
+              c:identifier="gtk_paper_size_get_default_bottom_margin">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_default_left_margin"
+              c:identifier="gtk_paper_size_get_default_left_margin">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_default_right_margin"
+              c:identifier="gtk_paper_size_get_default_right_margin">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="to_key_file" c:identifier="gtk_paper_size_to_key_file">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+          <parameter name="key_file">
+            <type name="GKeyFile" c:type="GKeyFile*"/>
+          </parameter>
+          <parameter name="group_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <function name="paper_size_get_paper_sizes"
+              c:identifier="gtk_paper_size_get_paper_sizes">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GList*" c:type="GList*"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="vertical">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="horizontal">
-          <type name="gint" c:type="gint"/>
+        <parameter name="include_custom">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_selectable"
-              c:identifier="gtk_clist_set_selectable">
+    <function name="paper_size_get_default"
+              c:identifier="gtk_paper_size_get_default">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="selectable">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="clist_get_selectable"
-              c:identifier="gtk_clist_get_selectable">
+    <class name="PageSetup"
+           c:type="GtkPageSetup"
+           parent="GLib.Object"
+           glib:type-name="GtkPageSetup"
+           glib:get-type="gtk_page_setup_get_type">
+      <constructor name="new" c:identifier="gtk_page_setup_new">
+        <return-value>
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
+        </return-value>
+      </constructor>
+      <constructor name="copy" c:identifier="gtk_page_setup_copy">
+        <return-value>
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
+        </return-value>
+        <parameters>
+          <parameter name="other">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new_from_file"
+                   c:identifier="gtk_page_setup_new_from_file">
+        <return-value>
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new_from_key_file"
+                   c:identifier="gtk_page_setup_new_from_key_file">
+        <return-value>
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
+        </return-value>
+        <parameters>
+          <parameter name="key_file">
+            <type name="GKeyFile" c:type="GKeyFile*"/>
+          </parameter>
+          <parameter name="group_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="get_orientation"
+              c:identifier="gtk_page_setup_get_orientation">
+        <return-value>
+          <type name="PageOrientation" c:type="GtkPageOrientation"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_orientation"
+              c:identifier="gtk_page_setup_set_orientation">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="orientation">
+            <type name="PageOrientation" c:type="GtkPageOrientation"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_paper_size"
+              c:identifier="gtk_page_setup_get_paper_size">
+        <return-value>
+          <type name="PaperSize" c:type="GtkPaperSize*"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_paper_size"
+              c:identifier="gtk_page_setup_set_paper_size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_top_margin"
+              c:identifier="gtk_page_setup_get_top_margin">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_top_margin"
+              c:identifier="gtk_page_setup_set_top_margin">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="margin">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_bottom_margin"
+              c:identifier="gtk_page_setup_get_bottom_margin">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_bottom_margin"
+              c:identifier="gtk_page_setup_set_bottom_margin">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="margin">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_left_margin"
+              c:identifier="gtk_page_setup_get_left_margin">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_left_margin"
+              c:identifier="gtk_page_setup_set_left_margin">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="margin">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_right_margin"
+              c:identifier="gtk_page_setup_get_right_margin">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_right_margin"
+              c:identifier="gtk_page_setup_set_right_margin">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="margin">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_paper_size_and_default_margins"
+              c:identifier="gtk_page_setup_set_paper_size_and_default_margins">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_paper_width"
+              c:identifier="gtk_page_setup_get_paper_width">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_paper_height"
+              c:identifier="gtk_page_setup_get_paper_height">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_page_width"
+              c:identifier="gtk_page_setup_get_page_width">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_page_height"
+              c:identifier="gtk_page_setup_get_page_height">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="to_file" c:identifier="gtk_page_setup_to_file">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="file_name">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="to_key_file" c:identifier="gtk_page_setup_to_key_file">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="key_file">
+            <type name="GKeyFile" c:type="GKeyFile*"/>
+          </parameter>
+          <parameter name="group_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </class>
+    <callback name="GtkPrintSettingsFunc">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
+        <parameter name="key">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="clist_prepend" c:identifier="gtk_clist_prepend">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="value">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="clist_append" c:identifier="gtk_clist_append">
+    </callback>
+    <record name="GtkPageRange" c:type="GtkPageRange">
+      <field name="start">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="end">
+        <type name="int32" c:type="gint"/>
+      </field>
+    </record>
+    <class name="PrintSettings"
+           c:type="GtkPrintSettings"
+           parent="GLib.Object"
+           glib:type-name="GtkPrintSettings"
+           glib:get-type="gtk_print_settings_get_type">
+      <constructor name="new" c:identifier="gtk_print_settings_new">
+        <return-value>
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+        </return-value>
+      </constructor>
+      <constructor name="copy" c:identifier="gtk_print_settings_copy">
+        <return-value>
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+        </return-value>
+        <parameters>
+          <parameter name="other">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new_from_file"
+                   c:identifier="gtk_print_settings_new_from_file">
+        <return-value>
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new_from_key_file"
+                   c:identifier="gtk_print_settings_new_from_key_file">
+        <return-value>
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+        </return-value>
+        <parameters>
+          <parameter name="key_file">
+            <type name="GKeyFile" c:type="GKeyFile*"/>
+          </parameter>
+          <parameter name="group_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="to_file" c:identifier="gtk_print_settings_to_file">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="file_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="to_key_file" c:identifier="gtk_print_settings_to_key_file">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key_file">
+            <type name="GKeyFile" c:type="GKeyFile*"/>
+          </parameter>
+          <parameter name="group_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="has_key" c:identifier="gtk_print_settings_has_key">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get" c:identifier="gtk_print_settings_get">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set" c:identifier="gtk_print_settings_set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unset" c:identifier="gtk_print_settings_unset">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="foreach" c:identifier="gtk_print_settings_foreach">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="GtkPrintSettingsFunc" c:type="GtkPrintSettingsFunc"/>
+          </parameter>
+          <parameter name="user_data" allow-none="1">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_bool" c:identifier="gtk_print_settings_get_bool">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_bool" c:identifier="gtk_print_settings_set_bool">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_double" c:identifier="gtk_print_settings_get_double">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_double_with_default"
+              c:identifier="gtk_print_settings_get_double_with_default">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="def">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_double" c:identifier="gtk_print_settings_set_double">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_length" c:identifier="gtk_print_settings_get_length">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_length" c:identifier="gtk_print_settings_set_length">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_int" c:identifier="gtk_print_settings_get_int">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_int_with_default"
+              c:identifier="gtk_print_settings_get_int_with_default">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="def">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_int" c:identifier="gtk_print_settings_set_int">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_printer" c:identifier="gtk_print_settings_get_printer">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_printer" c:identifier="gtk_print_settings_set_printer">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="printer">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_orientation"
+              c:identifier="gtk_print_settings_get_orientation">
+        <return-value>
+          <type name="PageOrientation" c:type="GtkPageOrientation"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_orientation"
+              c:identifier="gtk_print_settings_set_orientation">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="orientation">
+            <type name="PageOrientation" c:type="GtkPageOrientation"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_paper_size"
+              c:identifier="gtk_print_settings_get_paper_size">
+        <return-value>
+          <type name="PaperSize" c:type="GtkPaperSize*"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_paper_size"
+              c:identifier="gtk_print_settings_set_paper_size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="paper_size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_paper_width"
+              c:identifier="gtk_print_settings_get_paper_width">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_paper_width"
+              c:identifier="gtk_print_settings_set_paper_width">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_paper_height"
+              c:identifier="gtk_print_settings_get_paper_height">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_paper_height"
+              c:identifier="gtk_print_settings_set_paper_height">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="height">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_use_color"
+              c:identifier="gtk_print_settings_get_use_color">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_use_color"
+              c:identifier="gtk_print_settings_set_use_color">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="use_color">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_collate" c:identifier="gtk_print_settings_get_collate">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_collate" c:identifier="gtk_print_settings_set_collate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="collate">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_reverse" c:identifier="gtk_print_settings_get_reverse">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_reverse" c:identifier="gtk_print_settings_set_reverse">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="reverse">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_duplex" c:identifier="gtk_print_settings_get_duplex">
+        <return-value>
+          <type name="PrintDuplex" c:type="GtkPrintDuplex"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_duplex" c:identifier="gtk_print_settings_set_duplex">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="duplex">
+            <type name="PrintDuplex" c:type="GtkPrintDuplex"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_quality" c:identifier="gtk_print_settings_get_quality">
+        <return-value>
+          <type name="PrintQuality" c:type="GtkPrintQuality"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_quality" c:identifier="gtk_print_settings_set_quality">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="quality">
+            <type name="PrintQuality" c:type="GtkPrintQuality"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_n_copies"
+              c:identifier="gtk_print_settings_get_n_copies">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_n_copies"
+              c:identifier="gtk_print_settings_set_n_copies">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="num_copies">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_number_up"
+              c:identifier="gtk_print_settings_get_number_up">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_number_up"
+              c:identifier="gtk_print_settings_set_number_up">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="number_up">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_resolution"
+              c:identifier="gtk_print_settings_get_resolution">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_resolution"
+              c:identifier="gtk_print_settings_set_resolution">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="resolution">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_scale" c:identifier="gtk_print_settings_get_scale">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_scale" c:identifier="gtk_print_settings_set_scale">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="scale">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_print_pages"
+              c:identifier="gtk_print_settings_get_print_pages">
+        <return-value>
+          <type name="PrintPages" c:type="GtkPrintPages"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_print_pages"
+              c:identifier="gtk_print_settings_set_print_pages">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="pages">
+            <type name="PrintPages" c:type="GtkPrintPages"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_page_ranges"
+              c:identifier="gtk_print_settings_get_page_ranges">
+        <return-value>
+          <type name="GtkPageRange" c:type="GtkPageRange*"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="num_ranges">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_page_ranges"
+              c:identifier="gtk_print_settings_set_page_ranges">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="page_ranges">
+            <type name="GtkPageRange" c:type="GtkPageRange*"/>
+          </parameter>
+          <parameter name="num_ranges">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_page_set"
+              c:identifier="gtk_print_settings_get_page_set">
+        <return-value>
+          <type name="PageSet" c:type="GtkPageSet"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_page_set"
+              c:identifier="gtk_print_settings_set_page_set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="page_set">
+            <type name="PageSet" c:type="GtkPageSet"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_default_source"
+              c:identifier="gtk_print_settings_get_default_source">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_default_source"
+              c:identifier="gtk_print_settings_set_default_source">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="default_source">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_media_type"
+              c:identifier="gtk_print_settings_get_media_type">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_media_type"
+              c:identifier="gtk_print_settings_set_media_type">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="media_type">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_dither" c:identifier="gtk_print_settings_get_dither">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_dither" c:identifier="gtk_print_settings_set_dither">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="dither">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_finishings"
+              c:identifier="gtk_print_settings_get_finishings">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_finishings"
+              c:identifier="gtk_print_settings_set_finishings">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="finishings">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_output_bin"
+              c:identifier="gtk_print_settings_get_output_bin">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_output_bin"
+              c:identifier="gtk_print_settings_set_output_bin">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="output_bin">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </class>
+    <class name="PrintContext"
+           c:type="GtkPrintContext"
+           parent="GLib.Object"
+           glib:type-name="GtkPrintContext"
+           glib:get-type="gtk_print_context_get_type">
+      <method name="get_cairo_context"
+              c:identifier="gtk_print_context_get_cairo_context">
+        <return-value>
+          <type name="cairo_t" c:type="cairo_t*"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_page_setup"
+              c:identifier="gtk_print_context_get_page_setup">
+        <return-value>
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_width" c:identifier="gtk_print_context_get_width">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_height" c:identifier="gtk_print_context_get_height">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_dpi_x" c:identifier="gtk_print_context_get_dpi_x">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_dpi_y" c:identifier="gtk_print_context_get_dpi_y">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_pango_fontmap"
+              c:identifier="gtk_print_context_get_pango_fontmap">
+        <return-value>
+          <type name="Pango.FontMap" c:type="PangoFontMap*"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="create_pango_context"
+              c:identifier="gtk_print_context_create_pango_context">
+        <return-value>
+          <type name="Pango.Context" c:type="PangoContext*"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="create_pango_layout"
+              c:identifier="gtk_print_context_create_pango_layout">
+        <return-value>
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_cairo_context"
+              c:identifier="gtk_print_context_set_cairo_context">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+          <parameter name="cr">
+            <type name="cairo_t" c:type="cairo_t*"/>
+          </parameter>
+          <parameter name="dpi_x">
+            <type name="double" c:type="double"/>
+          </parameter>
+          <parameter name="dpi_y">
+            <type name="double" c:type="double"/>
+          </parameter>
+        </parameters>
+      </method>
+    </class>
+    <record name="GtkPrintOperationPreview" c:type="GtkPrintOperationPreview"/>
+    <interface name="PrintOperationPreview"
+               c:type="GtkPrintOperationPreview"
+               glib:type-name="GtkPrintOperationPreview"
+               glib:get-type="gtk_print_operation_preview_get_type">
+      <callback name="ready">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="preview">
+            <type name="GtkPrintOperationPreview*"
+                  c:type="GtkPrintOperationPreview*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="got_page_size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="preview">
+            <type name="GtkPrintOperationPreview*"
+                  c:type="GtkPrintOperationPreview*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          </parameter>
+          <parameter name="page_setup">
+            <type name="GtkPageSetup*" c:type="GtkPageSetup*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="render_page">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="preview">
+            <type name="GtkPrintOperationPreview*"
+                  c:type="GtkPrintOperationPreview*"/>
+          </parameter>
+          <parameter name="page_nr">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="is_selected">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="preview">
+            <type name="GtkPrintOperationPreview*"
+                  c:type="GtkPrintOperationPreview*"/>
+          </parameter>
+          <parameter name="page_nr">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="end_preview">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="preview">
+            <type name="GtkPrintOperationPreview*"
+                  c:type="GtkPrintOperationPreview*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved6">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved7">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="ready">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="got-page-size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkPageSetup" c:type="GtkPageSetup"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </interface>
+    <function name="print_operation_preview_render_page"
+              c:identifier="gtk_print_operation_preview_render_page">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="preview">
+          <type name="PrintOperationPreview"
+                c:type="GtkPrintOperationPreview*"/>
         </parameter>
-        <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="page_nr">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_insert" c:identifier="gtk_clist_insert">
+    <function name="print_operation_preview_end_preview"
+              c:identifier="gtk_print_operation_preview_end_preview">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="preview">
+          <type name="PrintOperationPreview"
+                c:type="GtkPrintOperationPreview*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_remove" c:identifier="gtk_clist_remove">
+    <function name="print_operation_preview_is_selected"
+              c:identifier="gtk_print_operation_preview_is_selected">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="preview">
+          <type name="PrintOperationPreview"
+                c:type="GtkPrintOperationPreview*"/>
         </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
+        <parameter name="page_nr">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_row_data" c:identifier="gtk_clist_set_row_data">
+    <record name="GtkPrintOperationPrivate" c:type="GtkPrintOperationPrivate"/>
+    <function name="print_error_quark" c:identifier="gtk_print_error_quark">
       <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
+        <type name="GQuark" c:type="GQuark"/>
+      </return-value>
     </function>
-    <function name="clist_set_row_data_full"
-              c:identifier="gtk_clist_set_row_data_full">
+    <class name="PrintOperation"
+           c:type="GtkPrintOperation"
+           parent="GLib.Object"
+           glib:type-name="GtkPrintOperation"
+           glib:get-type="gtk_print_operation_get_type">
+      <constructor name="new" c:identifier="gtk_print_operation_new">
+        <return-value>
+          <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+        </return-value>
+      </constructor>
+      <method name="set_default_page_setup"
+              c:identifier="gtk_print_operation_set_default_page_setup">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="default_page_setup" allow-none="1">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_default_page_setup"
+              c:identifier="gtk_print_operation_get_default_page_setup">
+        <return-value>
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_print_settings"
+              c:identifier="gtk_print_operation_set_print_settings">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="print_settings" allow-none="1">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_print_settings"
+              c:identifier="gtk_print_operation_get_print_settings">
+        <return-value>
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_job_name"
+              c:identifier="gtk_print_operation_set_job_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="job_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_n_pages"
+              c:identifier="gtk_print_operation_set_n_pages">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="n_pages">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_current_page"
+              c:identifier="gtk_print_operation_set_current_page">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="current_page">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_use_full_page"
+              c:identifier="gtk_print_operation_set_use_full_page">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="full_page">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_unit" c:identifier="gtk_print_operation_set_unit">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_export_filename"
+              c:identifier="gtk_print_operation_set_export_filename">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_track_print_status"
+              c:identifier="gtk_print_operation_set_track_print_status">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="track_status">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_show_progress"
+              c:identifier="gtk_print_operation_set_show_progress">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="show_progress">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_allow_async"
+              c:identifier="gtk_print_operation_set_allow_async">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="allow_async">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_custom_tab_label"
+              c:identifier="gtk_print_operation_set_custom_tab_label">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="run" c:identifier="gtk_print_operation_run">
+        <return-value>
+          <type name="PrintOperationResult" c:type="GtkPrintOperationResult"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="action">
+            <type name="PrintOperationAction"
+                  c:type="GtkPrintOperationAction"/>
+          </parameter>
+          <parameter name="parent" allow-none="1">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_error" c:identifier="gtk_print_operation_get_error">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_status" c:identifier="gtk_print_operation_get_status">
+        <return-value>
+          <type name="PrintStatus" c:type="GtkPrintStatus"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_status_string"
+              c:identifier="gtk_print_operation_get_status_string">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_finished"
+              c:identifier="gtk_print_operation_is_finished">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="cancel" c:identifier="gtk_print_operation_cancel">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="default-page-setup">
+        <type name="GtkPageSetup" c:type="GtkPageSetup"/>
+      </property>
+      <property name="print-settings">
+        <type name="GtkPrintSettings" c:type="GtkPrintSettings"/>
+      </property>
+      <property name="job-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="n-pages">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="current-page">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="use-full-page">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="track-print-status">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="unit">
+        <type name="GtkUnit" c:type="GtkUnit"/>
+      </property>
+      <property name="show-progress">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="allow-async">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="export-filename">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="status">
+        <type name="GtkPrintStatus" c:type="GtkPrintStatus"/>
+      </property>
+      <property name="status-string">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="custom-tab-label">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <callback name="done">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="GtkPrintOperationResult"
+                  c:type="GtkPrintOperationResult"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="begin_print">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="paginate">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="request_page_setup">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          </parameter>
+          <parameter name="page_nr">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="setup">
+            <type name="GtkPageSetup*" c:type="GtkPageSetup*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="draw_page">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          </parameter>
+          <parameter name="page_nr">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="end_print">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="status_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="create_custom_widget">
+        <return-value>
+          <type name="GtkWidget*" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="custom_widget_apply">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="preview">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="preview">
+            <type name="GtkPrintOperationPreview*"
+                  c:type="GtkPrintOperationPreview*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          </parameter>
+          <parameter name="parent">
+            <type name="GtkWindow*" c:type="GtkWindow*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved6">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved7">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="done">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkPrintOperationResult"
+                  c:type="GtkPrintOperationResult"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="begin-print">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="paginate">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="request-page-setup">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="GtkPageSetup" c:type="GtkPageSetup"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="draw-page">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="end-print">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="status-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="create-custom-widget">
+        <return-value>
+          <type name="GObject" c:type="GObject"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="custom-widget-apply">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkWidget" c:type="GtkWidget"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="preview">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkPrintOperationPreview"
+                  c:type="GtkPrintOperationPreview"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="GtkWindow" c:type="GtkWindow"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <function name="print_run_page_setup_dialog"
+              c:identifier="gtk_print_run_page_setup_dialog">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkPageSetup*" c:type="GtkPageSetup*"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        <parameter name="parent" allow-none="1">
+          <type name="Window" c:type="GtkWindow*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_row_data" c:identifier="gtk_clist_get_row_data">
-      <return-value>
-        <type name="gpointer" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="page_setup" allow-none="1">
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
         </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
+        <parameter name="settings">
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_find_row_from_data"
-              c:identifier="gtk_clist_find_row_from_data">
+    <callback name="GtkPageSetupDoneFunc">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="page_setup">
+          <type name="GtkPageSetup*" c:type="GtkPageSetup*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_select_row" c:identifier="gtk_clist_select_row">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_unselect_row" c:identifier="gtk_clist_unselect_row">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_undo_selection"
-              c:identifier="gtk_clist_undo_selection">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_clear" c:identifier="gtk_clist_clear">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_selection_info"
-              c:identifier="gtk_clist_get_selection_info">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="row">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_select_all" c:identifier="gtk_clist_select_all">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_unselect_all" c:identifier="gtk_clist_unselect_all">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_swap_rows" c:identifier="gtk_clist_swap_rows">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row1">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="row2">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_row_move" c:identifier="gtk_clist_row_move">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="source_row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="dest_row">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_compare_func"
-              c:identifier="gtk_clist_set_compare_func">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="cmp_func">
-          <type name="GtkCListCompareFunc" c:type="GtkCListCompareFunc"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_sort_column"
-              c:identifier="gtk_clist_set_sort_column">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_sort_type" c:identifier="gtk_clist_set_sort_type">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="sort_type">
-          <type name="SortType" c:type="GtkSortType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_sort" c:identifier="gtk_clist_sort">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="clist_set_auto_sort" c:identifier="gtk_clist_set_auto_sort">
+    </callback>
+    <function name="print_run_page_setup_dialog_async"
+              c:identifier="gtk_print_run_page_setup_dialog_async">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="parent">
+          <type name="Window" c:type="GtkWindow*"/>
         </parameter>
-        <parameter name="auto_sort">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="page_setup">
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="clist_create_cell_layout"
-              c:identifier="_gtk_clist_create_cell_layout">
-      <return-value>
-        <type name="PangoLayout*" c:type="PangoLayout*"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="settings">
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
         </parameter>
-        <parameter name="clist_row">
-          <type name="GtkCListRow" c:type="GtkCListRow*"/>
+        <parameter name="done_cb">
+          <type name="GtkPageSetupDoneFunc" c:type="GtkPageSetupDoneFunc"/>
         </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <class name="Combo"
-           c:type="GtkCombo"
-           parent="HBox"
-           glib:type-name="GtkCombo"
-           glib:get-type="gtk_combo_get_type">
-      <method name="set_value_in_list"
-              c:identifier="gtk_combo_set_value_in_list">
+    <class name="Progress"
+           c:type="GtkProgress"
+           parent="Widget"
+           glib:type-name="GtkProgress"
+           glib:get-type="gtk_progress_get_type">
+      <method name="set_show_text" c:identifier="gtk_progress_set_show_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="show_text">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_text_alignment"
+              c:identifier="gtk_progress_set_text_alignment">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="x_align">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="y_align">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_format_string"
+              c:identifier="gtk_progress_set_format_string">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="format">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_adjustment" c:identifier="gtk_progress_set_adjustment">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="configure" c:identifier="gtk_progress_configure">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="hmin">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="max">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_percentage" c:identifier="gtk_progress_set_percentage">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="percentage">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_value" c:identifier="gtk_progress_set_value">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_value" c:identifier="gtk_progress_get_value">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_activity_mode"
+              c:identifier="gtk_progress_set_activity_mode">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="activity_mode">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_current_text"
+              c:identifier="gtk_progress_get_current_text">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_text_from_value"
+              c:identifier="gtk_progress_get_text_from_value">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_current_percentage"
+              c:identifier="gtk_progress_get_current_percentage">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_percentage_from_value"
+              c:identifier="gtk_progress_get_percentage_from_value">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="activity-mode">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-text">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="text-xalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="text-yalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <callback name="paint">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="GtkProgress*" c:type="GtkProgress*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="update">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="GtkProgress*" c:type="GtkProgress*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="act_mode_enter">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="GtkProgress*" c:type="GtkProgress*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <class name="ProgressBar"
+           c:type="GtkProgressBar"
+           parent="Progress"
+           glib:type-name="GtkProgressBar"
+           glib:get-type="gtk_progress_bar_get_type">
+      <method name="pulse" c:identifier="gtk_progress_bar_pulse">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_text" c:identifier="gtk_progress_bar_set_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_fraction" c:identifier="gtk_progress_bar_set_fraction">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="fraction">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_pulse_step"
+              c:identifier="gtk_progress_bar_set_pulse_step">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="fraction">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_orientation"
+              c:identifier="gtk_progress_bar_set_orientation">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="orientation">
+            <type name="ProgressBarOrientation"
+                  c:type="GtkProgressBarOrientation"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_text" c:identifier="gtk_progress_bar_get_text">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_fraction" c:identifier="gtk_progress_bar_get_fraction">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="Combo" c:type="GtkCombo*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
-          <parameter name="val">
-            <type name="gboolean" c:type="gboolean"/>
+        </parameters>
+      </method>
+      <method name="get_pulse_step"
+              c:identifier="gtk_progress_bar_get_pulse_step">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
-          <parameter name="ok_if_empty">
-            <type name="gboolean" c:type="gboolean"/>
+        </parameters>
+      </method>
+      <method name="get_orientation"
+              c:identifier="gtk_progress_bar_get_orientation">
+        <return-value>
+          <type name="ProgressBarOrientation"
+                c:type="GtkProgressBarOrientation"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_arrows" c:identifier="gtk_combo_set_use_arrows">
+      <method name="set_ellipsize"
+              c:identifier="gtk_progress_bar_set_ellipsize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="Combo" c:type="GtkCombo*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
-          <parameter name="val">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="mode">
+            <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_arrows_always"
-              c:identifier="gtk_combo_set_use_arrows_always">
+      <method name="get_ellipsize"
+              c:identifier="gtk_progress_bar_get_ellipsize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="Combo" c:type="GtkCombo*"/>
-          </parameter>
-          <parameter name="val">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_case_sensitive"
-              c:identifier="gtk_combo_set_case_sensitive">
+      <method name="set_bar_style"
+              c:identifier="gtk_progress_bar_set_bar_style">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="Combo" c:type="GtkCombo*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
-          <parameter name="val">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="style">
+            <type name="ProgressBarStyle" c:type="GtkProgressBarStyle"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_item_string" c:identifier="gtk_combo_set_item_string">
+      <method name="set_discrete_blocks"
+              c:identifier="gtk_progress_bar_set_discrete_blocks">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="Combo" c:type="GtkCombo*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
-          <parameter name="item">
-            <type name="Item" c:type="GtkItem*"/>
+          <parameter name="blocks">
+            <type name="guint" c:type="guint"/>
           </parameter>
-          <parameter name="item_value">
-            <type name="gchar" c:type="gchar*"/>
+        </parameters>
+      </method>
+      <method name="set_activity_step"
+              c:identifier="gtk_progress_bar_set_activity_step">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="step">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_popdown_strings"
-              c:identifier="gtk_combo_set_popdown_strings">
+      <method name="set_activity_blocks"
+              c:identifier="gtk_progress_bar_set_activity_blocks">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="Combo" c:type="GtkCombo*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
-          <parameter name="strings">
-            <type name="GList" c:type="GList*"/>
+          <parameter name="blocks">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="disable_activate" c:identifier="gtk_combo_disable_activate">
+      <method name="update" c:identifier="gtk_progress_bar_update">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="Combo" c:type="GtkCombo*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="percentage">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <property name="enable-arrow-keys">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="fraction">
+        <type name="double" c:type="gdouble"/>
       </property>
-      <property name="enable-arrows-always">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="pulse-step">
+        <type name="double" c:type="gdouble"/>
       </property>
-      <property name="case-sensitive">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="orientation">
+        <type name="GtkProgressBarOrientation"
+              c:type="GtkProgressBarOrientation"/>
       </property>
-      <property name="allow-empty">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="text">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <property name="value-in-list">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="ellipsize">
+        <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
+      </property>
+      <property name="adjustment">
+        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="bar-style">
+        <type name="GtkProgressBarStyle" c:type="GtkProgressBarStyle"/>
+      </property>
+      <property name="activity-step">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <property name="activity-blocks">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <property name="discrete-blocks">
+        <type name="guint" c:type="guint"/>
       </property>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
-    <function name="combo_new" c:identifier="gtk_combo_new">
+    <function name="progress_bar_new" c:identifier="gtk_progress_bar_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
     </function>
-    <record name="GtkCTree" c:type="GtkCTree">
-      <field name="clist">
-        <type name="GtkCList" c:type="GtkCList"/>
-      </field>
-      <field name="lines_gc">
-        <type name="GdkGC*" c:type="GdkGC*"/>
-      </field>
-      <field name="tree_indent">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="tree_spacing">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="tree_column">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="line_style">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="expander_style">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="show_stub">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="drag_compare">
-        <type name="GtkCTreeCompareDragFunc" c:type="GtkCTreeCompareDragFunc"/>
-      </field>
-      <callback name="tree_select_row">
+    <function name="progress_bar_new_with_adjustment"
+              c:identifier="gtk_progress_bar_new_with_adjustment">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="adjustment" allow-none="1">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkToggleActionPrivate" c:type="GtkToggleActionPrivate"/>
+    <class name="ToggleAction"
+           c:type="GtkToggleAction"
+           parent="Action"
+           glib:type-name="GtkToggleAction"
+           glib:get-type="gtk_toggle_action_get_type">
+      <constructor name="new" c:identifier="gtk_toggle_action_new">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="ToggleAction" c:type="GtkToggleAction*"/>
         </return-value>
         <parameters>
-          <parameter name="ctree">
-            <type name="GtkCTree*" c:type="GtkCTree*"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="row">
-            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
+          <parameter name="tooltip">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="tree_unselect_row">
+      </constructor>
+      <method name="toggled" c:identifier="gtk_toggle_action_toggled">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ctree">
-            <type name="GtkCTree*" c:type="GtkCTree*"/>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
           </parameter>
-          <parameter name="row">
-            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        </parameters>
+      </method>
+      <method name="set_active" c:identifier="gtk_toggle_action_set_active">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
           </parameter>
-          <parameter name="column">
-            <type name="gint" c:type="gint"/>
+          <parameter name="is_active">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="tree_expand">
+      </method>
+      <method name="get_active" c:identifier="gtk_toggle_action_get_active">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="ctree">
-            <type name="GtkCTree*" c:type="GtkCTree*"/>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
           </parameter>
-          <parameter name="node">
-            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        </parameters>
+      </method>
+      <method name="set_draw_as_radio"
+              c:identifier="gtk_toggle_action_set_draw_as_radio">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          </parameter>
+          <parameter name="draw_as_radio">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="tree_collapse">
+      </method>
+      <method name="get_draw_as_radio"
+              c:identifier="gtk_toggle_action_get_draw_as_radio">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="ctree">
-            <type name="GtkCTree*" c:type="GtkCTree*"/>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
           </parameter>
-          <parameter name="node">
-            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        </parameters>
+      </method>
+      <property name="draw-as-radio">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="active">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="toggled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="GtkToggleAction*" c:type="GtkToggleAction*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="tree_move">
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="toggled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <record name="GtkRadioActionPrivate" c:type="GtkRadioActionPrivate"/>
+    <class name="RadioAction"
+           c:type="GtkRadioAction"
+           parent="ToggleAction"
+           glib:type-name="GtkRadioAction"
+           glib:get-type="gtk_radio_action_get_type">
+      <constructor name="new" c:identifier="gtk_radio_action_new">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="RadioAction" c:type="GtkRadioAction*"/>
         </return-value>
         <parameters>
-          <parameter name="ctree">
-            <type name="GtkCTree*" c:type="GtkCTree*"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="node">
-            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="new_parent">
-            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+          <parameter name="tooltip">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="new_sibling">
-            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="change_focus_row_expansion">
+      </constructor>
+      <method name="get_group" c:identifier="gtk_radio_action_get_group">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="ctree">
-            <type name="GtkCTree*" c:type="GtkCTree*"/>
+          <parameter name="action">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
           </parameter>
+        </parameters>
+      </method>
+      <method name="set_group" c:identifier="gtk_radio_action_set_group">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
           <parameter name="action">
-            <type name="GtkCTreeExpansionType" c:type="GtkCTreeExpansionType"/>
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          </parameter>
+          <parameter name="group">
+            <type name="GSList" c:type="GSList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_current_value"
+              c:identifier="gtk_radio_action_get_current_value">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_current_value"
+              c:identifier="gtk_radio_action_set_current_value">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          </parameter>
+          <parameter name="current_value">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="value">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="group">
+        <type name="GtkRadioAction" c:type="GtkRadioAction"/>
+      </property>
+      <property name="current-value">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <callback name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="GtkRadioAction*" c:type="GtkRadioAction*"/>
+          </parameter>
+          <parameter name="current">
+            <type name="GtkRadioAction*" c:type="GtkRadioAction*"/>
           </parameter>
         </parameters>
       </callback>
-    </record>
-    <record name="GtkCTreeRow" c:type="GtkCTreeRow">
-      <field name="row">
-        <type name="GtkCListRow" c:type="GtkCListRow"/>
-      </field>
-      <field name="parent">
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
-      </field>
-      <field name="sibling">
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
-      </field>
-      <field name="children">
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
-      </field>
-      <field name="pixmap_closed">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
-      </field>
-      <field name="mask_closed">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
-      </field>
-      <field name="pixmap_opened">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
-      </field>
-      <field name="mask_opened">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
-      </field>
-      <field name="level">
-        <type name="guint16" c:type="guint16"/>
-      </field>
-      <field name="is_leaf">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="expanded">
-        <type name="guint" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkCTreeNode" c:type="GtkCTreeNode">
-      <field name="list">
-        <type name="GList" c:type="GList"/>
-      </field>
-    </record>
-    <callback name="GtkCTreeFunc">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree*" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkCTreeGNodeFunc">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree*" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="depth">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="gnode">
-          <type name="GNode*" c:type="GNode*"/>
-        </parameter>
-        <parameter name="cnode">
-          <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkCTreeCompareDragFunc">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree*" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="source_node">
-          <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="new_parent">
-          <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="new_sibling">
-          <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <function name="ctree_get_type" c:identifier="gtk_ctree_get_type">
-      <return-value>
-        <type name="GtkType" c:type="GtkType"/>
-      </return-value>
-    </function>
-    <function name="ctree_new_with_titles"
-              c:identifier="gtk_ctree_new_with_titles">
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkRadioAction" c:type="GtkRadioAction"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <class name="RadioButton"
+           c:type="GtkRadioButton"
+           parent="CheckButton"
+           glib:type-name="GtkRadioButton"
+           glib:get-type="gtk_radio_button_get_type">
+      <method name="new_from_widget"
+              c:identifier="gtk_radio_button_new_from_widget">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="radio_group_member">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="new_with_label_from_widget"
+              c:identifier="gtk_radio_button_new_with_label_from_widget">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="radio_group_member">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          </parameter>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="new_with_mnemonic_from_widget"
+              c:identifier="gtk_radio_button_new_with_mnemonic_from_widget">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="radio_group_member">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          </parameter>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_group" c:identifier="gtk_radio_button_get_group">
+        <return-value>
+          <type name="GSList" c:type="GSList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="radio_button">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_group" c:identifier="gtk_radio_button_set_group">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="radio_button">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          </parameter>
+          <parameter name="group">
+            <type name="GSList" c:type="GSList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="group">
+        <type name="GtkRadioButton" c:type="GtkRadioButton"/>
+      </property>
+      <callback name="group_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="radio_button">
+            <type name="GtkRadioButton*" c:type="GtkRadioButton*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="group-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="radio_button_new" c:identifier="gtk_radio_button_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="columns">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="tree_column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="titles">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="group">
+          <type name="GSList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_new" c:identifier="gtk_ctree_new">
+    <function name="radio_button_new_with_label"
+              c:identifier="gtk_radio_button_new_with_label">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="columns">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="tree_column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_insert_node" c:identifier="gtk_ctree_insert_node">
-      <return-value>
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="sibling">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="guint8" c:type="guint8"/>
-        </parameter>
-        <parameter name="pixmap_closed">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask_closed">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-        <parameter name="pixmap_opened">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask_opened">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-        <parameter name="is_leaf">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="expanded">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_remove_node" c:identifier="gtk_ctree_remove_node">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_insert_gnode" c:identifier="gtk_ctree_insert_gnode">
-      <return-value>
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="sibling">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="gnode">
-          <type name="GNode" c:type="GNode*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkCTreeGNodeFunc" c:type="GtkCTreeGNodeFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_export_to_gnode"
-              c:identifier="gtk_ctree_export_to_gnode">
-      <return-value>
-        <type name="GNode*" c:type="GNode*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="GNode" c:type="GNode*"/>
-        </parameter>
-        <parameter name="sibling">
-          <type name="GNode" c:type="GNode*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkCTreeGNodeFunc" c:type="GtkCTreeGNodeFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_post_recursive"
-              c:identifier="gtk_ctree_post_recursive">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkCTreeFunc" c:type="GtkCTreeFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_post_recursive_to_depth"
-              c:identifier="gtk_ctree_post_recursive_to_depth">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="depth">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkCTreeFunc" c:type="GtkCTreeFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_pre_recursive" c:identifier="gtk_ctree_pre_recursive">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkCTreeFunc" c:type="GtkCTreeFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_pre_recursive_to_depth"
-              c:identifier="gtk_ctree_pre_recursive_to_depth">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="depth">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkCTreeFunc" c:type="GtkCTreeFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_is_viewable" c:identifier="gtk_ctree_is_viewable">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_last" c:identifier="gtk_ctree_last">
-      <return-value>
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_find_node_ptr" c:identifier="gtk_ctree_find_node_ptr">
-      <return-value>
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="group">
+          <type name="GSList" c:type="GSList*"/>
         </parameter>
-        <parameter name="ctree_row">
-          <type name="GtkCTreeRow" c:type="GtkCTreeRow*"/>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_nth" c:identifier="gtk_ctree_node_nth">
+    <function name="radio_button_new_with_mnemonic"
+              c:identifier="gtk_radio_button_new_with_mnemonic">
       <return-value>
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="group">
+          <type name="GSList" c:type="GSList*"/>
         </parameter>
-        <parameter name="row">
-          <type name="guint" c:type="guint"/>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_find" c:identifier="gtk_ctree_find">
+    <class name="RadioMenuItem"
+           c:type="GtkRadioMenuItem"
+           parent="CheckMenuItem"
+           glib:type-name="GtkRadioMenuItem"
+           glib:get-type="gtk_radio_menu_item_get_type">
+      <method name="new_from_widget"
+              c:identifier="gtk_radio_menu_item_new_from_widget">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="group">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="new_with_mnemonic_from_widget"
+              c:identifier="gtk_radio_menu_item_new_with_mnemonic_from_widget">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="group">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          </parameter>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="new_with_label_from_widget"
+              c:identifier="gtk_radio_menu_item_new_with_label_from_widget">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="group">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          </parameter>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_group" c:identifier="gtk_radio_menu_item_get_group">
+        <return-value>
+          <type name="GSList" c:type="GSList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="radio_menu_item">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_group" c:identifier="gtk_radio_menu_item_set_group">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="radio_menu_item">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          </parameter>
+          <parameter name="group">
+            <type name="GSList" c:type="GSList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="group">
+        <type name="GtkRadioMenuItem" c:type="GtkRadioMenuItem"/>
+      </property>
+      <callback name="group_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="radio_menu_item">
+            <type name="GtkRadioMenuItem*" c:type="GtkRadioMenuItem*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="group-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="radio_menu_item_new"
+              c:identifier="gtk_radio_menu_item_new">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="child">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="group">
+          <type name="GSList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_is_ancestor" c:identifier="gtk_ctree_is_ancestor">
+    <function name="radio_menu_item_new_with_label"
+              c:identifier="gtk_radio_menu_item_new_with_label">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="group">
+          <type name="GSList" c:type="GSList*"/>
         </parameter>
-        <parameter name="child">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_find_by_row_data"
-              c:identifier="gtk_ctree_find_by_row_data">
+    <function name="radio_menu_item_new_with_mnemonic"
+              c:identifier="gtk_radio_menu_item_new_with_mnemonic">
       <return-value>
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="group">
+          <type name="GSList" c:type="GSList*"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_find_all_by_row_data"
-              c:identifier="gtk_ctree_find_all_by_row_data">
+    <record name="GtkToggleToolButtonPrivate"
+            c:type="GtkToggleToolButtonPrivate"/>
+    <class name="ToggleToolButton"
+           c:type="GtkToggleToolButton"
+           parent="ToolButton"
+           glib:type-name="GtkToggleToolButton"
+           glib:get-type="gtk_toggle_tool_button_get_type">
+      <method name="set_active"
+              c:identifier="gtk_toggle_tool_button_set_active">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="ToggleToolButton" c:type="GtkToggleToolButton*"/>
+          </parameter>
+          <parameter name="is_active">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_active"
+              c:identifier="gtk_toggle_tool_button_get_active">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="ToggleToolButton" c:type="GtkToggleToolButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="active">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="toggled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="GtkToggleToolButton*" c:type="GtkToggleToolButton*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="toggled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="toggle_tool_button_new"
+              c:identifier="gtk_toggle_tool_button_new">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
       </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="ctree_find_by_row_data_custom"
-              c:identifier="gtk_ctree_find_by_row_data_custom">
+    <function name="toggle_tool_button_new_from_stock"
+              c:identifier="gtk_toggle_tool_button_new_from_stock">
       <return-value>
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_find_all_by_row_data_custom"
-              c:identifier="gtk_ctree_find_all_by_row_data_custom">
+    <class name="RadioToolButton"
+           c:type="GtkRadioToolButton"
+           parent="ToggleToolButton"
+           glib:type-name="GtkRadioToolButton"
+           glib:get-type="gtk_radio_tool_button_get_type">
+      <method name="new_from_widget"
+              c:identifier="gtk_radio_tool_button_new_from_widget">
+        <return-value>
+          <type name="ToolItem" c:type="GtkToolItem*"/>
+        </return-value>
+        <parameters>
+          <parameter name="group">
+            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="new_with_stock_from_widget"
+              c:identifier="gtk_radio_tool_button_new_with_stock_from_widget">
+        <return-value>
+          <type name="ToolItem" c:type="GtkToolItem*"/>
+        </return-value>
+        <parameters>
+          <parameter name="group">
+            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
+          </parameter>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_group" c:identifier="gtk_radio_tool_button_get_group">
+        <return-value>
+          <type name="GSList" c:type="GSList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_group" c:identifier="gtk_radio_tool_button_set_group">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
+          </parameter>
+          <parameter name="group">
+            <type name="GSList" c:type="GSList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="group">
+        <type name="GtkRadioToolButton" c:type="GtkRadioToolButton"/>
+      </property>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="radio_tool_button_new"
+              c:identifier="gtk_radio_tool_button_new">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+        <parameter name="group">
+          <type name="GSList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_is_hot_spot" c:identifier="gtk_ctree_is_hot_spot">
+    <function name="radio_tool_button_new_from_stock"
+              c:identifier="gtk_radio_tool_button_new_from_stock">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="gint" c:type="gint"/>
+        <parameter name="group">
+          <type name="GSList" c:type="GSList*"/>
         </parameter>
-        <parameter name="y">
-          <type name="gint" c:type="gint"/>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_move" c:identifier="gtk_ctree_move">
+    <record name="GtkRecentActionPrivate" c:type="GtkRecentActionPrivate"/>
+    <class name="RecentAction"
+           c:type="GtkRecentAction"
+           parent="Action"
+           glib:type-name="GtkRecentAction"
+           glib:get-type="gtk_recent_action_get_type">
+      <method name="get_show_numbers"
+              c:identifier="gtk_recent_action_get_show_numbers">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="RecentAction" c:type="GtkRecentAction*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_show_numbers"
+              c:identifier="gtk_recent_action_set_show_numbers">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="RecentAction" c:type="GtkRecentAction*"/>
+          </parameter>
+          <parameter name="show_numbers">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="show-numbers">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+    </class>
+    <function name="recent_action_new" c:identifier="gtk_recent_action_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkAction*" c:type="GtkAction*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="new_parent">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="tooltip">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="new_sibling">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_expand" c:identifier="gtk_ctree_expand">
+    <function name="recent_action_new_for_manager"
+              c:identifier="gtk_recent_action_new_for_manager">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkAction*" c:type="GtkAction*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_expand_recursive"
-              c:identifier="gtk_ctree_expand_recursive">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="tooltip">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="manager">
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_expand_to_depth"
-              c:identifier="gtk_ctree_expand_to_depth">
+    <record name="GtkRecentFilterInfo" c:type="GtkRecentFilterInfo">
+      <field name="contains">
+        <type name="GtkRecentFilterFlags" c:type="GtkRecentFilterFlags"/>
+      </field>
+      <field name="uri">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="display_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="mime_type">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="applications">
+        <type name="gchar**" c:type="gchar**"/>
+      </field>
+      <field name="groups">
+        <type name="gchar**" c:type="gchar**"/>
+      </field>
+      <field name="age">
+        <type name="int32" c:type="gint"/>
+      </field>
+    </record>
+    <callback name="GtkRecentFilterFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="filter_info">
+          <type name="GtkRecentFilterInfo*" c:type="GtkRecentFilterInfo*"/>
         </parameter>
-        <parameter name="depth">
-          <type name="gint" c:type="gint"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="ctree_collapse" c:identifier="gtk_ctree_collapse">
+    </callback>
+    <class name="RecentFilter"
+           c:type="GtkRecentFilter"
+           parent="GtkObject"
+           glib:type-name="GtkRecentFilter"
+           glib:get-type="gtk_recent_filter_get_type">
+      <constructor name="new" c:identifier="gtk_recent_filter_new">
+        <return-value>
+          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+        </return-value>
+      </constructor>
+      <method name="set_name" c:identifier="gtk_recent_filter_set_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_name" c:identifier="gtk_recent_filter_get_name">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_mime_type"
+              c:identifier="gtk_recent_filter_add_mime_type">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="mime_type">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_pattern" c:identifier="gtk_recent_filter_add_pattern">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="pattern">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_pixbuf_formats"
+              c:identifier="gtk_recent_filter_add_pixbuf_formats">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_application"
+              c:identifier="gtk_recent_filter_add_application">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="application">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_group" c:identifier="gtk_recent_filter_add_group">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="group">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_age" c:identifier="gtk_recent_filter_add_age">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="days">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_custom" c:identifier="gtk_recent_filter_add_custom">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="needed">
+            <type name="RecentFilterFlags" c:type="GtkRecentFilterFlags"/>
+          </parameter>
+          <parameter name="func">
+            <type name="GtkRecentFilterFunc" c:type="GtkRecentFilterFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="data_destroy">
+            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_needed" c:identifier="gtk_recent_filter_get_needed">
+        <return-value>
+          <type name="RecentFilterFlags" c:type="GtkRecentFilterFlags"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="filter" c:identifier="gtk_recent_filter_filter">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="filter_info">
+            <type name="GtkRecentFilterInfo" c:type="GtkRecentFilterInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </class>
+    <callback name="GtkRecentSortFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="a">
+          <type name="GtkRecentInfo*" c:type="GtkRecentInfo*"/>
         </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="b">
+          <type name="GtkRecentInfo*" c:type="GtkRecentInfo*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="ctree_collapse_recursive"
-              c:identifier="gtk_ctree_collapse_recursive">
+    </callback>
+    <record name="GtkRecentChooser" c:type="GtkRecentChooser"/>
+    <function name="recent_chooser_error_quark"
+              c:identifier="gtk_recent_chooser_error_quark">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GQuark" c:type="GQuark"/>
       </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="ctree_collapse_to_depth"
-              c:identifier="gtk_ctree_collapse_to_depth">
+    <interface name="RecentChooser"
+               c:type="GtkRecentChooser"
+               glib:type-name="GtkRecentChooser"
+               glib:get-type="gtk_recent_chooser_get_type">
+      <property name="limit">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="show-tips">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="filter">
+        <type name="GtkRecentFilter" c:type="GtkRecentFilter"/>
+      </property>
+      <property name="show-private">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="sort-type">
+        <type name="GtkRecentSortType" c:type="GtkRecentSortType"/>
+      </property>
+      <property name="show-icons">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="recent-manager">
+        <type name="GtkRecentManager" c:type="GtkRecentManager"/>
+      </property>
+      <property name="local-only">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="select-multiple">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-not-found">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="set_current_uri">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_current_uri">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="select_uri">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError**" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="unselect_uri">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="select_all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="unselect_all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_items">
+        <return-value>
+          <type name="GList*" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_recent_manager">
+        <return-value>
+          <type name="GtkRecentManager*" c:type="GtkRecentManager*"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="add_filter">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          </parameter>
+          <parameter name="filter">
+            <type name="GtkRecentFilter*" c:type="GtkRecentFilter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="remove_filter">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          </parameter>
+          <parameter name="filter">
+            <type name="GtkRecentFilter*" c:type="GtkRecentFilter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="list_filters">
+        <return-value>
+          <type name="GSList*" c:type="GSList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_sort_func">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          </parameter>
+          <parameter name="sort_func">
+            <type name="GtkRecentSortFunc" c:type="GtkRecentSortFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="item_activated">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="selection_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <glib:signal name="selection-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="item-activated">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </interface>
+    <function name="recent_chooser_set_show_private"
+              c:identifier="gtk_recent_chooser_set_show_private">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="depth">
-          <type name="gint" c:type="gint"/>
+        <parameter name="show_private">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_toggle_expansion"
-              c:identifier="gtk_ctree_toggle_expansion">
+    <function name="recent_chooser_get_show_private"
+              c:identifier="gtk_recent_chooser_get_show_private">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_toggle_expansion_recursive"
-              c:identifier="gtk_ctree_toggle_expansion_recursive">
+    <function name="recent_chooser_set_show_not_found"
+              c:identifier="gtk_recent_chooser_set_show_not_found">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="show_not_found">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_select" c:identifier="gtk_ctree_select">
+    <function name="recent_chooser_get_show_not_found"
+              c:identifier="gtk_recent_chooser_get_show_not_found">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_select_recursive"
-              c:identifier="gtk_ctree_select_recursive">
+    <function name="recent_chooser_set_select_multiple"
+              c:identifier="gtk_recent_chooser_set_select_multiple">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="select_multiple">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_unselect" c:identifier="gtk_ctree_unselect">
+    <function name="recent_chooser_get_select_multiple"
+              c:identifier="gtk_recent_chooser_get_select_multiple">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_unselect_recursive"
-              c:identifier="gtk_ctree_unselect_recursive">
+    <function name="recent_chooser_set_limit"
+              c:identifier="gtk_recent_chooser_set_limit">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="limit">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_real_select_recursive"
-              c:identifier="gtk_ctree_real_select_recursive">
+    <function name="recent_chooser_get_limit"
+              c:identifier="gtk_recent_chooser_get_limit">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="state">
-          <type name="gint" c:type="gint"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_set_text" c:identifier="gtk_ctree_node_set_text">
+    <function name="recent_chooser_set_local_only"
+              c:identifier="gtk_recent_chooser_set_local_only">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="local_only">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_set_pixmap"
-              c:identifier="gtk_ctree_node_set_pixmap">
+    <function name="recent_chooser_get_local_only"
+              c:identifier="gtk_recent_chooser_get_local_only">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_set_pixtext"
-              c:identifier="gtk_ctree_node_set_pixtext">
+    <function name="recent_chooser_set_show_tips"
+              c:identifier="gtk_recent_chooser_set_show_tips">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="guint8" c:type="guint8"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+        <parameter name="show_tips">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_set_node_info" c:identifier="gtk_ctree_set_node_info">
+    <function name="recent_chooser_get_show_tips"
+              c:identifier="gtk_recent_chooser_get_show_tips">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="guint8" c:type="guint8"/>
-        </parameter>
-        <parameter name="pixmap_closed">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask_closed">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-        <parameter name="pixmap_opened">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask_opened">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-        <parameter name="is_leaf">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="expanded">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_set_shift"
-              c:identifier="gtk_ctree_node_set_shift">
+    <function name="recent_chooser_set_show_numbers"
+              c:identifier="gtk_recent_chooser_set_show_numbers">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="vertical">
-          <type name="gint" c:type="gint"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="horizontal">
-          <type name="gint" c:type="gint"/>
+        <parameter name="show_numbers">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_set_selectable"
-              c:identifier="gtk_ctree_node_set_selectable">
+    <function name="recent_chooser_get_show_numbers"
+              c:identifier="gtk_recent_chooser_get_show_numbers">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="selectable">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_get_selectable"
-              c:identifier="gtk_ctree_node_get_selectable">
+    <function name="recent_chooser_set_show_icons"
+              c:identifier="gtk_recent_chooser_set_show_icons">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="show_icons">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_get_cell_type"
-              c:identifier="gtk_ctree_node_get_cell_type">
+    <function name="recent_chooser_get_show_icons"
+              c:identifier="gtk_recent_chooser_get_show_icons">
       <return-value>
-        <type name="GtkCellType" c:type="GtkCellType"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_get_text" c:identifier="gtk_ctree_node_get_text">
+    <function name="recent_chooser_set_sort_type"
+              c:identifier="gtk_recent_chooser_set_sort_type">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="text">
-          <type name="gchar" c:type="gchar**"/>
+        <parameter name="sort_type">
+          <type name="RecentSortType" c:type="GtkRecentSortType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_get_pixmap"
-              c:identifier="gtk_ctree_node_get_pixmap">
+    <function name="recent_chooser_get_sort_type"
+              c:identifier="gtk_recent_chooser_get_sort_type">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="GtkRecentSortType" c:type="GtkRecentSortType"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_get_pixtext"
-              c:identifier="gtk_ctree_node_get_pixtext">
+    <function name="recent_chooser_set_sort_func"
+              c:identifier="gtk_recent_chooser_set_sort_func">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="text">
-          <type name="gchar" c:type="gchar**"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="spacing">
-          <type name="guint8" c:type="guint8*"/>
+        <parameter name="sort_func">
+          <type name="GtkRecentSortFunc" c:type="GtkRecentSortFunc"/>
         </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
+        <parameter name="sort_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+        <parameter name="data_destroy">
+          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_get_node_info" c:identifier="gtk_ctree_get_node_info">
+    <function name="recent_chooser_set_current_uri"
+              c:identifier="gtk_recent_chooser_set_current_uri">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="text">
-          <type name="gchar" c:type="gchar**"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="guint8" c:type="guint8*"/>
-        </parameter>
-        <parameter name="pixmap_closed">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
-        </parameter>
-        <parameter name="mask_closed">
-          <type name="GdkBitmap" c:type="GdkBitmap**"/>
-        </parameter>
-        <parameter name="pixmap_opened">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
-        </parameter>
-        <parameter name="mask_opened">
-          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="is_leaf">
-          <type name="gboolean" c:type="gboolean*"/>
+        <parameter name="uri">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="expanded">
-          <type name="gboolean" c:type="gboolean*"/>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_set_row_style"
-              c:identifier="gtk_ctree_node_set_row_style">
+    <function name="recent_chooser_get_current_uri"
+              c:identifier="gtk_recent_chooser_get_current_uri">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_get_row_style"
-              c:identifier="gtk_ctree_node_get_row_style">
+    <function name="recent_chooser_get_current_item"
+              c:identifier="gtk_recent_chooser_get_current_item">
       <return-value>
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="GtkRecentInfo*" c:type="GtkRecentInfo*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_set_cell_style"
-              c:identifier="gtk_ctree_node_set_cell_style">
+    <function name="recent_chooser_select_uri"
+              c:identifier="gtk_recent_chooser_select_uri">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="uri">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
+        <parameter name="error">
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_get_cell_style"
-              c:identifier="gtk_ctree_node_get_cell_style">
+    <function name="recent_chooser_unselect_uri"
+              c:identifier="gtk_recent_chooser_unselect_uri">
       <return-value>
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
+        <parameter name="uri">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_set_foreground"
-              c:identifier="gtk_ctree_node_set_foreground">
+    <function name="recent_chooser_select_all"
+              c:identifier="gtk_recent_chooser_select_all">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_set_background"
-              c:identifier="gtk_ctree_node_set_background">
+    <function name="recent_chooser_unselect_all"
+              c:identifier="gtk_recent_chooser_unselect_all">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_set_row_data"
-              c:identifier="gtk_ctree_node_set_row_data">
+    <function name="recent_chooser_get_items"
+              c:identifier="gtk_recent_chooser_get_items">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GList*" c:type="GList*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_set_row_data_full"
-              c:identifier="gtk_ctree_node_set_row_data_full">
+    <function name="recent_chooser_get_uris"
+              c:identifier="gtk_recent_chooser_get_uris">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="gchar**" c:type="gchar**"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        <parameter name="length">
+          <type name="gsize" c:type="gsize*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_get_row_data"
-              c:identifier="gtk_ctree_node_get_row_data">
+    <function name="recent_chooser_add_filter"
+              c:identifier="gtk_recent_chooser_add_filter">
       <return-value>
-        <type name="gpointer" c:type="gpointer"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="filter">
+          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_moveto" c:identifier="gtk_ctree_node_moveto">
+    <function name="recent_chooser_remove_filter"
+              c:identifier="gtk_recent_chooser_remove_filter">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="row_align">
-          <type name="gfloat" c:type="gfloat"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="col_align">
-          <type name="gfloat" c:type="gfloat"/>
+        <parameter name="filter">
+          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_node_is_visible"
-              c:identifier="gtk_ctree_node_is_visible">
+    <function name="recent_chooser_list_filters"
+              c:identifier="gtk_recent_chooser_list_filters">
       <return-value>
-        <type name="GtkVisibility" c:type="GtkVisibility"/>
+        <type name="GSList*" c:type="GSList*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_set_indent" c:identifier="gtk_ctree_set_indent">
+    <function name="recent_chooser_set_filter"
+              c:identifier="gtk_recent_chooser_set_filter">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="indent">
-          <type name="gint" c:type="gint"/>
+        <parameter name="filter">
+          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_set_spacing" c:identifier="gtk_ctree_set_spacing">
+    <function name="recent_chooser_get_filter"
+              c:identifier="gtk_recent_chooser_get_filter">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkRecentFilter*" c:type="GtkRecentFilter*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="gint" c:type="gint"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_set_show_stub" c:identifier="gtk_ctree_set_show_stub">
+    <record name="GtkRecentChooserDialogPrivate"
+            c:type="GtkRecentChooserDialogPrivate"/>
+    <class name="RecentChooserDialog"
+           c:type="GtkRecentChooserDialog"
+           parent="Dialog"
+           glib:type-name="GtkRecentChooserDialog"
+           glib:get-type="gtk_recent_chooser_dialog_get_type">
+    </class>
+    <function name="recent_chooser_dialog_new"
+              c:identifier="gtk_recent_chooser_dialog_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="title">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="show_stub">
-          <type name="gboolean" c:type="gboolean"/>
+        <parameter name="parent">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="first_button_text">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_set_line_style"
-              c:identifier="gtk_ctree_set_line_style">
+    <function name="recent_chooser_dialog_new_for_manager"
+              c:identifier="gtk_recent_chooser_dialog_new_for_manager">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="title">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="line_style">
-          <type name="CTreeLineStyle" c:type="GtkCTreeLineStyle"/>
+        <parameter name="parent">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="manager">
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
+        </parameter>
+        <parameter name="first_button_text">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_set_expander_style"
-              c:identifier="gtk_ctree_set_expander_style">
+    <record name="GtkRecentChooserMenuPrivate"
+            c:type="GtkRecentChooserMenuPrivate"/>
+    <class name="RecentChooserMenu"
+           c:type="GtkRecentChooserMenu"
+           parent="Menu"
+           glib:type-name="GtkRecentChooserMenu"
+           glib:get-type="gtk_recent_chooser_menu_get_type">
+      <method name="get_show_numbers"
+              c:identifier="gtk_recent_chooser_menu_get_show_numbers">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu">
+            <type name="RecentChooserMenu" c:type="GtkRecentChooserMenu*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_show_numbers"
+              c:identifier="gtk_recent_chooser_menu_set_show_numbers">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu">
+            <type name="RecentChooserMenu" c:type="GtkRecentChooserMenu*"/>
+          </parameter>
+          <parameter name="show_numbers">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="show-numbers">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="gtk_recent1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_recent2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_recent3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_recent4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="recent_chooser_menu_new"
+              c:identifier="gtk_recent_chooser_menu_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="recent_chooser_menu_new_for_manager"
+              c:identifier="gtk_recent_chooser_menu_new_for_manager">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="expander_style">
-          <type name="CTreeExpanderStyle" c:type="GtkCTreeExpanderStyle"/>
+        <parameter name="manager">
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_set_drag_compare_func"
-              c:identifier="gtk_ctree_set_drag_compare_func">
+    <record name="GtkRecentChooserWidgetPrivate"
+            c:type="GtkRecentChooserWidgetPrivate"/>
+    <class name="RecentChooserWidget"
+           c:type="GtkRecentChooserWidget"
+           parent="VBox"
+           glib:type-name="GtkRecentChooserWidget"
+           glib:get-type="gtk_recent_chooser_widget_get_type">
+    </class>
+    <function name="recent_chooser_widget_new"
+              c:identifier="gtk_recent_chooser_widget_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="recent_chooser_widget_new_for_manager"
+              c:identifier="gtk_recent_chooser_widget_new_for_manager">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="cmp_func">
-          <type name="GtkCTreeCompareDragFunc"
-                  c:type="GtkCTreeCompareDragFunc"/>
+        <parameter name="manager">
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_sort_node" c:identifier="gtk_ctree_sort_node">
+    <record name="GtkScaleButtonPrivate" c:type="GtkScaleButtonPrivate"/>
+    <class name="ScaleButton"
+           c:type="GtkScaleButton"
+           parent="Button"
+           glib:type-name="GtkScaleButton"
+           glib:get-type="gtk_scale_button_get_type">
+      <method name="set_icons" c:identifier="gtk_scale_button_set_icons">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          </parameter>
+          <parameter name="icons">
+            <type name="gchar" c:type="gchar**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_value" c:identifier="gtk_scale_button_get_value">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_value" c:identifier="gtk_scale_button_set_value">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_adjustment"
+              c:identifier="gtk_scale_button_get_adjustment">
+        <return-value>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_adjustment"
+              c:identifier="gtk_scale_button_set_adjustment">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          </parameter>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="value">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="size">
+        <type name="GtkIconSize" c:type="GtkIconSize"/>
+      </property>
+      <property name="adjustment">
+        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="icons">
+        <type name="GStrv" c:type="GStrv"/>
+      </property>
+      <callback name="value_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="GtkScaleButton*" c:type="GtkScaleButton*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="value-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="popup">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="popdown">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="scale_button_new" c:identifier="gtk_scale_button_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="size">
+          <type name="IconSize" c:type="GtkIconSize"/>
         </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="min">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="max">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="step">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="icons">
+          <type name="gchar" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="ctree_sort_recursive"
-              c:identifier="gtk_ctree_sort_recursive">
+    <class name="Viewport"
+           c:type="GtkViewport"
+           parent="Bin"
+           glib:type-name="GtkViewport"
+           glib:get-type="gtk_viewport_get_type">
+      <method name="get_hadjustment"
+              c:identifier="gtk_viewport_get_hadjustment">
+        <return-value>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </return-value>
+        <parameters>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_vadjustment"
+              c:identifier="gtk_viewport_get_vadjustment">
+        <return-value>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </return-value>
+        <parameters>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_hadjustment"
+              c:identifier="gtk_viewport_set_hadjustment">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
+          </parameter>
+          <parameter name="adjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_vadjustment"
+              c:identifier="gtk_viewport_set_vadjustment">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
+          </parameter>
+          <parameter name="adjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_shadow_type"
+              c:identifier="gtk_viewport_set_shadow_type">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_shadow_type"
+              c:identifier="gtk_viewport_get_shadow_type">
+        <return-value>
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </return-value>
+        <parameters>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="hadjustment">
+        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="vadjustment">
+        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="shadow-type">
+        <type name="GtkShadowType" c:type="GtkShadowType"/>
+      </property>
+      <callback name="set_scroll_adjustments">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="viewport">
+            <type name="GtkViewport*" c:type="GtkViewport*"/>
+          </parameter>
+          <parameter name="hadjustment">
+            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+          </parameter>
+          <parameter name="vadjustment">
+            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <glib:signal name="set-scroll-adjustments">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <function name="viewport_new" c:identifier="gtk_viewport_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
+        <parameter name="hadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        <parameter name="vadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="FileSelection"
-           c:type="GtkFileSelection"
-           parent="Dialog"
-           glib:type-name="GtkFileSelection"
-           glib:get-type="gtk_file_selection_get_type">
-      <method name="set_filename"
-              c:identifier="gtk_file_selection_set_filename">
+    <class name="ScrolledWindow"
+           c:type="GtkScrolledWindow"
+           parent="Bin"
+           glib:type-name="GtkScrolledWindow"
+           glib:get-type="gtk_scrolled_window_get_type">
+      <method name="set_hadjustment"
+              c:identifier="gtk_scrolled_window_set_hadjustment">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+          <parameter name="hadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_vadjustment"
+              c:identifier="gtk_scrolled_window_set_vadjustment">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+          <parameter name="vadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_hadjustment"
+              c:identifier="gtk_scrolled_window_get_hadjustment">
+        <return-value>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </return-value>
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_vadjustment"
+              c:identifier="gtk_scrolled_window_get_vadjustment">
+        <return-value>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </return-value>
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_hscrollbar"
+              c:identifier="gtk_scrolled_window_get_hscrollbar">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_vscrollbar"
+              c:identifier="gtk_scrolled_window_get_vscrollbar">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
-          </parameter>
-          <parameter name="filename">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_filename"
-              c:identifier="gtk_file_selection_get_filename">
+      <method name="set_policy" c:identifier="gtk_scrolled_window_set_policy">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+          <parameter name="hscrollbar_policy">
+            <type name="PolicyType" c:type="GtkPolicyType"/>
+          </parameter>
+          <parameter name="vscrollbar_policy">
+            <type name="PolicyType" c:type="GtkPolicyType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="complete" c:identifier="gtk_file_selection_complete">
+      <method name="get_policy" c:identifier="gtk_scrolled_window_get_policy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
-          <parameter name="pattern">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="hscrollbar_policy">
+            <type name="PolicyType" c:type="GtkPolicyType*"/>
+          </parameter>
+          <parameter name="vscrollbar_policy">
+            <type name="PolicyType" c:type="GtkPolicyType*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="show_fileop_buttons"
-              c:identifier="gtk_file_selection_show_fileop_buttons">
+      <method name="set_placement"
+              c:identifier="gtk_scrolled_window_set_placement">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+          <parameter name="window_placement">
+            <type name="CornerType" c:type="GtkCornerType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="hide_fileop_buttons"
-              c:identifier="gtk_file_selection_hide_fileop_buttons">
+      <method name="unset_placement"
+              c:identifier="gtk_scrolled_window_unset_placement">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_selections"
-              c:identifier="gtk_file_selection_get_selections">
+      <method name="get_placement"
+              c:identifier="gtk_scrolled_window_get_placement">
         <return-value>
-          <type name="gchar" c:type="gchar**"/>
+          <type name="CornerType" c:type="GtkCornerType"/>
         </return-value>
         <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_select_multiple"
-              c:identifier="gtk_file_selection_set_select_multiple">
+      <method name="set_shadow_type"
+              c:identifier="gtk_scrolled_window_set_shadow_type">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
-          <parameter name="select_multiple">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_select_multiple"
-              c:identifier="gtk_file_selection_get_select_multiple">
+      <method name="get_shadow_type"
+              c:identifier="gtk_scrolled_window_get_shadow_type">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="ShadowType" c:type="GtkShadowType"/>
         </return-value>
         <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="show-fileops">
-        <type name="gboolean" c:type="gboolean"/>
+      <method name="add_with_viewport"
+              c:identifier="gtk_scrolled_window_add_with_viewport">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="hadjustment">
+        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
       </property>
-      <property name="filename">
-        <type name="gchararray" c:type="gchararray"/>
+      <property name="vadjustment">
+        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
       </property>
-      <property name="select-multiple">
-        <type name="gboolean" c:type="gboolean"/>
+      <property name="hscrollbar-policy">
+        <type name="GtkPolicyType" c:type="GtkPolicyType"/>
+      </property>
+      <property name="vscrollbar-policy">
+        <type name="GtkPolicyType" c:type="GtkPolicyType"/>
+      </property>
+      <property name="window-placement">
+        <type name="GtkCornerType" c:type="GtkCornerType"/>
+      </property>
+      <property name="window-placement-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="shadow-type">
+        <type name="GtkShadowType" c:type="GtkShadowType"/>
       </property>
+      <field name="scrollbar_spacing">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <callback name="scroll_child">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="GtkScrolledWindow*" c:type="GtkScrolledWindow*"/>
+          </parameter>
+          <parameter name="scroll">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="horizontal">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="move_focus_out">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="GtkScrolledWindow*" c:type="GtkScrolledWindow*"/>
+          </parameter>
+          <parameter name="direction">
+            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+          </parameter>
+        </parameters>
+      </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
+      <glib:signal name="move-focus-out">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="scroll-child">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
     </class>
-    <function name="file_selection_new" c:identifier="gtk_file_selection_new">
+    <function name="scrolled_window_new"
+              c:identifier="gtk_scrolled_window_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="title">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="hadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameter>
+        <parameter name="vadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GtkPrintFunc">
+    <function name="scrolled_window_get_scrollbar_spacing"
+              c:identifier="_gtk_scrolled_window_get_scrollbar_spacing">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="func_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="str">
-          <type name="gchar*" c:type="gchar*"/>
+        <parameter name="scrolled_window">
+          <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
         </parameter>
       </parameters>
-    </callback>
-    <callback name="GtkItemFactoryCallback">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-    </callback>
-    <callback name="GtkItemFactoryCallback1">
+    </function>
+    <class name="SeparatorMenuItem"
+           c:type="GtkSeparatorMenuItem"
+           parent="MenuItem"
+           glib:type-name="GtkSeparatorMenuItem"
+           glib:get-type="gtk_separator_menu_item_get_type">
+    </class>
+    <function name="separator_menu_item_new"
+              c:identifier="gtk_separator_menu_item_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="callback_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="callback_action">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="widget">
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry">
-      <field name="path">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="accelerator">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="callback">
-        <type name="GtkItemFactoryCallback" c:type="GtkItemFactoryCallback"/>
-      </field>
-      <field name="callback_action">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="item_type">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="extra_data">
-        <type name="gconstpointer" c:type="gconstpointer"/>
-      </field>
-    </record>
-    <record name="GtkItemFactoryItem" c:type="GtkItemFactoryItem">
-      <field name="path">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="widgets">
-        <type name="GSList*" c:type="GSList*"/>
-      </field>
-    </record>
-    <class name="ItemFactory"
-           c:type="GtkItemFactory"
-           parent="GtkObject"
-           glib:type-name="GtkItemFactory"
-           glib:get-type="gtk_item_factory_get_type">
-      <constructor name="new" c:identifier="gtk_item_factory_new">
-        <return-value>
-          <type name="ItemFactory" c:type="GtkItemFactory*"/>
-        </return-value>
-        <parameters>
-          <parameter name="container_type">
-            <type name="GType" c:type="GType"/>
-          </parameter>
-          <parameter name="path">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="accel_group">
-            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="from_widget"
-                   c:identifier="gtk_item_factory_from_widget">
-        <return-value>
-          <type name="ItemFactory" c:type="GtkItemFactory*"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="from_path" c:identifier="gtk_item_factory_from_path">
-        <return-value>
-          <type name="ItemFactory" c:type="GtkItemFactory*"/>
-        </return-value>
-        <parameters>
-          <parameter name="path">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="construct" c:identifier="gtk_item_factory_construct">
+    </function>
+    <record name="GtkSeparatorToolItemPrivate"
+            c:type="GtkSeparatorToolItemPrivate"/>
+    <class name="SeparatorToolItem"
+           c:type="GtkSeparatorToolItem"
+           parent="ToolItem"
+           glib:type-name="GtkSeparatorToolItem"
+           glib:get-type="gtk_separator_tool_item_get_type">
+      <method name="get_draw" c:identifier="gtk_separator_tool_item_get_draw">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
-          </parameter>
-          <parameter name="container_type">
-            <type name="GType" c:type="GType"/>
-          </parameter>
-          <parameter name="path">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-          <parameter name="accel_group">
-            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          <parameter name="item">
+            <type name="SeparatorToolItem" c:type="GtkSeparatorToolItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_item" c:identifier="gtk_item_factory_get_item">
+      <method name="set_draw" c:identifier="gtk_separator_tool_item_set_draw">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="item">
+            <type name="SeparatorToolItem" c:type="GtkSeparatorToolItem*"/>
           </parameter>
-          <parameter name="path">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="draw">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_widget" c:identifier="gtk_item_factory_get_widget">
+      <property name="draw">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="gchar" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_widget_by_action"
-              c:identifier="gtk_item_factory_get_widget_by_action">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
-          </parameter>
-          <parameter name="action">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_item_by_action"
-              c:identifier="gtk_item_factory_get_item_by_action">
+      </callback>
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
-          </parameter>
-          <parameter name="action">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="create_item" c:identifier="gtk_item_factory_create_item">
+      </callback>
+      <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
-          </parameter>
-          <parameter name="entry">
-            <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
-          </parameter>
-          <parameter name="callback_data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="callback_type">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="create_items" c:identifier="gtk_item_factory_create_items">
+      </callback>
+    </class>
+    <function name="separator_tool_item_new"
+              c:identifier="gtk_separator_tool_item_new">
+      <return-value>
+        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+      </return-value>
+    </function>
+    <class name="SizeGroup"
+           c:type="GtkSizeGroup"
+           parent="GLib.Object"
+           glib:type-name="GtkSizeGroup"
+           glib:get-type="gtk_size_group_get_type">
+      <constructor name="new" c:identifier="gtk_size_group_new">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="SizeGroup" c:type="GtkSizeGroup*"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
-          </parameter>
-          <parameter name="n_entries">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="entries">
-            <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
-          </parameter>
-          <parameter name="callback_data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="mode">
+            <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="delete_item" c:identifier="gtk_item_factory_delete_item">
+      </constructor>
+      <method name="set_mode" c:identifier="gtk_size_group_set_mode">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
           </parameter>
-          <parameter name="path">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="mode">
+            <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
           </parameter>
         </parameters>
       </method>
-      <method name="delete_entry" c:identifier="gtk_item_factory_delete_entry">
+      <method name="get_mode" c:identifier="gtk_size_group_get_mode">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
-          </parameter>
-          <parameter name="entry">
-            <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="delete_entries"
-              c:identifier="gtk_item_factory_delete_entries">
+      <method name="set_ignore_hidden"
+              c:identifier="gtk_size_group_set_ignore_hidden">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
-          </parameter>
-          <parameter name="n_entries">
-            <type name="guint" c:type="guint"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
           </parameter>
-          <parameter name="entries">
-            <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
+          <parameter name="ignore_hidden">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="popup" c:identifier="gtk_item_factory_popup">
+      <method name="get_ignore_hidden"
+              c:identifier="gtk_size_group_get_ignore_hidden">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="mouse_button">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="time_">
-            <type name="guint32" c:type="guint32"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="popup_with_data"
-              c:identifier="gtk_item_factory_popup_with_data">
+      <method name="add_widget" c:identifier="gtk_size_group_add_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
-          </parameter>
-          <parameter name="popup_data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-          </parameter>
-          <parameter name="x">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="mouse_button">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="time_">
-            <type name="guint32" c:type="guint32"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="popup_data" c:identifier="gtk_item_factory_popup_data">
-        <return-value>
-          <type name="gpointer" c:type="gpointer"/>
-        </return-value>
-        <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_translate_func"
-              c:identifier="gtk_item_factory_set_translate_func">
+      <method name="remove_widget" c:identifier="gtk_size_group_remove_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTranslateFunc" c:type="GtkTranslateFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
           </parameter>
-          <parameter name="notify">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="create_items_ac"
-              c:identifier="gtk_item_factory_create_items_ac">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
-          </parameter>
-          <parameter name="n_entries">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="entries">
-            <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
-          </parameter>
-          <parameter name="callback_data">
-            <type name="gpointer" c:type="gpointer"/>
-          </parameter>
-          <parameter name="callback_type">
-            <type name="guint" c:type="guint"/>
+      </method>
+      <method name="get_widgets" c:identifier="gtk_size_group_get_widgets">
+        <return-value>
+          <type name="GSList" c:type="GSList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
           </parameter>
         </parameters>
       </method>
-      <field name="item_ht">
-        <type name="GHashTable*" c:type="GHashTable*"/>
-      </field>
+      <property name="mode">
+        <type name="GtkSizeGroupMode" c:type="GtkSizeGroupMode"/>
+      </property>
+      <property name="ignore-hidden">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
-    <function name="item_factory_add_foreign"
-              c:identifier="gtk_item_factory_add_foreign">
+    <function name="size_group_get_child_requisition"
+              c:identifier="_gtk_size_group_get_child_requisition">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="accel_widget">
+        <parameter name="widget">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="full_path">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="accel_group">
-          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
-        </parameter>
-        <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="modifiers">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
+        <parameter name="requisition">
+          <type name="Requisition" c:type="GtkRequisition*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="item_factory_path_from_widget"
-              c:identifier="gtk_item_factory_path_from_widget">
+    <function name="size_group_compute_requisition"
+              c:identifier="_gtk_size_group_compute_requisition">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="widget">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="item_factory_popup_data_from_widget"
-              c:identifier="gtk_item_factory_popup_data_from_widget">
-      <return-value>
-        <type name="gpointer" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="requisition">
+          <type name="Requisition" c:type="GtkRequisition*"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GtkMenuCallback">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GtkMenuEntry" c:type="GtkMenuEntry"/>
-    <callback name="GtkItemFactoryCallback2">
+    <function name="size_group_queue_resize"
+              c:identifier="_gtk_size_group_queue_resize">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="widget">
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="callback_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="callback_action">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <function name="item_factory_create_menu_entries"
-              c:identifier="gtk_item_factory_create_menu_entries">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="n_entries">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="entries">
-          <type name="GtkMenuEntry" c:type="GtkMenuEntry*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="item_factories_path_delete"
-              c:identifier="gtk_item_factories_path_delete">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ifactory_path">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkList" c:type="GtkList">
-      <field name="container">
-        <type name="GtkContainer" c:type="GtkContainer"/>
-      </field>
-      <field name="children">
-        <type name="GList*" c:type="GList*"/>
-      </field>
-      <field name="selection">
-        <type name="GList*" c:type="GList*"/>
-      </field>
-      <field name="undo_selection">
-        <type name="GList*" c:type="GList*"/>
-      </field>
-      <field name="undo_unselection">
-        <type name="GList*" c:type="GList*"/>
-      </field>
-      <field name="last_focus_child">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </field>
-      <field name="undo_focus_child">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </field>
-      <field name="htimer">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="vtimer">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="anchor">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="drag_pos">
-        <type name="gint" c:type="gint"/>
-      </field>
-      <field name="anchor_state">
-        <type name="GtkStateType" c:type="GtkStateType"/>
-      </field>
-      <field name="selection_mode">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="drag_selection">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="add_mode">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <callback name="selection_changed">
+    <class name="SpinButton"
+           c:type="GtkSpinButton"
+           parent="Entry"
+           glib:type-name="GtkSpinButton"
+           glib:get-type="gtk_spin_button_get_type">
+      <method name="configure" c:identifier="gtk_spin_button_configure">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list">
-            <type name="GtkList*" c:type="GtkList*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="adjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+          <parameter name="climb_rate">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="digits">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="select_child">
+      </method>
+      <method name="set_adjustment"
+              c:identifier="gtk_spin_button_set_adjustment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list">
-            <type name="GtkList*" c:type="GtkList*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="child">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="unselect_child">
+      </method>
+      <method name="get_adjustment"
+              c:identifier="gtk_spin_button_get_adjustment">
+        <return-value>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_digits" c:identifier="gtk_spin_button_set_digits">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list">
-            <type name="GtkList*" c:type="GtkList*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="child">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <parameter name="digits">
+            <type name="guint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-    </record>
-    <function name="list_get_type" c:identifier="gtk_list_get_type">
-      <return-value>
-        <type name="GtkType" c:type="GtkType"/>
-      </return-value>
-    </function>
-    <function name="list_new" c:identifier="gtk_list_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="list_insert_items" c:identifier="gtk_list_insert_items">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="items">
-          <type name="GList" c:type="GList*"/>
-        </parameter>
-        <parameter name="position">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_append_items" c:identifier="gtk_list_append_items">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="items">
-          <type name="GList" c:type="GList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_prepend_items" c:identifier="gtk_list_prepend_items">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="items">
-          <type name="GList" c:type="GList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_remove_items" c:identifier="gtk_list_remove_items">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="items">
-          <type name="GList" c:type="GList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_remove_items_no_unref"
-              c:identifier="gtk_list_remove_items_no_unref">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="items">
-          <type name="GList" c:type="GList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_clear_items" c:identifier="gtk_list_clear_items">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="start">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="end">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_select_item" c:identifier="gtk_list_select_item">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="item">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_unselect_item" c:identifier="gtk_list_unselect_item">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="item">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_select_child" c:identifier="gtk_list_select_child">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="child">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_unselect_child" c:identifier="gtk_list_unselect_child">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="child">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_child_position" c:identifier="gtk_list_child_position">
-      <return-value>
-        <type name="gint" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="child">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_set_selection_mode"
-              c:identifier="gtk_list_set_selection_mode">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="mode">
-          <type name="SelectionMode" c:type="GtkSelectionMode"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_extend_selection"
-              c:identifier="gtk_list_extend_selection">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="scroll_type">
-          <type name="ScrollType" c:type="GtkScrollType"/>
-        </parameter>
-        <parameter name="position">
-          <type name="gfloat" c:type="gfloat"/>
-        </parameter>
-        <parameter name="auto_start_selection">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_start_selection"
-              c:identifier="gtk_list_start_selection">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_end_selection" c:identifier="gtk_list_end_selection">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_select_all" c:identifier="gtk_list_select_all">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_unselect_all" c:identifier="gtk_list_unselect_all">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_scroll_horizontal"
-              c:identifier="gtk_list_scroll_horizontal">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="scroll_type">
-          <type name="ScrollType" c:type="GtkScrollType"/>
-        </parameter>
-        <parameter name="position">
-          <type name="gfloat" c:type="gfloat"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_scroll_vertical"
-              c:identifier="gtk_list_scroll_vertical">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="scroll_type">
-          <type name="ScrollType" c:type="GtkScrollType"/>
-        </parameter>
-        <parameter name="position">
-          <type name="gfloat" c:type="gfloat"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_toggle_add_mode"
-              c:identifier="gtk_list_toggle_add_mode">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_toggle_focus_row"
-              c:identifier="gtk_list_toggle_focus_row">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_toggle_row" c:identifier="gtk_list_toggle_row">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="item">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_undo_selection" c:identifier="gtk_list_undo_selection">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_end_drag_selection"
-              c:identifier="gtk_list_end_drag_selection">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkListItem" c:type="GtkListItem">
-      <field name="item">
-        <type name="GtkItem" c:type="GtkItem"/>
-      </field>
-      <callback name="toggle_focus_row">
+      </method>
+      <method name="get_digits" c:identifier="gtk_spin_button_get_digits">
+        <return-value>
+          <type name="guint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_increments"
+              c:identifier="gtk_spin_button_set_increments">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="step">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="page">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_increments"
+              c:identifier="gtk_spin_button_get_increments">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="step">
+            <type name="gdouble" c:type="gdouble*"/>
+          </parameter>
+          <parameter name="page">
+            <type name="gdouble" c:type="gdouble*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="select_all">
+      </method>
+      <method name="set_range" c:identifier="gtk_spin_button_set_range">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="min">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="max">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="unselect_all">
+      </method>
+      <method name="get_range" c:identifier="gtk_spin_button_get_range">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="min">
+            <type name="gdouble" c:type="gdouble*"/>
+          </parameter>
+          <parameter name="max">
+            <type name="gdouble" c:type="gdouble*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="undo_selection">
+      </method>
+      <method name="get_value" c:identifier="gtk_spin_button_get_value">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="start_selection">
+      </method>
+      <method name="get_value_as_int"
+              c:identifier="gtk_spin_button_get_value_as_int">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="end_selection">
+      </method>
+      <method name="set_value" c:identifier="gtk_spin_button_set_value">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="extend_selection">
+      </method>
+      <method name="set_update_policy"
+              c:identifier="gtk_spin_button_set_update_policy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="scroll_type">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          <parameter name="policy">
+            <type name="SpinButtonUpdatePolicy"
+                  c:type="GtkSpinButtonUpdatePolicy"/>
           </parameter>
-          <parameter name="position">
-            <type name="gfloat" c:type="gfloat"/>
+        </parameters>
+      </method>
+      <method name="get_update_policy"
+              c:identifier="gtk_spin_button_get_update_policy">
+        <return-value>
+          <type name="SpinButtonUpdatePolicy"
+                c:type="GtkSpinButtonUpdatePolicy"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="auto_start_selection">
-            <type name="gboolean" c:type="gboolean"/>
+        </parameters>
+      </method>
+      <method name="set_numeric" c:identifier="gtk_spin_button_set_numeric">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="numeric">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="scroll_horizontal">
+      </method>
+      <method name="get_numeric" c:identifier="gtk_spin_button_get_numeric">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="scroll_type">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+        </parameters>
+      </method>
+      <method name="spin" c:identifier="gtk_spin_button_spin">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="position">
-            <type name="gfloat" c:type="gfloat"/>
+          <parameter name="direction">
+            <type name="SpinType" c:type="GtkSpinType"/>
+          </parameter>
+          <parameter name="increment">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_wrap" c:identifier="gtk_spin_button_set_wrap">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="wrap">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_wrap" c:identifier="gtk_spin_button_get_wrap">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_snap_to_ticks"
+              c:identifier="gtk_spin_button_set_snap_to_ticks">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="snap_to_ticks">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_snap_to_ticks"
+              c:identifier="gtk_spin_button_get_snap_to_ticks">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="update" c:identifier="gtk_spin_button_update">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="adjustment">
+        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="climb-rate">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="digits">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <property name="snap-to-ticks">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="numeric">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="wrap">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="update-policy">
+        <type name="GtkSpinButtonUpdatePolicy"
+              c:type="GtkSpinButtonUpdatePolicy"/>
+      </property>
+      <property name="value">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <callback name="input">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="GtkSpinButton*" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="new_value">
+            <type name="gdouble*" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="scroll_vertical">
+      <callback name="output">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+          <parameter name="spin_button">
+            <type name="GtkSpinButton*" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="scroll_type">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+        </parameters>
+      </callback>
+      <callback name="value_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="GtkSpinButton*" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="position">
-            <type name="gfloat" c:type="gfloat"/>
+        </parameters>
+      </callback>
+      <callback name="change_value">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="GtkSpinButton*" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="scroll">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="toggle_add_mode">
+      <callback name="wrapped">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+          <parameter name="spin_button">
+            <type name="GtkSpinButton*" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </callback>
-    </record>
-    <function name="list_item_get_type" c:identifier="gtk_list_item_get_type">
-      <return-value>
-        <type name="GtkType" c:type="GtkType"/>
-      </return-value>
-    </function>
-    <function name="list_item_new" c:identifier="gtk_list_item_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="list_item_new_with_label"
-              c:identifier="gtk_list_item_new_with_label">
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="value-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="change-value">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkScrollType" c:type="GtkScrollType"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="input">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="output">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="wrapped">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="spin_button_new" c:identifier="gtk_spin_button_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="adjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="list_item_select" c:identifier="gtk_list_item_select">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list_item">
-          <type name="GtkListItem" c:type="GtkListItem*"/>
+        <parameter name="climb_rate">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="digits">
+          <type name="guint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="list_item_deselect" c:identifier="gtk_list_item_deselect">
+    <function name="spin_button_new_with_range"
+              c:identifier="gtk_spin_button_new_with_range">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="list_item">
-          <type name="GtkListItem" c:type="GtkListItem*"/>
+        <parameter name="min">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="max">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="step">
+          <type name="double" c:type="gdouble"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkOldEditable" c:type="GtkOldEditable">
-      <field name="widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
-      </field>
-      <field name="current_pos">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="selection_start_pos">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="selection_end_pos">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="has_selection">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="editable">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="visible">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="clipboard_text">
-        <type name="gchar*" c:type="gchar*"/>
+    <class name="Statusbar"
+           c:type="GtkStatusbar"
+           parent="HBox"
+           glib:type-name="GtkStatusbar"
+           glib:get-type="gtk_statusbar_get_type">
+      <method name="get_context_id"
+              c:identifier="gtk_statusbar_get_context_id">
+        <return-value>
+          <type name="guint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          </parameter>
+          <parameter name="context_description">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="push" c:identifier="gtk_statusbar_push">
+        <return-value>
+          <type name="guint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          </parameter>
+          <parameter name="context_id">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="pop" c:identifier="gtk_statusbar_pop">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          </parameter>
+          <parameter name="context_id">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove" c:identifier="gtk_statusbar_remove">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          </parameter>
+          <parameter name="context_id">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="message_id">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_has_resize_grip"
+              c:identifier="gtk_statusbar_set_has_resize_grip">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          </parameter>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_has_resize_grip"
+              c:identifier="gtk_statusbar_get_has_resize_grip">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="has-resize-grip">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <field name="reserved">
+        <type name="any" c:type="gpointer"/>
       </field>
-      <callback name="activate">
+      <callback name="text_pushed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+          <parameter name="statusbar">
+            <type name="GtkStatusbar*" c:type="GtkStatusbar*"/>
+          </parameter>
+          <parameter name="context_id">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_editable">
+      <callback name="text_popped">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+          <parameter name="statusbar">
+            <type name="GtkStatusbar*" c:type="GtkStatusbar*"/>
           </parameter>
-          <parameter name="is_editable">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="context_id">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="move_cursor">
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="text-pushed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="text-popped">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <function name="statusbar_new" c:identifier="gtk_statusbar_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <record name="GtkStatusIconPrivate" c:type="GtkStatusIconPrivate"/>
+    <class name="StatusIcon"
+           c:type="GtkStatusIcon"
+           parent="GLib.Object"
+           glib:type-name="GtkStatusIcon"
+           glib:get-type="gtk_status_icon_get_type">
+      <constructor name="new" c:identifier="gtk_status_icon_new">
+        <return-value>
+          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+        </return-value>
+      </constructor>
+      <constructor name="new_from_pixbuf"
+                   c:identifier="gtk_status_icon_new_from_pixbuf">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_word">
+      </constructor>
+      <constructor name="new_from_file"
+                   c:identifier="gtk_status_icon_new_from_file">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
-          </parameter>
-          <parameter name="n">
-            <type name="gint" c:type="gint"/>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_page">
+      </constructor>
+      <constructor name="new_from_stock"
+                   c:identifier="gtk_status_icon_new_from_stock">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint" c:type="gint"/>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_to_row">
+      </constructor>
+      <constructor name="new_from_icon_name"
+                   c:identifier="gtk_status_icon_new_from_icon_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
+          <parameter name="icon_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_to_column">
+      </constructor>
+      <method name="set_from_pixbuf"
+              c:identifier="gtk_status_icon_set_from_pixbuf">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="row">
-            <type name="gint" c:type="gint"/>
+          <parameter name="pixbuf" allow-none="1">
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="kill_char">
+      </method>
+      <method name="set_from_file"
+              c:identifier="gtk_status_icon_set_from_file">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="gint" c:type="gint"/>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="kill_word">
+      </method>
+      <method name="set_from_stock"
+              c:identifier="gtk_status_icon_set_from_stock">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="gint" c:type="gint"/>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="kill_line">
+      </method>
+      <method name="set_from_icon_name"
+              c:identifier="gtk_status_icon_set_from_icon_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="gint" c:type="gint"/>
+          <parameter name="icon_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="cut_clipboard">
+      </method>
+      <method name="get_storage_type"
+              c:identifier="gtk_status_icon_get_storage_type">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="ImageType" c:type="GtkImageType"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="copy_clipboard">
+      </method>
+      <method name="get_pixbuf" c:identifier="gtk_status_icon_get_pixbuf">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="paste_clipboard">
+      </method>
+      <method name="get_stock" c:identifier="gtk_status_icon_get_stock">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="update_text">
+      </method>
+      <method name="get_icon_name"
+              c:identifier="gtk_status_icon_get_icon_name">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
-          </parameter>
-          <parameter name="start_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="end_pos">
-            <type name="gint" c:type="gint"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_chars">
+      </method>
+      <method name="get_size" c:identifier="gtk_status_icon_get_size">
         <return-value>
-          <type name="gchar*" c:type="gchar*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
-          </parameter>
-          <parameter name="start_pos">
-            <type name="gint" c:type="gint"/>
-          </parameter>
-          <parameter name="end_pos">
-            <type name="gint" c:type="gint"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_selection">
+      </method>
+      <method name="set_screen" c:identifier="gtk_status_icon_set_screen">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
-          </parameter>
-          <parameter name="start_pos">
-            <type name="gint" c:type="gint"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="end_pos">
-            <type name="gint" c:type="gint"/>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_position">
+      </method>
+      <method name="get_screen" c:identifier="gtk_status_icon_get_screen">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
-      </callback>
-    </record>
-    <callback name="GtkTextFunction">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="editable">
-          <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
-        </parameter>
-        <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <function name="old_editable_get_type"
-              c:identifier="gtk_old_editable_get_type">
-      <return-value>
-        <type name="GtkType" c:type="GtkType"/>
-      </return-value>
-    </function>
-    <function name="old_editable_claim_selection"
-              c:identifier="gtk_old_editable_claim_selection">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="old_editable">
-          <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
-        </parameter>
-        <parameter name="claim">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="time_">
-          <type name="guint32" c:type="guint32"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="old_editable_changed"
-              c:identifier="gtk_old_editable_changed">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="old_editable">
-          <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="OptionMenu"
-           c:type="GtkOptionMenu"
-           parent="Button"
-           glib:type-name="GtkOptionMenu"
-           glib:get-type="gtk_option_menu_get_type">
-      <method name="get_menu" c:identifier="gtk_option_menu_get_menu">
+      </method>
+      <method name="set_tooltip" c:identifier="gtk_status_icon_set_tooltip">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="option_menu">
-            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          </parameter>
+          <parameter name="tooltip_text" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_menu" c:identifier="gtk_option_menu_set_menu">
+      <method name="set_visible" c:identifier="gtk_status_icon_set_visible">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="option_menu">
-            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="menu">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="visible">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_menu" c:identifier="gtk_option_menu_remove_menu">
+      <method name="get_visible" c:identifier="gtk_status_icon_get_visible">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="option_menu">
-            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_history" c:identifier="gtk_option_menu_get_history">
+      <method name="set_blinking" c:identifier="gtk_status_icon_set_blinking">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="option_menu">
-            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          </parameter>
+          <parameter name="blinking">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_history" c:identifier="gtk_option_menu_set_history">
+      <method name="get_blinking" c:identifier="gtk_status_icon_get_blinking">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="option_menu">
-            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
-          </parameter>
-          <parameter name="index_">
-            <type name="guint" c:type="guint"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="menu">
-        <type name="GtkMenu" c:type="GtkMenu"/>
-      </property>
-      <callback name="changed">
+      <method name="is_embedded" c:identifier="gtk_status_icon_is_embedded">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="option_menu">
-            <type name="GtkOptionMenu*" c:type="GtkOptionMenu*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="option_menu_new" c:identifier="gtk_option_menu_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <record name="GtkPreview" c:type="GtkPreview">
-      <field name="widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
-      </field>
-      <field name="buffer">
-        <type name="guchar*" c:type="guchar*"/>
-      </field>
-      <field name="buffer_width">
-        <type name="guint16" c:type="guint16"/>
-      </field>
-      <field name="buffer_height">
-        <type name="guint16" c:type="guint16"/>
-      </field>
-      <field name="bpp">
-        <type name="guint16" c:type="guint16"/>
-      </field>
-      <field name="rowstride">
-        <type name="guint16" c:type="guint16"/>
-      </field>
-      <field name="dither">
-        <type name="GdkRgbDither" c:type="GdkRgbDither"/>
-      </field>
-      <field name="type">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="expand">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="info">
-        <type name="GtkPreviewInfo" c:type="GtkPreviewInfo"/>
-      </field>
-    </record>
-    <record name="GtkPreviewInfo" c:type="GtkPreviewInfo">
-      <field name="lookup">
-        <type name="guchar*" c:type="guchar*"/>
-      </field>
-      <field name="gamma">
-        <type name="gdouble" c:type="gdouble"/>
-      </field>
-    </record>
-    <function name="preview_get_type" c:identifier="gtk_preview_get_type">
-      <return-value>
-        <type name="GtkType" c:type="GtkType"/>
-      </return-value>
-    </function>
-    <function name="preview_uninit" c:identifier="gtk_preview_uninit">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="preview_new" c:identifier="gtk_preview_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="PreviewType" c:type="GtkPreviewType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_size" c:identifier="gtk_preview_size">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="preview">
-          <type name="GtkPreview" c:type="GtkPreview*"/>
-        </parameter>
-        <parameter name="width">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_put" c:identifier="gtk_preview_put">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="preview">
-          <type name="GtkPreview" c:type="GtkPreview*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="gc">
-          <type name="Gdk.GC" c:type="GdkGC*"/>
-        </parameter>
-        <parameter name="srcx">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="srcy">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="destx">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="desty">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_draw_row" c:identifier="gtk_preview_draw_row">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="preview">
-          <type name="GtkPreview" c:type="GtkPreview*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="guchar" c:type="guchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="w">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_set_expand" c:identifier="gtk_preview_set_expand">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="preview">
-          <type name="GtkPreview" c:type="GtkPreview*"/>
-        </parameter>
-        <parameter name="expand">
-          <type name="gboolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_set_gamma" c:identifier="gtk_preview_set_gamma">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="gamma_">
-          <type name="double" c:type="double"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_set_color_cube"
-              c:identifier="gtk_preview_set_color_cube">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="nred_shades">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="ngreen_shades">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="nblue_shades">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="ngray_shades">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_set_install_cmap"
-              c:identifier="gtk_preview_set_install_cmap">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="install_cmap">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_set_reserved"
-              c:identifier="gtk_preview_set_reserved">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="nreserved">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_set_dither" c:identifier="gtk_preview_set_dither">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="preview">
-          <type name="GtkPreview" c:type="GtkPreview*"/>
-        </parameter>
-        <parameter name="dither">
-          <type name="GdkRgbDither" c:type="GdkRgbDither"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_get_visual" c:identifier="gtk_preview_get_visual">
-      <return-value>
-        <type name="GdkVisual*" c:type="GdkVisual*"/>
-      </return-value>
-    </function>
-    <function name="preview_get_cmap" c:identifier="gtk_preview_get_cmap">
-      <return-value>
-        <type name="GdkColormap*" c:type="GdkColormap*"/>
-      </return-value>
-    </function>
-    <function name="preview_get_info" c:identifier="gtk_preview_get_info">
-      <return-value>
-        <type name="GtkPreviewInfo*" c:type="GtkPreviewInfo*"/>
-      </return-value>
-    </function>
-    <function name="preview_reset" c:identifier="gtk_preview_reset">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-    </function>
-    <record name="GtkTipsQuery" c:type="GtkTipsQuery">
-      <field name="label">
-        <type name="GtkLabel" c:type="GtkLabel"/>
-      </field>
-      <field name="emit_always">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="in_query">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="label_inactive">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="label_no_tip">
-        <type name="gchar*" c:type="gchar*"/>
-      </field>
-      <field name="caller">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </field>
-      <field name="last_crossed">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </field>
-      <field name="query_cursor">
-        <type name="GdkCursor*" c:type="GdkCursor*"/>
-      </field>
-      <callback name="start_query">
+      </method>
+      <method name="get_geometry" c:identifier="gtk_status_icon_get_geometry">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tips_query">
-            <type name="GtkTipsQuery*" c:type="GtkTipsQuery*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          </parameter>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen**"/>
+          </parameter>
+          <parameter name="area">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="orientation">
+            <type name="Orientation" c:type="GtkOrientation*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="stop_query">
+      </method>
+      <property name="pixbuf">
+        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
+      </property>
+      <property name="file">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="stock">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="icon-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="storage-type">
+        <type name="GtkImageType" c:type="GtkImageType"/>
+      </property>
+      <property name="size">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="screen">
+        <type name="GdkScreen" c:type="GdkScreen"/>
+      </property>
+      <property name="visible">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="orientation">
+        <type name="GtkOrientation" c:type="GtkOrientation"/>
+      </property>
+      <property name="embedded">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="blinking">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="activate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tips_query">
-            <type name="GtkTipsQuery*" c:type="GtkTipsQuery*"/>
+          <parameter name="status_icon">
+            <type name="GtkStatusIcon*" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="widget_entered">
+      <callback name="popup_menu">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tips_query">
-            <type name="GtkTipsQuery*" c:type="GtkTipsQuery*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <parameter name="status_icon">
+            <type name="GtkStatusIcon*" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="tip_text">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="button">
+            <type name="guint" c:type="guint"/>
           </parameter>
-          <parameter name="tip_private">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="activate_time">
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="widget_selected">
+      <callback name="size_changed">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tips_query">
-            <type name="GtkTipsQuery*" c:type="GtkTipsQuery*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="tip_text">
-            <type name="gchar*" c:type="gchar*"/>
-          </parameter>
-          <parameter name="tip_private">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="status_icon">
+            <type name="GtkStatusIcon*" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="event">
-            <type name="GdkEventButton*" c:type="GdkEventButton*"/>
+          <parameter name="size">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+      <field name="__gtk_reserved1">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved2">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved3">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved4">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved5">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved6">
+        <type name="any" c:type="void*"/>
+      </field>
+      <glib:signal name="popup-menu">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-    </record>
-    <function name="tips_query_get_type" c:identifier="gtk_tips_query_get_type">
-      <return-value>
-        <type name="GtkType" c:type="GtkType"/>
-      </return-value>
-    </function>
-    <function name="tips_query_new" c:identifier="gtk_tips_query_new">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="tips_query_start_query"
-              c:identifier="gtk_tips_query_start_query">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tips_query">
-          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tips_query_stop_query"
-              c:identifier="gtk_tips_query_stop_query">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tips_query">
-          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tips_query_set_caller"
-              c:identifier="gtk_tips_query_set_caller">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tips_query">
-          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
-        </parameter>
-        <parameter name="caller">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tips_query_set_labels"
-              c:identifier="gtk_tips_query_set_labels">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tips_query">
-          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
-        </parameter>
-        <parameter name="label_inactive">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="label_no_tip">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_BOOLEAN__VOID"
-              c:identifier="gtk_marshal_BOOLEAN__VOID">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_BOOLEAN__POINTER"
-              c:identifier="gtk_marshal_BOOLEAN__POINTER">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_BOOLEAN__POINTER_POINTER_INT_INT"
-              c:identifier="gtk_marshal_BOOLEAN__POINTER_POINTER_INT_INT">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_BOOLEAN__POINTER_INT_INT"
-              c:identifier="gtk_marshal_BOOLEAN__POINTER_INT_INT">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_BOOLEAN__POINTER_INT_INT_UINT"
-              c:identifier="gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_BOOLEAN__POINTER_STRING_STRING_POINTER"
-              c:identifier="gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_ENUM__ENUM" c:identifier="gtk_marshal_ENUM__ENUM">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_INT__POINTER"
-              c:identifier="gtk_marshal_INT__POINTER">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_INT__POINTER_CHAR_CHAR"
-              c:identifier="gtk_marshal_INT__POINTER_CHAR_CHAR">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__ENUM_FLOAT"
-              c:identifier="gtk_marshal_VOID__ENUM_FLOAT">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__ENUM_FLOAT_BOOLEAN"
-              c:identifier="gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__INT_INT"
-              c:identifier="gtk_marshal_VOID__INT_INT">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__INT_INT_POINTER"
-              c:identifier="gtk_marshal_VOID__INT_INT_POINTER">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__POINTER_INT"
-              c:identifier="gtk_marshal_VOID__POINTER_INT">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__POINTER_POINTER"
-              c:identifier="gtk_marshal_VOID__POINTER_POINTER">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__POINTER_POINTER_POINTER"
-              c:identifier="gtk_marshal_VOID__POINTER_POINTER_POINTER">
+        <parameters>
+          <parameter name="object">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="activate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="size-changed">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <function name="status_icon_position_menu"
+              c:identifier="gtk_status_icon_position_menu">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="menu">
+          <type name="Menu" c:type="GtkMenu*"/>
         </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+        <parameter name="x">
+          <type name="gint" c:type="gint*"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="y">
+          <type name="gint" c:type="gint*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="push_in">
+          <type name="gboolean" c:type="gboolean*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__POINTER_STRING_STRING"
-              c:identifier="gtk_marshal_VOID__POINTER_STRING_STRING">
+    <record name="GtkStockItem" c:type="GtkStockItem">
+      <field name="stock_id">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="label">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="modifier">
+        <type name="GdkModifierType" c:type="GdkModifierType"/>
+      </field>
+      <field name="keyval">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="translation_domain">
+        <type name="string" c:type="gchar*"/>
+      </field>
+    </record>
+    <function name="stock_add" c:identifier="gtk_stock_add">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="items">
+          <type name="GtkStockItem" c:type="GtkStockItem*"/>
         </parameter>
-        <parameter name="n_param_values">
+        <parameter name="n_items">
           <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__POINTER_UINT"
-              c:identifier="gtk_marshal_VOID__POINTER_UINT">
+    <function name="stock_add_static" c:identifier="gtk_stock_add_static">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="items">
+          <type name="GtkStockItem" c:type="GtkStockItem*"/>
         </parameter>
-        <parameter name="n_param_values">
+        <parameter name="n_items">
           <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__POINTER_UINT_ENUM"
-              c:identifier="gtk_marshal_VOID__POINTER_UINT_ENUM">
+    <function name="stock_lookup" c:identifier="gtk_stock_lookup">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="item">
+          <type name="GtkStockItem" c:type="GtkStockItem*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__POINTER_POINTER_UINT_UINT"
-              c:identifier="gtk_marshal_VOID__POINTER_POINTER_UINT_UINT">
+    <function name="stock_list_ids" c:identifier="gtk_stock_list_ids">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GSList*" c:type="GSList*"/>
       </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT"
-              c:identifier="gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT">
+    <function name="stock_item_copy" c:identifier="gtk_stock_item_copy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkStockItem*" c:type="GtkStockItem*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="item">
+          <type name="GtkStockItem" c:type="GtkStockItem*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__POINTER_UINT_UINT"
-              c:identifier="gtk_marshal_VOID__POINTER_UINT_UINT">
+    <function name="stock_item_free" c:identifier="gtk_stock_item_free">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="item">
+          <type name="GtkStockItem" c:type="GtkStockItem*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__STRING_INT_POINTER"
-              c:identifier="gtk_marshal_VOID__STRING_INT_POINTER">
+    <function name="stock_set_translate_func"
+              c:identifier="gtk_stock_set_translate_func">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+        <parameter name="domain">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+        <parameter name="func">
+          <type name="GtkTranslateFunc" c:type="GtkTranslateFunc"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="notify">
+          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER"
-              c:identifier="gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
+    <record name="GtkTableChild" c:type="GtkTableChild">
+      <field name="widget">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="left_attach">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="right_attach">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="top_attach">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="bottom_attach">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="xpadding">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="ypadding">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="xexpand">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="yexpand">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="xshrink">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="yshrink">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="xfill">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="yfill">
+        <type name="guint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="GtkTableRowCol" c:type="GtkTableRowCol">
+      <field name="requisition">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="allocation">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="spacing">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="need_expand">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="need_shrink">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="expand">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="shrink">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="empty">
+        <type name="guint" c:type="guint"/>
+      </field>
+    </record>
+    <class name="Table"
+           c:type="GtkTable"
+           parent="Container"
+           glib:type-name="GtkTable"
+           glib:get-type="gtk_table_get_type">
+      <method name="resize" c:identifier="gtk_table_resize">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
+          </parameter>
+          <parameter name="rows">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="columns">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="attach" c:identifier="gtk_table_attach">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="left_attach">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="right_attach">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="top_attach">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="bottom_attach">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="xoptions">
+            <type name="AttachOptions" c:type="GtkAttachOptions"/>
+          </parameter>
+          <parameter name="yoptions">
+            <type name="AttachOptions" c:type="GtkAttachOptions"/>
+          </parameter>
+          <parameter name="xpadding">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="ypadding">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="attach_defaults" c:identifier="gtk_table_attach_defaults">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="left_attach">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="right_attach">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="top_attach">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="bottom_attach">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_row_spacing" c:identifier="gtk_table_set_row_spacing">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="spacing">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_row_spacing" c:identifier="gtk_table_get_row_spacing">
+        <return-value>
           <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__UINT_POINTER_UINT_UINT_ENUM"
-              c:identifier="gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_col_spacing" c:identifier="gtk_table_set_col_spacing">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="spacing">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_col_spacing" c:identifier="gtk_table_get_col_spacing">
+        <return-value>
           <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__UINT_STRING"
-              c:identifier="gtk_marshal_VOID__UINT_STRING">
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_row_spacings"
+              c:identifier="gtk_table_set_row_spacings">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
+          </parameter>
+          <parameter name="spacing">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_default_row_spacing"
+              c:identifier="gtk_table_get_default_row_spacing">
+        <return-value>
+          <type name="guint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_col_spacings"
+              c:identifier="gtk_table_set_col_spacings">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
+          </parameter>
+          <parameter name="spacing">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_default_col_spacing"
+              c:identifier="gtk_table_get_default_col_spacing">
+        <return-value>
+          <type name="guint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_homogeneous" c:identifier="gtk_table_set_homogeneous">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
+          </parameter>
+          <parameter name="homogeneous">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_homogeneous" c:identifier="gtk_table_get_homogeneous">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="n-rows">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <property name="n-columns">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <property name="column-spacing">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <property name="row-spacing">
+        <type name="guint" c:type="guint"/>
+      </property>
+      <property name="homogeneous">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+    </class>
+    <function name="table_new" c:identifier="gtk_table_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
+        <parameter name="rows">
           <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="columns">
+          <type name="guint" c:type="guint"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="homogeneous">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_newv" c:identifier="gtk_signal_newv">
+    <class name="TearoffMenuItem"
+           c:type="GtkTearoffMenuItem"
+           parent="MenuItem"
+           glib:type-name="GtkTearoffMenuItem"
+           glib:get-type="gtk_tearoff_menu_item_get_type">
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="tearoff_menu_item_new"
+              c:identifier="gtk_tearoff_menu_item_new">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <callback name="GtkTextTagTableForeach">
+      <return-value>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="signal_flags">
-          <type name="SignalRunType" c:type="GtkSignalRunType"/>
-        </parameter>
-        <parameter name="object_type">
-          <type name="GtkType" c:type="GtkType"/>
-        </parameter>
-        <parameter name="function_offset">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="marshaller">
-          <type name="GtkSignalMarshaller" c:type="GtkSignalMarshaller"/>
+        <parameter name="tag">
+          <type name="GtkTextTag*" c:type="GtkTextTag*"/>
         </parameter>
-        <parameter name="return_val">
-          <type name="GtkType" c:type="GtkType"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="n_args">
-          <type name="guint" c:type="guint"/>
+      </parameters>
+    </callback>
+    <class name="TextTagTable"
+           c:type="GtkTextTagTable"
+           parent="GLib.Object"
+           glib:type-name="GtkTextTagTable"
+           glib:get-type="gtk_text_tag_table_get_type">
+      <constructor name="new" c:identifier="gtk_text_tag_table_new">
+        <return-value>
+          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+        </return-value>
+      </constructor>
+      <method name="add" c:identifier="gtk_text_tag_table_add">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove" c:identifier="gtk_text_tag_table_remove">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="foreach" c:identifier="gtk_text_tag_table_foreach">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="GtkTextTagTableForeach"
+                  c:type="GtkTextTagTableForeach"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_size" c:identifier="gtk_text_tag_table_get_size">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="tag_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="GtkTextTagTable*" c:type="GtkTextTagTable*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+          </parameter>
+          <parameter name="size_changed">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="tag_added">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="GtkTextTagTable*" c:type="GtkTextTagTable*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="tag_removed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="GtkTextTagTable*" c:type="GtkTextTagTable*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="tag-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTextTag" c:type="GtkTextTag"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="tag-added">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTextTag" c:type="GtkTextTag"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="tag-removed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTextTag" c:type="GtkTextTag"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <function name="text_tag_table_add_buffer"
+              c:identifier="_gtk_text_tag_table_add_buffer">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="table">
+          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
         </parameter>
-        <parameter name="args">
-          <type name="GtkType" c:type="GtkType*"/>
+        <parameter name="buffer">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_new" c:identifier="gtk_signal_new">
+    <function name="text_tag_table_remove_buffer"
+              c:identifier="_gtk_text_tag_table_remove_buffer">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="signal_flags">
-          <type name="SignalRunType" c:type="GtkSignalRunType"/>
-        </parameter>
-        <parameter name="object_type">
-          <type name="GtkType" c:type="GtkType"/>
-        </parameter>
-        <parameter name="function_offset">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="marshaller">
-          <type name="GtkSignalMarshaller" c:type="GtkSignalMarshaller"/>
-        </parameter>
-        <parameter name="return_val">
-          <type name="GtkType" c:type="GtkType"/>
+        <parameter name="table">
+          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
         </parameter>
-        <parameter name="n_args">
-          <type name="guint" c:type="guint"/>
+        <parameter name="buffer">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_emit_stop_by_name"
-              c:identifier="gtk_signal_emit_stop_by_name">
+    <class name="TextMark"
+           c:type="GtkTextMark"
+           parent="GLib.Object"
+           glib:type-name="GtkTextMark"
+           glib:get-type="gtk_text_mark_get_type">
+      <constructor name="new" c:identifier="gtk_text_mark_new">
+        <return-value>
+          <type name="TextMark" c:type="GtkTextMark*"/>
+        </return-value>
+        <parameters>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="left_gravity">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="set_visible" c:identifier="gtk_text_mark_set_visible">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
+          </parameter>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_visible" c:identifier="gtk_text_mark_get_visible">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_name" c:identifier="gtk_text_mark_get_name">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_deleted" c:identifier="gtk_text_mark_get_deleted">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_buffer" c:identifier="gtk_text_mark_get_buffer">
+        <return-value>
+          <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
+        </return-value>
+        <parameters>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_left_gravity"
+              c:identifier="gtk_text_mark_get_left_gravity">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="left-gravity">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="GtkTextBTree" c:type="GtkTextBTree"/>
+    <record name="GtkTextLogAttrCache" c:type="GtkTextLogAttrCache"/>
+    <class name="TextBuffer"
+           c:type="GtkTextBuffer"
+           parent="GLib.Object"
+           glib:type-name="GtkTextBuffer"
+           glib:get-type="gtk_text_buffer_get_type">
+      <constructor name="new" c:identifier="gtk_text_buffer_new">
+        <return-value>
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="get_line_count"
+              c:identifier="gtk_text_buffer_get_line_count">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_char_count"
+              c:identifier="gtk_text_buffer_get_char_count">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_tag_table"
+              c:identifier="gtk_text_buffer_get_tag_table">
+        <return-value>
+          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_text" c:identifier="gtk_text_buffer_set_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert" c:identifier="gtk_text_buffer_insert">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_at_cursor"
+              c:identifier="gtk_text_buffer_insert_at_cursor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_interactive"
+              c:identifier="gtk_text_buffer_insert_interactive">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_interactive_at_cursor"
+              c:identifier="gtk_text_buffer_insert_interactive_at_cursor">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_range" c:identifier="gtk_text_buffer_insert_range">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_range_interactive"
+              c:identifier="gtk_text_buffer_insert_range_interactive">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_with_tags"
+              c:identifier="gtk_text_buffer_insert_with_tags">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="first_tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_with_tags_by_name"
+              c:identifier="gtk_text_buffer_insert_with_tags_by_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="first_tag_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="delete" c:identifier="gtk_text_buffer_delete">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="delete_interactive"
+              c:identifier="gtk_text_buffer_delete_interactive">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="start_iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end_iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backspace" c:identifier="gtk_text_buffer_backspace">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="interactive">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_text" c:identifier="gtk_text_buffer_get_text">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="include_hidden_chars">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_slice" c:identifier="gtk_text_buffer_get_slice">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="include_hidden_chars">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_pixbuf"
+              c:identifier="gtk_text_buffer_insert_pixbuf">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_child_anchor"
+              c:identifier="gtk_text_buffer_insert_child_anchor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="create_child_anchor"
+              c:identifier="gtk_text_buffer_create_child_anchor">
+        <return-value>
+          <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_mark" c:identifier="gtk_text_buffer_add_mark">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
+          </parameter>
+          <parameter name="where">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="create_mark" c:identifier="gtk_text_buffer_create_mark">
+        <return-value>
+          <type name="TextMark" c:type="GtkTextMark*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="mark_name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="where">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="left_gravity">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="move_mark" c:identifier="gtk_text_buffer_move_mark">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
+          </parameter>
+          <parameter name="where">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="delete_mark" c:identifier="gtk_text_buffer_delete_mark">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_mark" c:identifier="gtk_text_buffer_get_mark">
+        <return-value>
+          <type name="TextMark" c:type="GtkTextMark*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="move_mark_by_name"
+              c:identifier="gtk_text_buffer_move_mark_by_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="where">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="delete_mark_by_name"
+              c:identifier="gtk_text_buffer_delete_mark_by_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_insert" c:identifier="gtk_text_buffer_get_insert">
+        <return-value>
+          <type name="TextMark" c:type="GtkTextMark*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_selection_bound"
+              c:identifier="gtk_text_buffer_get_selection_bound">
+        <return-value>
+          <type name="TextMark" c:type="GtkTextMark*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="place_cursor" c:identifier="gtk_text_buffer_place_cursor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="where">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="select_range" c:identifier="gtk_text_buffer_select_range">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="ins">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="bound">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="apply_tag" c:identifier="gtk_text_buffer_apply_tag">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_tag" c:identifier="gtk_text_buffer_remove_tag">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="apply_tag_by_name"
+              c:identifier="gtk_text_buffer_apply_tag_by_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_tag_by_name"
+              c:identifier="gtk_text_buffer_remove_tag_by_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_all_tags"
+              c:identifier="gtk_text_buffer_remove_all_tags">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="create_tag" c:identifier="gtk_text_buffer_create_tag">
+        <return-value>
+          <type name="TextTag" c:type="GtkTextTag*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="tag_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="first_property_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_iter_at_line_offset"
+              c:identifier="gtk_text_buffer_get_iter_at_line_offset">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="line_number">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="char_offset">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_iter_at_line_index"
+              c:identifier="gtk_text_buffer_get_iter_at_line_index">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="line_number">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="byte_index">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_iter_at_offset"
+              c:identifier="gtk_text_buffer_get_iter_at_offset">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="char_offset">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_iter_at_line"
+              c:identifier="gtk_text_buffer_get_iter_at_line">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="line_number">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_start_iter"
+              c:identifier="gtk_text_buffer_get_start_iter">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_end_iter" c:identifier="gtk_text_buffer_get_end_iter">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_bounds" c:identifier="gtk_text_buffer_get_bounds">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_iter_at_mark"
+              c:identifier="gtk_text_buffer_get_iter_at_mark">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_iter_at_child_anchor"
+              c:identifier="gtk_text_buffer_get_iter_at_child_anchor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_modified" c:identifier="gtk_text_buffer_get_modified">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_modified" c:identifier="gtk_text_buffer_set_modified">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_has_selection"
+              c:identifier="gtk_text_buffer_get_has_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_selection_clipboard"
+              c:identifier="gtk_text_buffer_add_selection_clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_selection_clipboard"
+              c:identifier="gtk_text_buffer_remove_selection_clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="cut_clipboard"
+              c:identifier="gtk_text_buffer_cut_clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="copy_clipboard"
+              c:identifier="gtk_text_buffer_copy_clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="paste_clipboard"
+              c:identifier="gtk_text_buffer_paste_clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+          <parameter name="override_location" allow-none="1">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_selection_bounds"
+              c:identifier="gtk_text_buffer_get_selection_bounds">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="delete_selection"
+              c:identifier="gtk_text_buffer_delete_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="interactive">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="begin_user_action"
+              c:identifier="gtk_text_buffer_begin_user_action">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="end_user_action"
+              c:identifier="gtk_text_buffer_end_user_action">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_copy_target_list"
+              c:identifier="gtk_text_buffer_get_copy_target_list">
+        <return-value>
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_paste_target_list"
+              c:identifier="gtk_text_buffer_get_paste_target_list">
+        <return-value>
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="register_serialize_format"
+              c:identifier="gtk_text_buffer_register_serialize_format">
+        <return-value>
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="mime_type">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="function">
+            <type name="GtkTextBufferSerializeFunc"
+                  c:type="GtkTextBufferSerializeFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="user_data_destroy">
+            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="register_serialize_tagset"
+              c:identifier="gtk_text_buffer_register_serialize_tagset">
+        <return-value>
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="tagset_name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="register_deserialize_format"
+              c:identifier="gtk_text_buffer_register_deserialize_format">
+        <return-value>
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="mime_type">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="function">
+            <type name="GtkTextBufferDeserializeFunc"
+                  c:type="GtkTextBufferDeserializeFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="user_data_destroy">
+            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="register_deserialize_tagset"
+              c:identifier="gtk_text_buffer_register_deserialize_tagset">
+        <return-value>
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="tagset_name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unregister_serialize_format"
+              c:identifier="gtk_text_buffer_unregister_serialize_format">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="format">
+            <type name="GdkAtom" c:type="GdkAtom"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unregister_deserialize_format"
+              c:identifier="gtk_text_buffer_unregister_deserialize_format">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="format">
+            <type name="GdkAtom" c:type="GdkAtom"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="deserialize_set_can_create_tags"
+              c:identifier="gtk_text_buffer_deserialize_set_can_create_tags">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="format">
+            <type name="GdkAtom" c:type="GdkAtom"/>
+          </parameter>
+          <parameter name="can_create_tags">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="deserialize_get_can_create_tags"
+              c:identifier="gtk_text_buffer_deserialize_get_can_create_tags">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="format">
+            <type name="GdkAtom" c:type="GdkAtom"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_serialize_formats"
+              c:identifier="gtk_text_buffer_get_serialize_formats">
+        <return-value>
+          <type name="GdkAtom" c:type="GdkAtom*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="n_formats">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_deserialize_formats"
+              c:identifier="gtk_text_buffer_get_deserialize_formats">
+        <return-value>
+          <type name="GdkAtom" c:type="GdkAtom*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="n_formats">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="serialize" c:identifier="gtk_text_buffer_serialize">
+        <return-value>
+          <type name="guint8" c:type="guint8*"/>
+        </return-value>
+        <parameters>
+          <parameter name="register_buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="content_buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="format">
+            <type name="GdkAtom" c:type="GdkAtom"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="gsize" c:type="gsize*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="deserialize" c:identifier="gtk_text_buffer_deserialize">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="register_buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="content_buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="format">
+            <type name="GdkAtom" c:type="GdkAtom"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="guint8" c:type="guint8*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GError" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="tag-table">
+        <type name="GtkTextTagTable" c:type="GtkTextTagTable"/>
+      </property>
+      <property name="text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="has-selection">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="cursor-position">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="copy-target-list">
+        <type name="GtkTargetList" c:type="GtkTargetList"/>
+      </property>
+      <property name="paste-target-list">
+        <type name="GtkTargetList" c:type="GtkTargetList"/>
+      </property>
+      <callback name="insert_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="insert_pixbuf">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="insert_child_anchor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="anchor">
+            <type name="GtkTextChildAnchor*" c:type="GtkTextChildAnchor*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="delete_range">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="modified_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="mark_set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="location">
+            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="mark">
+            <type name="GtkTextMark*" c:type="GtkTextMark*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="mark_deleted">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="mark">
+            <type name="GtkTextMark*" c:type="GtkTextMark*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="apply_tag">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+          </parameter>
+          <parameter name="start_char">
+            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end_char">
+            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="remove_tag">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+          </parameter>
+          <parameter name="start_char">
+            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end_char">
+            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="begin_user_action">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="end_user_action">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved6">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="insert-text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="insert-pixbuf">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GdkPixbuf" c:type="GdkPixbuf"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="insert-child-anchor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkTextChildAnchor" c:type="GtkTextChildAnchor"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="delete-range">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="modified-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="mark-set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkTextMark" c:type="GtkTextMark"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="mark-deleted">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTextMark" c:type="GtkTextMark"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="apply-tag">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTextTag" c:type="GtkTextTag"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="remove-tag">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkTextTag" c:type="GtkTextTag"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="GtkTextIter" c:type="GtkTextIter"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="begin-user-action">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="end-user-action">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="text_buffer_spew" c:identifier="_gtk_text_buffer_spew">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_connect_object_while_alive"
-              c:identifier="gtk_signal_connect_object_while_alive">
+    <function name="text_buffer_get_btree"
+              c:identifier="_gtk_text_buffer_get_btree">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkTextBTree*" c:type="GtkTextBTree*"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
-        </parameter>
-        <parameter name="alive_object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_connect_while_alive"
-              c:identifier="gtk_signal_connect_while_alive">
+    <function name="text_buffer_get_line_log_attrs"
+              c:identifier="_gtk_text_buffer_get_line_log_attrs">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="PangoLogAttr*" c:type="PangoLogAttr*"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+        <parameter name="buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
         </parameter>
-        <parameter name="func_data">
-          <type name="gpointer" c:type="gpointer"/>
+        <parameter name="anywhere_in_line">
+          <type name="TextIter" c:type="GtkTextIter*"/>
         </parameter>
-        <parameter name="alive_object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="char_len">
+          <type name="gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_connect_full" c:identifier="gtk_signal_connect_full">
+    <function name="text_buffer_notify_will_remove_tag"
+              c:identifier="_gtk_text_buffer_notify_will_remove_tag">
       <return-value>
-        <type name="gulong" c:type="gulong"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
-        </parameter>
-        <parameter name="unsupported">
-          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy_func">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-        <parameter name="object_signal">
-          <type name="gint" c:type="gint"/>
+        <parameter name="buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
         </parameter>
-        <parameter name="after">
-          <type name="gint" c:type="gint"/>
+        <parameter name="tag">
+          <type name="TextTag" c:type="GtkTextTag*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_emitv" c:identifier="gtk_signal_emitv">
+    <callback name="GtkTextBufferSerializeFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="guint8*" c:type="guint8*"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="signal_id">
-          <type name="guint" c:type="guint"/>
+        <parameter name="register_buffer">
+          <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
         </parameter>
-        <parameter name="args">
-          <type name="GtkArg" c:type="GtkArg*"/>
+        <parameter name="content_buffer">
+          <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="signal_emit" c:identifier="gtk_signal_emit">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="start">
+          <type name="GtkTextIter*" c:type="GtkTextIter*"/>
         </parameter>
-        <parameter name="signal_id">
-          <type name="guint" c:type="guint"/>
+        <parameter name="end">
+          <type name="GtkTextIter*" c:type="GtkTextIter*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="signal_emit_by_name" c:identifier="gtk_signal_emit_by_name">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="length">
+          <type name="gsize*" c:type="gsize*"/>
         </parameter>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="signal_emitv_by_name"
-              c:identifier="gtk_signal_emitv_by_name">
+    </callback>
+    <callback name="GtkTextBufferDeserializeFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="args">
-          <type name="GtkArg" c:type="GtkArg*"/>
+        <parameter name="register_buffer">
+          <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="signal_compat_matched"
-              c:identifier="gtk_signal_compat_matched">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="content_buffer">
+          <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
         </parameter>
-        <parameter name="func">
-          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+        <parameter name="iter">
+          <type name="GtkTextIter*" c:type="GtkTextIter*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-        <parameter name="match">
-          <type name="GSignalMatchType" c:type="GSignalMatchType"/>
-        </parameter>
-        <parameter name="action">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkCalendarPrivate" c:type="GtkCalendarPrivate"/>
-    <callback name="GtkCalendarDetailFunc">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="calendar">
-          <type name="GtkCalendar*" c:type="GtkCalendar*"/>
-        </parameter>
-        <parameter name="year">
-          <type name="guint" c:type="guint"/>
+          <type name="guint8*" c:type="guint8*"/>
         </parameter>
-        <parameter name="month">
-          <type name="guint" c:type="guint"/>
+        <parameter name="length">
+          <type name="size" c:type="gsize"/>
         </parameter>
-        <parameter name="day">
-          <type name="guint" c:type="guint"/>
+        <parameter name="create_tags">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GError**" c:type="GError**"/>
         </parameter>
       </parameters>
     </callback>
-    <class name="Calendar"
-           c:type="GtkCalendar"
-           parent="Widget"
-           glib:type-name="GtkCalendar"
-           glib:get-type="gtk_calendar_get_type">
-      <method name="select_month" c:identifier="gtk_calendar_select_month">
+    <record name="GtkTextWindow" c:type="GtkTextWindow"/>
+    <record name="GtkTextPendingScroll" c:type="GtkTextPendingScroll"/>
+    <class name="TextView"
+           c:type="GtkTextView"
+           parent="Container"
+           glib:type-name="GtkTextView"
+           glib:get-type="gtk_text_view_get_type">
+      <method name="set_buffer" c:identifier="gtk_text_view_set_buffer">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="buffer" allow-none="1">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_buffer" c:identifier="gtk_text_view_get_buffer">
+        <return-value>
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="scroll_to_iter"
+              c:identifier="gtk_text_view_scroll_to_iter">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="within_margin">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="use_align">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="xalign">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="yalign">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="scroll_to_mark"
+              c:identifier="gtk_text_view_scroll_to_mark">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
+          </parameter>
+          <parameter name="within_margin">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="use_align">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="xalign">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="yalign">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="scroll_mark_onscreen"
+              c:identifier="gtk_text_view_scroll_mark_onscreen">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="move_mark_onscreen"
+              c:identifier="gtk_text_view_move_mark_onscreen">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="place_cursor_onscreen"
+              c:identifier="gtk_text_view_place_cursor_onscreen">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_visible_rect"
+              c:identifier="gtk_text_view_get_visible_rect">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="visible_rect">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_cursor_visible"
+              c:identifier="gtk_text_view_set_cursor_visible">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_cursor_visible"
+              c:identifier="gtk_text_view_get_cursor_visible">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_iter_location"
+              c:identifier="gtk_text_view_get_iter_location">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="location">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_iter_at_location"
+              c:identifier="gtk_text_view_get_iter_at_location">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_iter_at_position"
+              c:identifier="gtk_text_view_get_iter_at_position">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="trailing">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_line_yrange"
+              c:identifier="gtk_text_view_get_line_yrange">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="y">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="height">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_line_at_y" c:identifier="gtk_text_view_get_line_at_y">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="target_iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="line_top">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="buffer_to_window_coords"
+              c:identifier="gtk_text_view_buffer_to_window_coords">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="win">
+            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          </parameter>
+          <parameter name="buffer_x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="buffer_y">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="window_x">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="window_y">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="window_to_buffer_coords"
+              c:identifier="gtk_text_view_window_to_buffer_coords">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="win">
+            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          </parameter>
+          <parameter name="window_x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="window_y">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="buffer_x">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="buffer_y">
+            <type name="gint" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_window" c:identifier="gtk_text_view_get_window">
+        <return-value>
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="win">
+            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_window_type"
+              c:identifier="gtk_text_view_get_window_type">
+        <return-value>
+          <type name="TextWindowType" c:type="GtkTextWindowType"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_border_window_size"
+              c:identifier="gtk_text_view_set_border_window_size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          </parameter>
+          <parameter name="size">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_border_window_size"
+              c:identifier="gtk_text_view_get_border_window_size">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_display_line"
+              c:identifier="gtk_text_view_forward_display_line">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_display_line"
+              c:identifier="gtk_text_view_backward_display_line">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_display_line_end"
+              c:identifier="gtk_text_view_forward_display_line_end">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_display_line_start"
+              c:identifier="gtk_text_view_backward_display_line_start">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="starts_display_line"
+              c:identifier="gtk_text_view_starts_display_line">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="move_visually" c:identifier="gtk_text_view_move_visually">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_child_at_anchor"
+              c:identifier="gtk_text_view_add_child_at_anchor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_child_in_window"
+              c:identifier="gtk_text_view_add_child_in_window">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="which_window">
+            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          </parameter>
+          <parameter name="xpos">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="ypos">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="move_child" c:identifier="gtk_text_view_move_child">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="xpos">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="ypos">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_wrap_mode" c:identifier="gtk_text_view_set_wrap_mode">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="wrap_mode">
+            <type name="WrapMode" c:type="GtkWrapMode"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_wrap_mode" c:identifier="gtk_text_view_get_wrap_mode">
+        <return-value>
+          <type name="WrapMode" c:type="GtkWrapMode"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_editable" c:identifier="gtk_text_view_set_editable">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_editable" c:identifier="gtk_text_view_get_editable">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_overwrite" c:identifier="gtk_text_view_set_overwrite">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="overwrite">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_overwrite" c:identifier="gtk_text_view_get_overwrite">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_accepts_tab"
+              c:identifier="gtk_text_view_set_accepts_tab">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="accepts_tab">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_accepts_tab"
+              c:identifier="gtk_text_view_get_accepts_tab">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_pixels_above_lines"
+              c:identifier="gtk_text_view_set_pixels_above_lines">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="pixels_above_lines">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_pixels_above_lines"
+              c:identifier="gtk_text_view_get_pixels_above_lines">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_pixels_below_lines"
+              c:identifier="gtk_text_view_set_pixels_below_lines">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="pixels_below_lines">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_pixels_below_lines"
+              c:identifier="gtk_text_view_get_pixels_below_lines">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_pixels_inside_wrap"
+              c:identifier="gtk_text_view_set_pixels_inside_wrap">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="pixels_inside_wrap">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_pixels_inside_wrap"
+              c:identifier="gtk_text_view_get_pixels_inside_wrap">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_justification"
+              c:identifier="gtk_text_view_set_justification">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="justification">
+            <type name="Justification" c:type="GtkJustification"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_justification"
+              c:identifier="gtk_text_view_get_justification">
+        <return-value>
+          <type name="Justification" c:type="GtkJustification"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_left_margin"
+              c:identifier="gtk_text_view_set_left_margin">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="left_margin">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_left_margin"
+              c:identifier="gtk_text_view_get_left_margin">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_right_margin"
+              c:identifier="gtk_text_view_set_right_margin">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="month">
-            <type name="guint" c:type="guint"/>
+          <parameter name="right_margin">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="year">
-            <type name="guint" c:type="guint"/>
+        </parameters>
+      </method>
+      <method name="get_right_margin"
+              c:identifier="gtk_text_view_get_right_margin">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_day" c:identifier="gtk_calendar_select_day">
+      <method name="set_indent" c:identifier="gtk_text_view_set_indent">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="day">
-            <type name="guint" c:type="guint"/>
+          <parameter name="indent">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="mark_day" c:identifier="gtk_calendar_mark_day">
+      <method name="get_indent" c:identifier="gtk_text_view_get_indent">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
-          </parameter>
-          <parameter name="day">
-            <type name="guint" c:type="guint"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unmark_day" c:identifier="gtk_calendar_unmark_day">
+      <method name="set_tabs" c:identifier="gtk_text_view_set_tabs">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="day">
-            <type name="guint" c:type="guint"/>
+          <parameter name="tabs">
+            <type name="PangoTabArray" c:type="PangoTabArray*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clear_marks" c:identifier="gtk_calendar_clear_marks">
+      <method name="get_tabs" c:identifier="gtk_text_view_get_tabs">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="PangoTabArray" c:type="PangoTabArray*"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_display_options"
-              c:identifier="gtk_calendar_set_display_options">
+      <method name="get_default_attributes"
+              c:identifier="gtk_text_view_get_default_attributes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="CalendarDisplayOptions"
-                    c:type="GtkCalendarDisplayOptions"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_display_options"
-              c:identifier="gtk_calendar_get_display_options">
+      <property name="pixels-above-lines">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="pixels-below-lines">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="pixels-inside-wrap">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="editable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="wrap-mode">
+        <type name="GtkWrapMode" c:type="GtkWrapMode"/>
+      </property>
+      <property name="justification">
+        <type name="GtkJustification" c:type="GtkJustification"/>
+      </property>
+      <property name="left-margin">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="right-margin">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="indent">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="tabs">
+        <type name="PangoTabArray" c:type="PangoTabArray"/>
+      </property>
+      <property name="cursor-visible">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="buffer">
+        <type name="GtkTextBuffer" c:type="GtkTextBuffer"/>
+      </property>
+      <property name="overwrite">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="accepts-tab">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="set_scroll_adjustments">
         <return-value>
-          <type name="CalendarDisplayOptions"
-                  c:type="GtkCalendarDisplayOptions"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="text_view">
+            <type name="GtkTextView*" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="hadjustment">
+            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+          </parameter>
+          <parameter name="vadjustment">
+            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="display_options"
-              c:identifier="gtk_calendar_display_options">
+      </callback>
+      <callback name="populate_popup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="text_view">
+            <type name="GtkTextView*" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="flags">
-            <type name="CalendarDisplayOptions"
-                    c:type="GtkCalendarDisplayOptions"/>
+          <parameter name="menu">
+            <type name="GtkMenu*" c:type="GtkMenu*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_date" c:identifier="gtk_calendar_get_date">
+      </callback>
+      <callback name="move_cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="text_view">
+            <type name="GtkTextView*" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="year">
-            <type name="guint" c:type="guint*"/>
+          <parameter name="step">
+            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
           </parameter>
-          <parameter name="month">
-            <type name="guint" c:type="guint*"/>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="day">
-            <type name="guint" c:type="guint*"/>
+          <parameter name="extend_selection">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_detail_func"
-              c:identifier="gtk_calendar_set_detail_func">
+      </callback>
+      <callback name="page_horizontally">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkCalendarDetailFunc" c:type="GtkCalendarDetailFunc"/>
+          <parameter name="text_view">
+            <type name="GtkTextView*" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="extend_selection">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_detail_width_chars"
-              c:identifier="gtk_calendar_set_detail_width_chars">
+      </callback>
+      <callback name="set_anchor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
-          </parameter>
-          <parameter name="chars">
-            <type name="gint" c:type="gint"/>
+          <parameter name="text_view">
+            <type name="GtkTextView*" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_detail_height_rows"
-              c:identifier="gtk_calendar_set_detail_height_rows">
+      </callback>
+      <callback name="insert_at_cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="text_view">
+            <type name="GtkTextView*" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="rows">
-            <type name="gint" c:type="gint"/>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_detail_width_chars"
-              c:identifier="gtk_calendar_get_detail_width_chars">
+      </callback>
+      <callback name="delete_from_cursor">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="text_view">
+            <type name="GtkTextView*" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="GtkDeleteType" c:type="GtkDeleteType"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_detail_height_rows"
-              c:identifier="gtk_calendar_get_detail_height_rows">
+      </callback>
+      <callback name="backspace">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="text_view">
+            <type name="GtkTextView*" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="freeze" c:identifier="gtk_calendar_freeze">
+      </callback>
+      <callback name="cut_clipboard">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="text_view">
+            <type name="GtkTextView*" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="thaw" c:identifier="gtk_calendar_thaw">
+      </callback>
+      <callback name="copy_clipboard">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="text_view">
+            <type name="GtkTextView*" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="year">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="month">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="day">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="show-heading">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="show-day-names">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="no-month-change">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="show-week-numbers">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="show-details">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-      <property name="detail-width-chars">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <property name="detail-height-rows">
-        <type name="gint" c:type="gint"/>
-      </property>
-      <callback name="month_changed">
+      </callback>
+      <callback name="paste_clipboard">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+          <parameter name="text_view">
+            <type name="GtkTextView*" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="day_selected">
+      <callback name="toggle_overwrite">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+          <parameter name="text_view">
+            <type name="GtkTextView*" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="day_selected_double_click">
+      <callback name="move_focus">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+          <parameter name="text_view">
+            <type name="GtkTextView*" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="direction">
+            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="prev_month">
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved6">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved7">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="move-cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+          <parameter name="object">
+            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="next_month">
+      </glib:signal>
+      <glib:signal name="copy-clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="populate-popup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+          <parameter name="object">
+            <type name="GtkMenu" c:type="GtkMenu"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="prev_year">
+      </glib:signal>
+      <glib:signal name="insert-at-cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="next_year">
+      </glib:signal>
+      <glib:signal name="delete-from-cursor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+          <parameter name="object">
+            <type name="GtkDeleteType" c:type="GtkDeleteType"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <glib:signal name="month-changed">
+      </glib:signal>
+      <glib:signal name="backspace">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="day-selected">
+      <glib:signal name="cut-clipboard">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="day-selected-double-click">
+      <glib:signal name="paste-clipboard">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="prev-month">
+      <glib:signal name="toggle-overwrite">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="next-month">
+      <glib:signal name="set-scroll-adjustments">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+          </parameter>
+        </parameters>
       </glib:signal>
-      <glib:signal name="prev-year">
+      <glib:signal name="select-all">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
       </glib:signal>
-      <glib:signal name="next-year">
+      <glib:signal name="page-horizontally">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="move-viewport">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkScrollStep" c:type="GtkScrollStep"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="set-anchor">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="toggle-cursor-visible">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
     </class>
-    <function name="calendar_new" c:identifier="gtk_calendar_new">
+    <function name="text_view_new" c:identifier="gtk_text_view_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="text_view_new_with_buffer"
+              c:identifier="gtk_text_view_new_with_buffer">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkTipsQuery" c:type="GtkTipsQuery">
+      <field name="label">
+        <type name="GtkLabel" c:type="GtkLabel"/>
+      </field>
+      <field name="emit_always">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="in_query">
+        <type name="guint" c:type="guint"/>
+      </field>
+      <field name="label_inactive">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="label_no_tip">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="caller">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="last_crossed">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="query_cursor">
+        <type name="GdkCursor*" c:type="GdkCursor*"/>
+      </field>
+      <callback name="start_query">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tips_query">
+            <type name="GtkTipsQuery*" c:type="GtkTipsQuery*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="stop_query">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tips_query">
+            <type name="GtkTipsQuery*" c:type="GtkTipsQuery*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="widget_entered">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tips_query">
+            <type name="GtkTipsQuery*" c:type="GtkTipsQuery*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tip_text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="tip_private">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="widget_selected">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="tips_query">
+            <type name="GtkTipsQuery*" c:type="GtkTipsQuery*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tip_text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="tip_private">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="GdkEventButton*" c:type="GdkEventButton*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </record>
+    <function name="tips_query_get_type"
+              c:identifier="gtk_tips_query_get_type">
+      <return-value>
+        <type name="GtkType" c:type="GtkType"/>
+      </return-value>
+    </function>
+    <function name="tips_query_new" c:identifier="gtk_tips_query_new">
       <return-value>
         <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
     </function>
-    <record name="GtkFileFolder" c:type="GtkFileFolder"/>
-    <record name="GtkFileSystem" c:type="GtkFileSystem"/>
-    <record name="GtkFileSystemVolume" c:type="GtkFileSystemVolume"/>
-    <enumeration name="FileInfoType" c:type="GtkFileInfoType">
-      <member name="display_name"
-                value="1"
-                c:identifier="GTK_FILE_INFO_DISPLAY_NAME"/>
-      <member name="is_folder"
-                value="2"
-                c:identifier="GTK_FILE_INFO_IS_FOLDER"/>
-      <member name="is_hidden"
-                value="4"
-                c:identifier="GTK_FILE_INFO_IS_HIDDEN"/>
-      <member name="mime_type"
-                value="8"
-                c:identifier="GTK_FILE_INFO_MIME_TYPE"/>
-      <member name="modification_time"
-                value="16"
-                c:identifier="GTK_FILE_INFO_MODIFICATION_TIME"/>
-      <member name="size" value="32" c:identifier="GTK_FILE_INFO_SIZE"/>
-      <member name="icon" value="64" c:identifier="GTK_FILE_INFO_ICON"/>
-      <member name="all" value="127" c:identifier="GTK_FILE_INFO_ALL"/>
-    </enumeration>
-    <enumeration name="FileSystemError" c:type="GtkFileSystemError">
-      <member name="r_nonexistent"
-                value="0"
-                c:identifier="GTK_FILE_SYSTEM_ERROR_NONEXISTENT"/>
-      <member name="r_not_folder"
-                value="1"
-                c:identifier="GTK_FILE_SYSTEM_ERROR_NOT_FOLDER"/>
-      <member name="r_invalid_uri"
-                value="2"
-                c:identifier="GTK_FILE_SYSTEM_ERROR_INVALID_URI"/>
-      <member name="r_bad_filename"
-                value="3"
-                c:identifier="GTK_FILE_SYSTEM_ERROR_BAD_FILENAME"/>
-      <member name="r_failed"
-                value="4"
-                c:identifier="GTK_FILE_SYSTEM_ERROR_FAILED"/>
-      <member name="r_already_exists"
-                value="5"
-                c:identifier="GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS"/>
-    </enumeration>
-    <function name="file_system_error_quark"
-              c:identifier="gtk_file_system_error_quark">
+    <function name="tips_query_start_query"
+              c:identifier="gtk_tips_query_start_query">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tips_query">
+          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tips_query_stop_query"
+              c:identifier="gtk_tips_query_stop_query">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tips_query">
+          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tips_query_set_caller"
+              c:identifier="gtk_tips_query_set_caller">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tips_query">
+          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
+        </parameter>
+        <parameter name="caller">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tips_query_set_labels"
+              c:identifier="gtk_tips_query_set_labels">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="tips_query">
+          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
+        </parameter>
+        <parameter name="label_inactive">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="label_no_tip">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
     </function>
-    <glib:boxed c:type="FileInfo"
-                glib:name="FileInfo"
-                glib:type-name="GtkFileInfo"
-                glib:get-type="gtk_file_info_get_type">
-      <constructor name="new" c:identifier="gtk_file_info_new">
+    <record name="GtkToolbarChild" c:type="GtkToolbarChild">
+      <field name="type">
+        <type name="GtkToolbarChildType" c:type="GtkToolbarChildType"/>
+      </field>
+      <field name="widget">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="icon">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+      <field name="label">
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </field>
+    </record>
+    <record name="GtkToolbarPrivate" c:type="GtkToolbarPrivate"/>
+    <class name="Toolbar"
+           c:type="GtkToolbar"
+           parent="Container"
+           glib:type-name="GtkToolbar"
+           glib:get-type="gtk_toolbar_get_type">
+      <method name="insert" c:identifier="gtk_toolbar_insert">
         <return-value>
-          <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_file_info_copy">
+        <parameters>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
+          </parameter>
+          <parameter name="item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_item_index" c:identifier="gtk_toolbar_get_item_index">
         <return-value>
-          <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
+          </parameter>
+          <parameter name="item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_file_info_free">
+      </method>
+      <method name="get_n_items" c:identifier="gtk_toolbar_get_n_items">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_display_name"
-              c:identifier="gtk_file_info_get_display_name">
+      <method name="get_nth_item" c:identifier="gtk_toolbar_get_nth_item">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="ToolItem" c:type="GtkToolItem*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
+          </parameter>
+          <parameter name="n">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_display_key"
-              c:identifier="gtk_file_info_get_display_key">
+      <method name="get_show_arrow" c:identifier="gtk_toolbar_get_show_arrow">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_display_name"
-              c:identifier="gtk_file_info_set_display_name">
+      <method name="set_show_arrow" c:identifier="gtk_toolbar_set_show_arrow">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="display_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="show_arrow">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_is_folder" c:identifier="gtk_file_info_get_is_folder">
+      <method name="get_orientation"
+              c:identifier="gtk_toolbar_get_orientation">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="Orientation" c:type="GtkOrientation"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_is_folder" c:identifier="gtk_file_info_set_is_folder">
+      <method name="set_orientation"
+              c:identifier="gtk_toolbar_set_orientation">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="is_folder">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="orientation">
+            <type name="Orientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_is_hidden" c:identifier="gtk_file_info_get_is_hidden">
+      <method name="get_tooltips" c:identifier="gtk_toolbar_get_tooltips">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_is_hidden" c:identifier="gtk_file_info_set_is_hidden">
+      <method name="set_tooltips" c:identifier="gtk_toolbar_set_tooltips">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="is_hidden">
-            <type name="gboolean" c:type="gboolean"/>
+          <parameter name="enable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_mime_type" c:identifier="gtk_file_info_get_mime_type">
+      <method name="get_style" c:identifier="gtk_toolbar_get_style">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_mime_type" c:identifier="gtk_file_info_set_mime_type">
+      <method name="set_style" c:identifier="gtk_toolbar_set_style">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="mime_type">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="style">
+            <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_modification_time"
-              c:identifier="gtk_file_info_get_modification_time">
+      <method name="unset_style" c:identifier="gtk_toolbar_unset_style">
         <return-value>
-          <type name="GtkFileTime" c:type="GtkFileTime"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_modification_time"
-              c:identifier="gtk_file_info_set_modification_time">
+      <method name="get_icon_size" c:identifier="gtk_toolbar_get_icon_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="IconSize" c:type="GtkIconSize"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="modification_time">
-            <type name="GtkFileTime" c:type="GtkFileTime"/>
+        </parameters>
+      </method>
+      <method name="get_relief_style"
+              c:identifier="gtk_toolbar_get_relief_style">
+        <return-value>
+          <type name="ReliefStyle" c:type="GtkReliefStyle"/>
+        </return-value>
+        <parameters>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size" c:identifier="gtk_file_info_get_size">
+      <method name="get_drop_index" c:identifier="gtk_toolbar_get_drop_index">
         <return-value>
-          <type name="gint64" c:type="gint64"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_size" c:identifier="gtk_file_info_set_size">
+      <method name="set_drop_highlight_item"
+              c:identifier="gtk_toolbar_set_drop_highlight_item">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="size">
-            <type name="gint64" c:type="gint64"/>
+          <parameter name="tool_item" allow-none="1">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
+          </parameter>
+          <parameter name="index_">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_icon_name" c:identifier="gtk_file_info_set_icon_name">
+      <method name="set_icon_size" c:identifier="gtk_toolbar_set_icon_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="con_name">
-            <type name="gchar" c:type="gchar*"/>
+          <parameter name="icon_size">
+            <type name="IconSize" c:type="GtkIconSize"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_icon_name" c:identifier="gtk_file_info_get_icon_name">
+      <method name="unset_icon_size"
+              c:identifier="gtk_toolbar_unset_icon_size">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="render_icon" c:identifier="gtk_file_info_render_icon">
+      <method name="append_item" c:identifier="gtk_toolbar_append_item">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="widget">
+          <parameter name="text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_private_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="icon">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="pixel_size">
-            <type name="gint" c:type="gint"/>
+          <parameter name="callback">
+            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="user_data" allow-none="1">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-    </glib:boxed>
-    <class name="FileSystemHandle"
-           c:type="GtkFileSystemHandle"
-           parent="GLib.Object"
-           glib:type-name="GtkFileSystemHandle"
-           glib:get-type="gtk_file_system_handle_get_type">
-      <property name="cancelled">
-        <type name="gboolean" c:type="gboolean"/>
-      </property>
-    </class>
-    <callback name="GtkFileSystemGetInfoCallback">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="handle">
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-        </parameter>
-        <parameter name="file_info">
-          <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError*" c:type="GError*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkFileSystemGetFolderCallback">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="handle">
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-        </parameter>
-        <parameter name="folder">
-          <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError*" c:type="GError*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkFileSystemCreateFolderCallback">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="handle">
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError*" c:type="GError*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkFileSystemVolumeMountCallback">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="handle">
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError*" c:type="GError*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <interface name="FileSystem"
-               c:type="GtkFileSystem"
-               glib:type-name="GtkFileSystem"
-               glib:get-type="gtk_file_system_get_type">
-      <callback name="list_volumes">
+      <method name="prepend_item" c:identifier="gtk_toolbar_prepend_item">
         <return-value>
-          <type name="GSList*" c:type="GSList*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_volume_for_path">
-        <return-value>
-          <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="text">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <parameter name="tooltip_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_private_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="icon">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_folder">
+      </method>
+      <method name="insert_item" c:identifier="gtk_toolbar_insert_item">
         <return-value>
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <parameter name="text">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="types">
-            <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
+          <parameter name="tooltip_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_private_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="icon">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GtkFileSystemGetFolderCallback"
-                    c:type="GtkFileSystemGetFolderCallback"/>
+            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
           </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_info">
+      </method>
+      <method name="insert_stock" c:identifier="gtk_toolbar_insert_stock">
         <return-value>
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="types">
-            <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
+          <parameter name="tooltip_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_private_text">
+            <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GtkFileSystemGetInfoCallback"
-                    c:type="GtkFileSystemGetInfoCallback"/>
+            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
           </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="create_folder">
+      </method>
+      <method name="append_space" c:identifier="gtk_toolbar_append_space">
         <return-value>
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkFileSystemCreateFolderCallback"
-                    c:type="GtkFileSystemCreateFolderCallback"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+        </parameters>
+      </method>
+      <method name="prepend_space" c:identifier="gtk_toolbar_prepend_space">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="cancel_operation">
+      </method>
+      <method name="insert_space" c:identifier="gtk_toolbar_insert_space">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="handle">
-            <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="volume_free">
+      </method>
+      <method name="remove_space" c:identifier="gtk_toolbar_remove_space">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="volume_get_base_path">
+      </method>
+      <method name="append_element" c:identifier="gtk_toolbar_append_element">
         <return-value>
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          <parameter name="type">
+            <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_private_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="icon">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="volume_get_is_mounted">
+      </method>
+      <method name="prepend_element"
+              c:identifier="gtk_toolbar_prepend_element">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          <parameter name="tooltip_text">
+            <type name="string" c:type="char*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="volume_mount">
-        <return-value>
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="tooltip_private_text">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          <parameter name="icon">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GtkFileSystemVolumeMountCallback"
-                    c:type="GtkFileSystemVolumeMountCallback"/>
+            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
           </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="volume_get_display_name">
+      </method>
+      <method name="insert_element" c:identifier="gtk_toolbar_insert_element">
         <return-value>
-          <type name="char*" c:type="char*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          <parameter name="type">
+            <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="volume_get_icon_name">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          <parameter name="text">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+          <parameter name="tooltip_text">
+            <type name="string" c:type="char*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_parent">
-        <return-value>
-          <type name="gboolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="tooltip_private_text">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <parameter name="icon">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="parent">
-            <type name="GtkFilePath**" c:type="GtkFilePath**"/>
+          <parameter name="callback">
+            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="make_path">
+      </method>
+      <method name="append_widget" c:identifier="gtk_toolbar_append_widget">
         <return-value>
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="base_path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="display_name">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="tooltip_text" allow-none="1">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+          <parameter name="tooltip_private_text" allow-none="1">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="parse">
+      </method>
+      <method name="prepend_widget" c:identifier="gtk_toolbar_prepend_widget">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="base_path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="str">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="folder">
-            <type name="GtkFilePath**" c:type="GtkFilePath**"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="file_part">
-            <type name="gchar**" c:type="gchar**"/>
+          <parameter name="tooltip_text" allow-none="1">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+          <parameter name="tooltip_private_text" allow-none="1">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="path_to_uri">
+      </method>
+      <method name="insert_widget" c:identifier="gtk_toolbar_insert_widget">
         <return-value>
-          <type name="gchar*" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="path_to_filename">
-        <return-value>
-          <type name="gchar*" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="tooltip_text" allow-none="1">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <parameter name="tooltip_private_text" allow-none="1">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="uri_to_path">
+      </method>
+      <property name="orientation">
+        <type name="GtkOrientation" c:type="GtkOrientation"/>
+      </property>
+      <property name="toolbar-style">
+        <type name="GtkToolbarStyle" c:type="GtkToolbarStyle"/>
+      </property>
+      <property name="show-arrow">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="tooltips">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="icon-size">
+        <type name="GtkIconSize" c:type="GtkIconSize"/>
+      </property>
+      <property name="icon-size-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="orientation_changed">
         <return-value>
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="toolbar">
+            <type name="GtkToolbar*" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="orientation">
+            <type name="GtkOrientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="filename_to_path">
+      <callback name="style_changed">
         <return-value>
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="toolbar">
+            <type name="GtkToolbar*" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="path">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="style">
+            <type name="GtkToolbarStyle" c:type="GtkToolbarStyle"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="insert_bookmark">
+      <callback name="popup_context_menu">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="toolbar">
+            <type name="GtkToolbar*" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="position">
-            <type name="gint" c:type="gint"/>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+          <parameter name="button_number">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="remove_bookmark">
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="list_bookmarks">
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="GSList*" c:type="GSList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="volumes_changed">
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="bookmarks_changed">
+      <glib:signal name="orientation-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="object">
+            <type name="GtkOrientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_bookmark_label">
+      </glib:signal>
+      <glib:signal name="style-changed">
         <return-value>
-          <type name="gchar*" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <parameter name="object">
+            <type name="GtkToolbarStyle" c:type="GtkToolbarStyle"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_bookmark_label">
+      </glib:signal>
+      <glib:signal name="popup-context-menu">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+          <parameter name="object">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="label">
-            <type name="gchar*" c:type="gchar*"/>
+          <parameter name="p1">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <glib:signal name="volumes-changed">
-        <return-value>
-          <type name="void" c:type="void"/>
-        </return-value>
       </glib:signal>
-      <glib:signal name="bookmarks-changed">
+      <glib:signal name="focus-home-or-end">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
       </glib:signal>
-    </interface>
-    <function name="file_system_list_volumes"
-              c:identifier="gtk_file_system_list_volumes">
-      <return-value>
-        <type name="GSList*" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_get_volume_for_path"
-              c:identifier="gtk_file_system_get_volume_for_path">
-      <return-value>
-        <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_volume_free"
-              c:identifier="gtk_file_system_volume_free">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_volume_get_base_path"
-              c:identifier="gtk_file_system_volume_get_base_path">
-      <return-value>
-        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_volume_get_is_mounted"
-              c:identifier="gtk_file_system_volume_get_is_mounted">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_volume_mount"
-              c:identifier="gtk_file_system_volume_mount">
-      <return-value>
-        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GtkFileSystemVolumeMountCallback"
-                  c:type="GtkFileSystemVolumeMountCallback"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_volume_get_display_name"
-              c:identifier="gtk_file_system_volume_get_display_name">
-      <return-value>
-        <type name="char*" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_volume_render_icon"
-              c:identifier="gtk_file_system_volume_render_icon">
-      <return-value>
-        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="pixel_size">
-          <type name="gint" c:type="gint"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_volume_get_icon_name"
-              c:identifier="gtk_file_system_volume_get_icon_name">
-      <return-value>
-        <type name="gchar*" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_get_parent"
-              c:identifier="gtk_file_system_get_parent">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="GtkFilePath" c:type="GtkFilePath**"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_get_folder"
-              c:identifier="gtk_file_system_get_folder">
-      <return-value>
-        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="types">
-          <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GtkFileSystemGetFolderCallback"
-                  c:type="GtkFileSystemGetFolderCallback"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_get_info"
-              c:identifier="gtk_file_system_get_info">
-      <return-value>
-        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="types">
-          <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GtkFileSystemGetInfoCallback"
-                  c:type="GtkFileSystemGetInfoCallback"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_create_folder"
-              c:identifier="gtk_file_system_create_folder">
-      <return-value>
-        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GtkFileSystemCreateFolderCallback"
-                  c:type="GtkFileSystemCreateFolderCallback"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_cancel_operation"
-              c:identifier="gtk_file_system_cancel_operation">
+    </class>
+    <function name="toolbar_new" c:identifier="gtk_toolbar_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="handle">
-          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="file_system_make_path"
-              c:identifier="gtk_file_system_make_path">
+    <function name="toolbar_elide_underscores"
+              c:identifier="_gtk_toolbar_elide_underscores">
       <return-value>
-        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="base_path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="display_name">
-          <type name="gchar" c:type="gchar*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+        <parameter name="original">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_system_parse" c:identifier="gtk_file_system_parse">
-      <return-value>
-        <type name="gboolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="base_path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="str">
-          <type name="gchar" c:type="gchar*"/>
+    <function name="toolbar_paint_space_line"
+              c:identifier="_gtk_toolbar_paint_space_line">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="folder">
-          <type name="GtkFilePath" c:type="GtkFilePath**"/>
+        <parameter name="toolbar">
+          <type name="Toolbar" c:type="GtkToolbar*"/>
         </parameter>
-        <parameter name="file_part">
-          <type name="gchar" c:type="gchar**"/>
+        <parameter name="area">
+          <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+        <parameter name="allocation">
+          <type name="GtkAllocation" c:type="GtkAllocation*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_system_path_to_uri"
-              c:identifier="gtk_file_system_path_to_uri">
+    <function name="toolbar_get_default_space_size"
+              c:identifier="_gtk_toolbar_get_default_space_size">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+    </function>
+    <function name="toolbar_rebuild_menu"
+              c:identifier="_gtk_toolbar_rebuild_menu">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        <parameter name="toolbar">
+          <type name="Toolbar" c:type="GtkToolbar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_system_path_to_filename"
-              c:identifier="gtk_file_system_path_to_filename">
+    <record name="GtkTreeDragSource" c:type="GtkTreeDragSource"/>
+    <interface name="TreeDragSource"
+               c:type="GtkTreeDragSource"
+               glib:type-name="GtkTreeDragSource"
+               glib:get-type="gtk_tree_drag_source_get_type">
+      <callback name="row_draggable">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drag_source">
+            <type name="GtkTreeDragSource*" c:type="GtkTreeDragSource*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="drag_data_get">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drag_source">
+            <type name="GtkTreeDragSource*" c:type="GtkTreeDragSource*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="selection_data">
+            <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="drag_data_delete">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drag_source">
+            <type name="GtkTreeDragSource*" c:type="GtkTreeDragSource*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </interface>
+    <function name="tree_drag_source_row_draggable"
+              c:identifier="gtk_tree_drag_source_row_draggable">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        <parameter name="drag_source">
+          <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_system_uri_to_path"
-              c:identifier="gtk_file_system_uri_to_path">
+    <function name="tree_drag_source_drag_data_delete"
+              c:identifier="gtk_tree_drag_source_drag_data_delete">
       <return-value>
-        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        <parameter name="drag_source">
+          <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
         </parameter>
-        <parameter name="uri">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_system_filename_to_path"
-              c:identifier="gtk_file_system_filename_to_path">
+    <function name="tree_drag_source_drag_data_get"
+              c:identifier="gtk_tree_drag_source_drag_data_get">
       <return-value>
-        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        <parameter name="drag_source">
+          <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
         </parameter>
-        <parameter name="filename">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_system_path_is_local"
-              c:identifier="gtk_file_system_path_is_local">
+    <record name="GtkTreeDragDest" c:type="GtkTreeDragDest"/>
+    <interface name="TreeDragDest"
+               c:type="GtkTreeDragDest"
+               glib:type-name="GtkTreeDragDest"
+               glib:get-type="gtk_tree_drag_dest_get_type">
+      <callback name="drag_data_received">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drag_dest">
+            <type name="GtkTreeDragDest*" c:type="GtkTreeDragDest*"/>
+          </parameter>
+          <parameter name="dest">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="selection_data">
+            <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="row_drop_possible">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drag_dest">
+            <type name="GtkTreeDragDest*" c:type="GtkTreeDragDest*"/>
+          </parameter>
+          <parameter name="dest_path">
+            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="selection_data">
+            <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </interface>
+    <function name="tree_drag_dest_drag_data_received"
+              c:identifier="gtk_tree_drag_dest_drag_data_received">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="filesystem">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        <parameter name="drag_dest">
+          <type name="TreeDragDest" c:type="GtkTreeDragDest*"/>
         </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        <parameter name="dest">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_system_insert_bookmark"
-              c:identifier="gtk_file_system_insert_bookmark">
+    <function name="tree_drag_dest_row_drop_possible"
+              c:identifier="gtk_tree_drag_dest_row_drop_possible">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        <parameter name="drag_dest">
+          <type name="TreeDragDest" c:type="GtkTreeDragDest*"/>
         </parameter>
-        <parameter name="position">
-          <type name="gint" c:type="gint"/>
+        <parameter name="dest_path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_system_remove_bookmark"
-              c:identifier="gtk_file_system_remove_bookmark">
+    <function name="tree_set_row_drag_data"
+              c:identifier="gtk_tree_set_row_drag_data">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_system_list_bookmarks"
-              c:identifier="gtk_file_system_list_bookmarks">
+    <function name="tree_get_row_drag_data"
+              c:identifier="gtk_tree_get_row_drag_data">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel**"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_system_get_bookmark_label"
-              c:identifier="gtk_file_system_get_bookmark_label">
+    <callback name="GtkTreeSelectionFunc">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        <parameter name="selection">
+          <type name="GtkTreeSelection*" c:type="GtkTreeSelection*"/>
+        </parameter>
+        <parameter name="model">
+          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="path_currently_selected">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="file_system_set_bookmark_label"
-              c:identifier="gtk_file_system_set_bookmark_label">
+    </callback>
+    <callback name="GtkTreeSelectionForeachFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
+        <parameter name="model">
+          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
         </parameter>
-        <parameter name="label">
-          <type name="gchar" c:type="gchar*"/>
+        <parameter name="iter">
+          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <interface name="FileFolder"
-               c:type="GtkFileFolder"
-               glib:type-name="GtkFileFolder"
-               glib:get-type="gtk_file_folder_get_type">
-      <callback name="get_info">
+    </callback>
+    <class name="TreeSelection"
+           c:type="GtkTreeSelection"
+           parent="GLib.Object"
+           glib:type-name="GtkTreeSelection"
+           glib:get-type="gtk_tree_selection_get_type">
+      <method name="set_mode" c:identifier="gtk_tree_selection_set_mode">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="SelectionMode" c:type="GtkSelectionMode"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_mode" c:identifier="gtk_tree_selection_get_mode">
+        <return-value>
+          <type name="SelectionMode" c:type="GtkSelectionMode"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_select_function"
+              c:identifier="gtk_tree_selection_set_select_function">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="GtkTreeSelectionFunc" c:type="GtkTreeSelectionFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_user_data"
+              c:identifier="gtk_tree_selection_get_user_data">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_tree_view"
+              c:identifier="gtk_tree_selection_get_tree_view">
+        <return-value>
+          <type name="TreeView" c:type="GtkTreeView*"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_selected"
+              c:identifier="gtk_tree_selection_get_selected">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="model">
+            <type name="TreeModel" c:type="GtkTreeModel**"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_selected_rows"
+              c:identifier="gtk_tree_selection_get_selected_rows">
+        <return-value>
+          <type name="GList" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="model">
+            <type name="TreeModel" c:type="GtkTreeModel**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="count_selected_rows"
+              c:identifier="gtk_tree_selection_count_selected_rows">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="selected_foreach"
+              c:identifier="gtk_tree_selection_selected_foreach">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="GtkTreeSelectionForeachFunc"
+                  c:type="GtkTreeSelectionForeachFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="select_path" c:identifier="gtk_tree_selection_select_path">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unselect_path"
+              c:identifier="gtk_tree_selection_unselect_path">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="select_iter" c:identifier="gtk_tree_selection_select_iter">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unselect_iter"
+              c:identifier="gtk_tree_selection_unselect_iter">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="path_is_selected"
+              c:identifier="gtk_tree_selection_path_is_selected">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="iter_is_selected"
+              c:identifier="gtk_tree_selection_iter_is_selected">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="select_all" c:identifier="gtk_tree_selection_select_all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unselect_all"
+              c:identifier="gtk_tree_selection_unselect_all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="select_range"
+              c:identifier="gtk_tree_selection_select_range">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="start_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="end_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unselect_range"
+              c:identifier="gtk_tree_selection_unselect_range">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="start_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="end_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="GtkTreeSelection*" c:type="GtkTreeSelection*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <record name="GtkUIManagerPrivate" c:type="GtkUIManagerPrivate"/>
+    <class name="UIManager"
+           c:type="GtkUIManager"
+           parent="GLib.Object"
+           glib:type-name="GtkUIManager"
+           glib:get-type="gtk_ui_manager_get_type">
+      <constructor name="new" c:identifier="gtk_ui_manager_new">
+        <return-value>
+          <type name="UIManager" c:type="GtkUIManager*"/>
+        </return-value>
+      </constructor>
+      <method name="set_add_tearoffs"
+              c:identifier="gtk_ui_manager_set_add_tearoffs">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="folder">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="add_tearoffs">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_add_tearoffs"
+              c:identifier="gtk_ui_manager_get_add_tearoffs">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_action_group"
+              c:identifier="gtk_ui_manager_insert_action_group">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_action_group"
+              c:identifier="gtk_ui_manager_remove_action_group">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_action_groups"
+              c:identifier="gtk_ui_manager_get_action_groups">
+        <return-value>
+          <type name="GList" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_accel_group"
+              c:identifier="gtk_ui_manager_get_accel_group">
+        <return-value>
+          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_widget" c:identifier="gtk_ui_manager_get_widget">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_toplevels" c:identifier="gtk_ui_manager_get_toplevels">
+        <return-value>
+          <type name="GSList" c:type="GSList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="types">
+            <type name="UIManagerItemType" c:type="GtkUIManagerItemType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_action" c:identifier="gtk_ui_manager_get_action">
+        <return-value>
+          <type name="Action" c:type="GtkAction*"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_ui_from_string"
+              c:identifier="gtk_ui_manager_add_ui_from_string">
+        <return-value>
+          <type name="guint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="buffer">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="ssize" c:type="gssize"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="list_children">
+      </method>
+      <method name="add_ui_from_file"
+              c:identifier="gtk_ui_manager_add_ui_from_file">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="guint" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="folder">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="children">
-            <type name="GSList**" c:type="GSList**"/>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GError" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_ui" c:identifier="gtk_ui_manager_add_ui">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="merge_id">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="action" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="UIManagerItemType" c:type="GtkUIManagerItemType"/>
+          </parameter>
+          <parameter name="top">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_ui" c:identifier="gtk_ui_manager_remove_ui">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="merge_id">
+            <type name="guint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_ui" c:identifier="gtk_ui_manager_get_ui">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="ensure_update" c:identifier="gtk_ui_manager_ensure_update">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="new_merge_id" c:identifier="gtk_ui_manager_new_merge_id">
+        <return-value>
+          <type name="guint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="add-tearoffs">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="ui">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <callback name="add_widget">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="merge">
+            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="deleted">
+      <callback name="actions_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="monitor">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <parameter name="merge">
+            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="files_added">
+      <callback name="connect_proxy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="monitor">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <parameter name="merge">
+            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="paths">
-            <type name="GSList*" c:type="GSList*"/>
+          <parameter name="action">
+            <type name="GtkAction*" c:type="GtkAction*"/>
+          </parameter>
+          <parameter name="proxy">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="files_changed">
+      <callback name="disconnect_proxy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="monitor">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <parameter name="merge">
+            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="paths">
-            <type name="GSList*" c:type="GSList*"/>
+          <parameter name="action">
+            <type name="GtkAction*" c:type="GtkAction*"/>
+          </parameter>
+          <parameter name="proxy">
+            <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="files_removed">
+      <callback name="pre_activate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="monitor">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <parameter name="merge">
+            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="paths">
-            <type name="GSList*" c:type="GSList*"/>
+          <parameter name="action">
+            <type name="GtkAction*" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_finished_loading">
+      <callback name="post_activate">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="folder">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <parameter name="merge">
+            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="action">
+            <type name="GtkAction*" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="finished_loading">
+      <callback name="get_widget">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="GtkWidget*" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="folder">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <parameter name="manager">
+            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <glib:signal name="deleted">
+      <callback name="get_action">
+        <return-value>
+          <type name="GtkAction*" c:type="GtkAction*"/>
+        </return-value>
+        <parameters>
+          <parameter name="manager">
+            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="connect-proxy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkAction" c:type="GtkAction"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkWidget" c:type="GtkWidget"/>
+          </parameter>
+        </parameters>
       </glib:signal>
-      <glib:signal name="files-added">
+      <glib:signal name="disconnect-proxy">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="GtkAction" c:type="GtkAction"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GtkWidget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="files-changed">
+      <glib:signal name="pre-activate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="GtkAction" c:type="GtkAction"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="files-removed">
+      <glib:signal name="post-activate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="GtkAction" c:type="GtkAction"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="finished-loading">
+      <glib:signal name="add-widget">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkWidget" c:type="GtkWidget"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="actions-changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-    </interface>
-    <function name="file_folder_list_children"
-              c:identifier="gtk_file_folder_list_children">
+    </class>
+    <class name="VButtonBox"
+           c:type="GtkVButtonBox"
+           parent="ButtonBox"
+           glib:type-name="GtkVButtonBox"
+           glib:get-type="gtk_vbutton_box_get_type">
+    </class>
+    <function name="vbutton_box_new" c:identifier="gtk_vbutton_box_new">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="folder">
-          <type name="FileFolder" c:type="GtkFileFolder*"/>
-        </parameter>
-        <parameter name="children">
-          <type name="GSList" c:type="GSList**"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="file_folder_get_info"
-              c:identifier="gtk_file_folder_get_info">
+    <function name="vbutton_box_get_spacing_default"
+              c:identifier="gtk_vbutton_box_get_spacing_default">
       <return-value>
-        <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
-      <parameters>
-        <parameter name="folder">
-          <type name="FileFolder" c:type="GtkFileFolder*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="file_folder_is_finished_loading"
-              c:identifier="gtk_file_folder_is_finished_loading">
+    <function name="vbutton_box_set_spacing_default"
+              c:identifier="gtk_vbutton_box_set_spacing_default">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="folder">
-          <type name="FileFolder" c:type="GtkFileFolder*"/>
+        <parameter name="spacing">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <glib:boxed c:type="FilePath"
-                glib:name="FilePath"
-                glib:type-name="GtkFilePath"
-                glib:get-type="gtk_file_path_get_type">
-    </glib:boxed>
-    <function name="file_paths_sort" c:identifier="gtk_file_paths_sort">
+    <function name="vbutton_box_get_layout_default"
+              c:identifier="gtk_vbutton_box_get_layout_default">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GtkButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
       </return-value>
-      <parameters>
-        <parameter name="paths">
-          <type name="GSList" c:type="GSList*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="file_paths_copy" c:identifier="gtk_file_paths_copy">
+    <function name="vbutton_box_set_layout_default"
+              c:identifier="gtk_vbutton_box_set_layout_default">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="paths">
-          <type name="GSList" c:type="GSList*"/>
+        <parameter name="layout">
+          <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_paths_free" c:identifier="gtk_file_paths_free">
+    <class name="VolumeButton"
+           c:type="GtkVolumeButton"
+           parent="ScaleButton"
+           glib:type-name="GtkVolumeButton"
+           glib:get-type="gtk_volume_button_get_type">
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="volume_button_new" c:identifier="gtk_volume_button_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="VPaned"
+           c:type="GtkVPaned"
+           parent="Paned"
+           glib:type-name="GtkVPaned"
+           glib:get-type="gtk_vpaned_get_type">
+    </class>
+    <function name="vpaned_new" c:identifier="gtk_vpaned_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="VRuler"
+           c:type="GtkVRuler"
+           parent="Ruler"
+           glib:type-name="GtkVRuler"
+           glib:get-type="gtk_vruler_get_type">
+    </class>
+    <function name="vruler_new" c:identifier="gtk_vruler_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="VScale"
+           c:type="GtkVScale"
+           parent="Scale"
+           glib:type-name="GtkVScale"
+           glib:get-type="gtk_vscale_get_type">
+    </class>
+    <function name="vscale_new" c:identifier="gtk_vscale_new">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="paths">
-          <type name="GSList" c:type="GSList*"/>
+        <parameter name="adjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_system_create" c:identifier="gtk_file_system_create">
+    <function name="vscale_new_with_range"
+              c:identifier="gtk_vscale_new_with_range">
       <return-value>
-        <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="file_system_name">
-          <type name="char" c:type="char*"/>
+        <parameter name="min">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="max">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="step">
+          <type name="double" c:type="gdouble"/>
         </parameter>
       </parameters>
     </function>
+    <class name="VSeparator"
+           c:type="GtkVSeparator"
+           parent="Separator"
+           glib:type-name="GtkVSeparator"
+           glib:get-type="gtk_vseparator_get_type">
+    </class>
+    <function name="vseparator_new" c:identifier="gtk_vseparator_new">
+      <return-value>
+        <type name="GtkWidget*" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
     <record name="GtkIMContextInfo" c:type="GtkIMContextInfo">
       <field name="context_id">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="context_name">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="domain">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="domain_dirname">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
       <field name="default_locales">
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </field>
     </record>
     <function name="im_module_list" c:identifier="_gtk_im_module_list">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="contexts">
@@ -65953,14 +66685,14 @@
       </return-value>
       <parameters>
         <parameter name="context_id">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="im_module_get_default_context_id"
               c:identifier="_gtk_im_module_get_default_context_id">
       <return-value>
-        <type name="gchar*" c:type="gchar*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
         <parameter name="client_window">
@@ -65970,17 +66702,17 @@
     </function>
     <function name="fnmatch" c:identifier="_gtk_fnmatch">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="string">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="no_leading_period">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
@@ -66000,34 +66732,34 @@
         <type name="GtkTextDirection" c:type="GtkTextDirection"/>
       </field>
       <field name="width">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="total_width">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="height">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="x_offset">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="left_margin">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="right_margin">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="top_margin">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="bottom_margin">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="insert_index">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="size_only">
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </field>
       <field name="line">
         <type name="GtkTextLine*" c:type="GtkTextLine*"/>
@@ -66050,13 +66782,13 @@
     </record>
     <record name="GtkTextCursorDisplay" c:type="GtkTextCursorDisplay">
       <field name="x">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="y">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="height">
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </field>
       <field name="is_strong">
         <type name="guint" c:type="guint"/>
@@ -66085,13 +66817,13 @@
       </constructor>
       <method name="set_buffer" c:identifier="gtk_text_layout_set_buffer">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
-          <parameter name="buffer">
+          <parameter name="buffer" allow-none="1">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
@@ -66109,7 +66841,7 @@
       <method name="set_default_style"
               c:identifier="gtk_text_layout_set_default_style">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66122,7 +66854,7 @@
       </method>
       <method name="set_contexts" c:identifier="gtk_text_layout_set_contexts">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66139,7 +66871,7 @@
       <method name="set_cursor_direction"
               c:identifier="gtk_text_layout_set_cursor_direction">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66153,21 +66885,21 @@
       <method name="set_overwrite_mode"
               c:identifier="gtk_text_layout_set_overwrite_mode">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="overwrite">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_keyboard_direction"
               c:identifier="gtk_text_layout_set_keyboard_direction">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66181,7 +66913,7 @@
       <method name="default_style_changed"
               c:identifier="gtk_text_layout_default_style_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66192,55 +66924,55 @@
       <method name="set_screen_width"
               c:identifier="gtk_text_layout_set_screen_width">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_preedit_string"
               c:identifier="gtk_text_layout_set_preedit_string">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="preedit_string">
-            <type name="gchar" c:type="gchar*"/>
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="preedit_attrs">
             <type name="PangoAttrList" c:type="PangoAttrList*"/>
           </parameter>
           <parameter name="cursor_pos">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_cursor_visible"
               c:identifier="gtk_text_layout_set_cursor_visible">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="cursor_visible">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_cursor_visible"
               c:identifier="gtk_text_layout_get_cursor_visible">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66250,7 +66982,7 @@
       </method>
       <method name="get_size" c:identifier="gtk_text_layout_get_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66273,10 +67005,10 @@
             <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="top_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="bottom_y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="first_line_y">
             <type name="gint" c:type="gint*"/>
@@ -66286,7 +67018,7 @@
       <method name="wrap_loop_start"
               c:identifier="gtk_text_layout_wrap_loop_start">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66294,9 +67026,10 @@
           </parameter>
         </parameters>
       </method>
-      <method name="wrap_loop_end" c:identifier="gtk_text_layout_wrap_loop_end">
+      <method name="wrap_loop_end"
+              c:identifier="gtk_text_layout_wrap_loop_end">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66317,14 +67050,14 @@
             <type name="GtkTextLine" c:type="GtkTextLine*"/>
           </parameter>
           <parameter name="size_only">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="free_line_display"
               c:identifier="gtk_text_layout_free_line_display">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66335,9 +67068,10 @@
           </parameter>
         </parameters>
       </method>
-      <method name="get_line_at_y" c:identifier="gtk_text_layout_get_line_at_y">
+      <method name="get_line_at_y"
+              c:identifier="gtk_text_layout_get_line_at_y">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66347,7 +67081,7 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="line_top">
             <type name="gint" c:type="gint*"/>
@@ -66357,7 +67091,7 @@
       <method name="get_iter_at_pixel"
               c:identifier="gtk_text_layout_get_iter_at_pixel">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66367,17 +67101,17 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_iter_at_position"
               c:identifier="gtk_text_layout_get_iter_at_position">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66390,16 +67124,16 @@
             <type name="gint" c:type="gint*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="invalidate" c:identifier="gtk_text_layout_invalidate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66416,7 +67150,7 @@
       <method name="invalidate_cursors"
               c:identifier="gtk_text_layout_invalidate_cursors">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66433,7 +67167,7 @@
       <method name="free_line_data"
               c:identifier="gtk_text_layout_free_line_data">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66449,7 +67183,7 @@
       </method>
       <method name="is_valid" c:identifier="gtk_text_layout_is_valid">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66460,7 +67194,7 @@
       <method name="validate_yrange"
               c:identifier="gtk_text_layout_validate_yrange">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66470,23 +67204,23 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="y0_">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y1_">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="validate" c:identifier="gtk_text_layout_validate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="max_pixels">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -66508,47 +67242,47 @@
       </method>
       <method name="changed" c:identifier="gtk_text_layout_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="old_height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="new_height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="cursors_changed"
               c:identifier="gtk_text_layout_cursors_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="old_height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="new_height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_iter_location"
               c:identifier="gtk_text_layout_get_iter_location">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66565,7 +67299,7 @@
       <method name="get_line_yrange"
               c:identifier="gtk_text_layout_get_line_yrange">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66585,7 +67319,7 @@
       <method name="get_cursor_locations"
               c:identifier="gtk_text_layout_get_cursor_locations">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66605,7 +67339,7 @@
       <method name="clamp_iter_to_vrange"
               c:identifier="gtk_text_layout_clamp_iter_to_vrange">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66615,17 +67349,17 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="top">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="bottom">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="move_iter_to_line_end"
               c:identifier="gtk_text_layout_move_iter_to_line_end">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66635,14 +67369,14 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="direction">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="move_iter_to_previous_line"
               c:identifier="gtk_text_layout_move_iter_to_previous_line">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66656,7 +67390,7 @@
       <method name="move_iter_to_next_line"
               c:identifier="gtk_text_layout_move_iter_to_next_line">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66670,7 +67404,7 @@
       <method name="move_iter_to_x"
               c:identifier="gtk_text_layout_move_iter_to_x">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66680,14 +67414,14 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="move_iter_visually"
               c:identifier="gtk_text_layout_move_iter_visually">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66697,14 +67431,14 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="count">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="iter_starts_line"
               c:identifier="gtk_text_layout_iter_starts_line">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66718,7 +67452,7 @@
       <method name="get_iter_at_line"
               c:identifier="gtk_text_layout_get_iter_at_line">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66731,13 +67465,13 @@
             <type name="GtkTextLine" c:type="GtkTextLine*"/>
           </parameter>
           <parameter name="byte_offset">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="spew" c:identifier="gtk_text_layout_spew">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66747,7 +67481,7 @@
       </method>
       <method name="draw" c:identifier="gtk_text_layout_draw">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66763,22 +67497,22 @@
             <type name="Gdk.GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="x_offset">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y_offset">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="widgets">
             <type name="GList" c:type="GList**"/>
@@ -66787,7 +67521,7 @@
       </method>
       <callback name="invalidated">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66797,20 +67531,20 @@
       </callback>
       <callback name="changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="GtkTextLayout*" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="old_height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="new_height">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
@@ -66832,7 +67566,7 @@
       </callback>
       <callback name="get_log_attrs">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66851,7 +67585,7 @@
       </callback>
       <callback name="invalidate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66867,7 +67601,7 @@
       </callback>
       <callback name="free_line_data">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66883,7 +67617,7 @@
       </callback>
       <callback name="allocate_child">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66893,16 +67627,16 @@
             <type name="GtkWidget*" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="invalidate_cursors">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -66918,53 +67652,53 @@
       </callback>
       <callback name="_gtk_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_gtk_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <glib:signal name="changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="p0">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="p1">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
       <glib:signal name="invalidated">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
       <glib:signal name="allocate-child">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
             <type name="GtkObject" c:type="GtkObject"/>
           </parameter>
           <parameter name="p0">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="p1">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -66972,7 +67706,7 @@
     <function name="text_layout_get_line_xrange"
               c:identifier="_gtk_text_layout_get_line_xrange">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="layout">
@@ -66992,7 +67726,7 @@
     <function name="text_layout_get_block_cursor"
               c:identifier="_gtk_text_layout_get_block_cursor">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="layout">
@@ -67006,7 +67740,7 @@
     <function name="text_anchored_child_set_layout"
               c:identifier="gtk_text_anchored_child_set_layout">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="child">
diff --git a/gir-repository/gir/pango-1.0.gir b/gir-repository/gir/pango-1.0.gir
index 52bcff8..7a07237 100644
--- a/gir-repository/gir/pango-1.0.gir
+++ b/gir-repository/gir/pango-1.0.gir
@@ -9,21 +9,21 @@
                  glib:type-name="PangoCoverageLevel"
                  glib:get-type="pango_coverage_level_get_type">
       <member name="none"
-                value="0"
-                c:identifier="PANGO_COVERAGE_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="PANGO_COVERAGE_NONE"
+              glib:nick="none"/>
       <member name="fallback"
-                value="1"
-                c:identifier="PANGO_COVERAGE_FALLBACK"
-                glib:nick="fallback"/>
+              value="1"
+              c:identifier="PANGO_COVERAGE_FALLBACK"
+              glib:nick="fallback"/>
       <member name="approximate"
-                value="2"
-                c:identifier="PANGO_COVERAGE_APPROXIMATE"
-                glib:nick="approximate"/>
+              value="2"
+              c:identifier="PANGO_COVERAGE_APPROXIMATE"
+              glib:nick="approximate"/>
       <member name="exact"
-                value="3"
-                c:identifier="PANGO_COVERAGE_EXACT"
-                glib:nick="exact"/>
+              value="3"
+              c:identifier="PANGO_COVERAGE_EXACT"
+              glib:nick="exact"/>
     </enumeration>
     <function name="coverage_new" c:identifier="pango_coverage_new">
       <return-value>
@@ -42,7 +42,7 @@
     </function>
     <function name="coverage_unref" c:identifier="pango_coverage_unref">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="coverage">
@@ -69,20 +69,20 @@
           <type name="PangoCoverage" c:type="PangoCoverage*"/>
         </parameter>
         <parameter name="index_">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="coverage_set" c:identifier="pango_coverage_set">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="coverage">
           <type name="PangoCoverage" c:type="PangoCoverage*"/>
         </parameter>
         <parameter name="index_">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="level">
           <type name="PangoCoverageLevel" c:type="PangoCoverageLevel"/>
@@ -91,7 +91,7 @@
     </function>
     <function name="coverage_max" c:identifier="pango_coverage_max">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="coverage">
@@ -104,7 +104,7 @@
     </function>
     <function name="coverage_to_bytes" c:identifier="pango_coverage_to_bytes">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="coverage">
@@ -128,7 +128,7 @@
           <type name="guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="n_bytes">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -177,21 +177,21 @@
     <record name="PangoEngineShape" c:type="PangoEngineShape"/>
     <record name="PangoRectangle" c:type="PangoRectangle">
       <field name="x">
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </field>
       <field name="y">
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </field>
       <field name="width">
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </field>
       <field name="height">
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </field>
     </record>
     <function name="units_from_double" c:identifier="pango_units_from_double">
       <return-value>
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="d">
@@ -205,13 +205,13 @@
       </return-value>
       <parameters>
         <parameter name="i">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="extents_to_pixels" c:identifier="pango_extents_to_pixels">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="inclusive">
@@ -227,42 +227,42 @@
                  glib:type-name="PangoGravity"
                  glib:get-type="pango_gravity_get_type">
       <member name="south"
-                value="0"
-                c:identifier="PANGO_GRAVITY_SOUTH"
-                glib:nick="south"/>
+              value="0"
+              c:identifier="PANGO_GRAVITY_SOUTH"
+              glib:nick="south"/>
       <member name="east"
-                value="1"
-                c:identifier="PANGO_GRAVITY_EAST"
-                glib:nick="east"/>
+              value="1"
+              c:identifier="PANGO_GRAVITY_EAST"
+              glib:nick="east"/>
       <member name="north"
-                value="2"
-                c:identifier="PANGO_GRAVITY_NORTH"
-                glib:nick="north"/>
+              value="2"
+              c:identifier="PANGO_GRAVITY_NORTH"
+              glib:nick="north"/>
       <member name="west"
-                value="3"
-                c:identifier="PANGO_GRAVITY_WEST"
-                glib:nick="west"/>
+              value="3"
+              c:identifier="PANGO_GRAVITY_WEST"
+              glib:nick="west"/>
       <member name="auto"
-                value="4"
-                c:identifier="PANGO_GRAVITY_AUTO"
-                glib:nick="auto"/>
+              value="4"
+              c:identifier="PANGO_GRAVITY_AUTO"
+              glib:nick="auto"/>
     </enumeration>
     <enumeration name="GravityHint"
                  c:type="PangoGravityHint"
                  glib:type-name="PangoGravityHint"
                  glib:get-type="pango_gravity_hint_get_type">
       <member name="natural"
-                value="0"
-                c:identifier="PANGO_GRAVITY_HINT_NATURAL"
-                glib:nick="natural"/>
+              value="0"
+              c:identifier="PANGO_GRAVITY_HINT_NATURAL"
+              glib:nick="natural"/>
       <member name="strong"
-                value="1"
-                c:identifier="PANGO_GRAVITY_HINT_STRONG"
-                glib:nick="strong"/>
+              value="1"
+              c:identifier="PANGO_GRAVITY_HINT_STRONG"
+              glib:nick="strong"/>
       <member name="line"
-                value="2"
-                c:identifier="PANGO_GRAVITY_HINT_LINE"
-                glib:nick="line"/>
+              value="2"
+              c:identifier="PANGO_GRAVITY_HINT_LINE"
+              glib:nick="line"/>
     </enumeration>
     <glib:boxed c:type="Matrix"
                 glib:name="Matrix"
@@ -280,7 +280,7 @@
       </constructor>
       <method name="free" c:identifier="pango_matrix_free">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="matrix">
@@ -290,7 +290,7 @@
       </method>
       <method name="translate" c:identifier="pango_matrix_translate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="matrix">
@@ -306,7 +306,7 @@
       </method>
       <method name="scale" c:identifier="pango_matrix_scale">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="matrix">
@@ -322,7 +322,7 @@
       </method>
       <method name="rotate" c:identifier="pango_matrix_rotate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="matrix">
@@ -335,7 +335,7 @@
       </method>
       <method name="concat" c:identifier="pango_matrix_concat">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="matrix">
@@ -349,7 +349,7 @@
       <method name="transform_point"
               c:identifier="pango_matrix_transform_point">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="matrix">
@@ -366,7 +366,7 @@
       <method name="transform_distance"
               c:identifier="pango_matrix_transform_distance">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="matrix">
@@ -383,7 +383,7 @@
       <method name="transform_rectangle"
               c:identifier="pango_matrix_transform_rectangle">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="matrix">
@@ -397,7 +397,7 @@
       <method name="transform_pixel_rectangle"
               c:identifier="pango_matrix_transform_pixel_rectangle">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="matrix">
@@ -424,17 +424,19 @@
                 glib:name="Language"
                 glib:type-name="PangoLanguage"
                 glib:get-type="pango_language_get_type">
-      <constructor name="from_string" c:identifier="pango_language_from_string">
+      <constructor name="from_string"
+                   c:identifier="pango_language_from_string">
         <return-value>
           <type name="Language" c:type="PangoLanguage*"/>
         </return-value>
         <parameters>
           <parameter name="language">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </constructor>
-      <constructor name="get_default" c:identifier="pango_language_get_default">
+      <constructor name="get_default"
+                   c:identifier="pango_language_get_default">
         <return-value>
           <type name="Language" c:type="PangoLanguage*"/>
         </return-value>
@@ -442,7 +444,7 @@
       <method name="get_sample_string"
               c:identifier="pango_language_get_sample_string">
         <return-value>
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="language">
@@ -452,21 +454,21 @@
       </method>
       <method name="matches" c:identifier="pango_language_matches">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="language">
             <type name="Language" c:type="PangoLanguage*"/>
           </parameter>
           <parameter name="range_list">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </method>
       <method name="includes_script"
               c:identifier="pango_language_includes_script">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="language">
@@ -484,323 +486,324 @@
                  glib:type-name="PangoScript"
                  glib:get-type="pango_script_get_type">
       <member name="invalid-code"
-                value="-1"
-                c:identifier="PANGO_SCRIPT_INVALID_CODE"
-                glib:nick="invalid-code"/>
+              value="-1"
+              c:identifier="PANGO_SCRIPT_INVALID_CODE"
+              glib:nick="invalid-code"/>
       <member name="common"
-                value="0"
-                c:identifier="PANGO_SCRIPT_COMMON"
-                glib:nick="common"/>
+              value="0"
+              c:identifier="PANGO_SCRIPT_COMMON"
+              glib:nick="common"/>
       <member name="inherited"
-                value="1"
-                c:identifier="PANGO_SCRIPT_INHERITED"
-                glib:nick="inherited"/>
+              value="1"
+              c:identifier="PANGO_SCRIPT_INHERITED"
+              glib:nick="inherited"/>
       <member name="arabic"
-                value="2"
-                c:identifier="PANGO_SCRIPT_ARABIC"
-                glib:nick="arabic"/>
+              value="2"
+              c:identifier="PANGO_SCRIPT_ARABIC"
+              glib:nick="arabic"/>
       <member name="armenian"
-                value="3"
-                c:identifier="PANGO_SCRIPT_ARMENIAN"
-                glib:nick="armenian"/>
+              value="3"
+              c:identifier="PANGO_SCRIPT_ARMENIAN"
+              glib:nick="armenian"/>
       <member name="bengali"
-                value="4"
-                c:identifier="PANGO_SCRIPT_BENGALI"
-                glib:nick="bengali"/>
+              value="4"
+              c:identifier="PANGO_SCRIPT_BENGALI"
+              glib:nick="bengali"/>
       <member name="bopomofo"
-                value="5"
-                c:identifier="PANGO_SCRIPT_BOPOMOFO"
-                glib:nick="bopomofo"/>
+              value="5"
+              c:identifier="PANGO_SCRIPT_BOPOMOFO"
+              glib:nick="bopomofo"/>
       <member name="cherokee"
-                value="6"
-                c:identifier="PANGO_SCRIPT_CHEROKEE"
-                glib:nick="cherokee"/>
+              value="6"
+              c:identifier="PANGO_SCRIPT_CHEROKEE"
+              glib:nick="cherokee"/>
       <member name="coptic"
-                value="7"
-                c:identifier="PANGO_SCRIPT_COPTIC"
-                glib:nick="coptic"/>
+              value="7"
+              c:identifier="PANGO_SCRIPT_COPTIC"
+              glib:nick="coptic"/>
       <member name="cyrillic"
-                value="8"
-                c:identifier="PANGO_SCRIPT_CYRILLIC"
-                glib:nick="cyrillic"/>
+              value="8"
+              c:identifier="PANGO_SCRIPT_CYRILLIC"
+              glib:nick="cyrillic"/>
       <member name="deseret"
-                value="9"
-                c:identifier="PANGO_SCRIPT_DESERET"
-                glib:nick="deseret"/>
+              value="9"
+              c:identifier="PANGO_SCRIPT_DESERET"
+              glib:nick="deseret"/>
       <member name="devanagari"
-                value="10"
-                c:identifier="PANGO_SCRIPT_DEVANAGARI"
-                glib:nick="devanagari"/>
+              value="10"
+              c:identifier="PANGO_SCRIPT_DEVANAGARI"
+              glib:nick="devanagari"/>
       <member name="ethiopic"
-                value="11"
-                c:identifier="PANGO_SCRIPT_ETHIOPIC"
-                glib:nick="ethiopic"/>
+              value="11"
+              c:identifier="PANGO_SCRIPT_ETHIOPIC"
+              glib:nick="ethiopic"/>
       <member name="georgian"
-                value="12"
-                c:identifier="PANGO_SCRIPT_GEORGIAN"
-                glib:nick="georgian"/>
+              value="12"
+              c:identifier="PANGO_SCRIPT_GEORGIAN"
+              glib:nick="georgian"/>
       <member name="gothic"
-                value="13"
-                c:identifier="PANGO_SCRIPT_GOTHIC"
-                glib:nick="gothic"/>
+              value="13"
+              c:identifier="PANGO_SCRIPT_GOTHIC"
+              glib:nick="gothic"/>
       <member name="greek"
-                value="14"
-                c:identifier="PANGO_SCRIPT_GREEK"
-                glib:nick="greek"/>
+              value="14"
+              c:identifier="PANGO_SCRIPT_GREEK"
+              glib:nick="greek"/>
       <member name="gujarati"
-                value="15"
-                c:identifier="PANGO_SCRIPT_GUJARATI"
-                glib:nick="gujarati"/>
+              value="15"
+              c:identifier="PANGO_SCRIPT_GUJARATI"
+              glib:nick="gujarati"/>
       <member name="gurmukhi"
-                value="16"
-                c:identifier="PANGO_SCRIPT_GURMUKHI"
-                glib:nick="gurmukhi"/>
+              value="16"
+              c:identifier="PANGO_SCRIPT_GURMUKHI"
+              glib:nick="gurmukhi"/>
       <member name="han"
-                value="17"
-                c:identifier="PANGO_SCRIPT_HAN"
-                glib:nick="han"/>
+              value="17"
+              c:identifier="PANGO_SCRIPT_HAN"
+              glib:nick="han"/>
       <member name="hangul"
-                value="18"
-                c:identifier="PANGO_SCRIPT_HANGUL"
-                glib:nick="hangul"/>
+              value="18"
+              c:identifier="PANGO_SCRIPT_HANGUL"
+              glib:nick="hangul"/>
       <member name="hebrew"
-                value="19"
-                c:identifier="PANGO_SCRIPT_HEBREW"
-                glib:nick="hebrew"/>
+              value="19"
+              c:identifier="PANGO_SCRIPT_HEBREW"
+              glib:nick="hebrew"/>
       <member name="hiragana"
-                value="20"
-                c:identifier="PANGO_SCRIPT_HIRAGANA"
-                glib:nick="hiragana"/>
+              value="20"
+              c:identifier="PANGO_SCRIPT_HIRAGANA"
+              glib:nick="hiragana"/>
       <member name="kannada"
-                value="21"
-                c:identifier="PANGO_SCRIPT_KANNADA"
-                glib:nick="kannada"/>
+              value="21"
+              c:identifier="PANGO_SCRIPT_KANNADA"
+              glib:nick="kannada"/>
       <member name="katakana"
-                value="22"
-                c:identifier="PANGO_SCRIPT_KATAKANA"
-                glib:nick="katakana"/>
+              value="22"
+              c:identifier="PANGO_SCRIPT_KATAKANA"
+              glib:nick="katakana"/>
       <member name="khmer"
-                value="23"
-                c:identifier="PANGO_SCRIPT_KHMER"
-                glib:nick="khmer"/>
+              value="23"
+              c:identifier="PANGO_SCRIPT_KHMER"
+              glib:nick="khmer"/>
       <member name="lao"
-                value="24"
-                c:identifier="PANGO_SCRIPT_LAO"
-                glib:nick="lao"/>
+              value="24"
+              c:identifier="PANGO_SCRIPT_LAO"
+              glib:nick="lao"/>
       <member name="latin"
-                value="25"
-                c:identifier="PANGO_SCRIPT_LATIN"
-                glib:nick="latin"/>
+              value="25"
+              c:identifier="PANGO_SCRIPT_LATIN"
+              glib:nick="latin"/>
       <member name="malayalam"
-                value="26"
-                c:identifier="PANGO_SCRIPT_MALAYALAM"
-                glib:nick="malayalam"/>
+              value="26"
+              c:identifier="PANGO_SCRIPT_MALAYALAM"
+              glib:nick="malayalam"/>
       <member name="mongolian"
-                value="27"
-                c:identifier="PANGO_SCRIPT_MONGOLIAN"
-                glib:nick="mongolian"/>
+              value="27"
+              c:identifier="PANGO_SCRIPT_MONGOLIAN"
+              glib:nick="mongolian"/>
       <member name="myanmar"
-                value="28"
-                c:identifier="PANGO_SCRIPT_MYANMAR"
-                glib:nick="myanmar"/>
+              value="28"
+              c:identifier="PANGO_SCRIPT_MYANMAR"
+              glib:nick="myanmar"/>
       <member name="ogham"
-                value="29"
-                c:identifier="PANGO_SCRIPT_OGHAM"
-                glib:nick="ogham"/>
+              value="29"
+              c:identifier="PANGO_SCRIPT_OGHAM"
+              glib:nick="ogham"/>
       <member name="old-italic"
-                value="30"
-                c:identifier="PANGO_SCRIPT_OLD_ITALIC"
-                glib:nick="old-italic"/>
+              value="30"
+              c:identifier="PANGO_SCRIPT_OLD_ITALIC"
+              glib:nick="old-italic"/>
       <member name="oriya"
-                value="31"
-                c:identifier="PANGO_SCRIPT_ORIYA"
-                glib:nick="oriya"/>
+              value="31"
+              c:identifier="PANGO_SCRIPT_ORIYA"
+              glib:nick="oriya"/>
       <member name="runic"
-                value="32"
-                c:identifier="PANGO_SCRIPT_RUNIC"
-                glib:nick="runic"/>
+              value="32"
+              c:identifier="PANGO_SCRIPT_RUNIC"
+              glib:nick="runic"/>
       <member name="sinhala"
-                value="33"
-                c:identifier="PANGO_SCRIPT_SINHALA"
-                glib:nick="sinhala"/>
+              value="33"
+              c:identifier="PANGO_SCRIPT_SINHALA"
+              glib:nick="sinhala"/>
       <member name="syriac"
-                value="34"
-                c:identifier="PANGO_SCRIPT_SYRIAC"
-                glib:nick="syriac"/>
+              value="34"
+              c:identifier="PANGO_SCRIPT_SYRIAC"
+              glib:nick="syriac"/>
       <member name="tamil"
-                value="35"
-                c:identifier="PANGO_SCRIPT_TAMIL"
-                glib:nick="tamil"/>
+              value="35"
+              c:identifier="PANGO_SCRIPT_TAMIL"
+              glib:nick="tamil"/>
       <member name="telugu"
-                value="36"
-                c:identifier="PANGO_SCRIPT_TELUGU"
-                glib:nick="telugu"/>
+              value="36"
+              c:identifier="PANGO_SCRIPT_TELUGU"
+              glib:nick="telugu"/>
       <member name="thaana"
-                value="37"
-                c:identifier="PANGO_SCRIPT_THAANA"
-                glib:nick="thaana"/>
+              value="37"
+              c:identifier="PANGO_SCRIPT_THAANA"
+              glib:nick="thaana"/>
       <member name="thai"
-                value="38"
-                c:identifier="PANGO_SCRIPT_THAI"
-                glib:nick="thai"/>
+              value="38"
+              c:identifier="PANGO_SCRIPT_THAI"
+              glib:nick="thai"/>
       <member name="tibetan"
-                value="39"
-                c:identifier="PANGO_SCRIPT_TIBETAN"
-                glib:nick="tibetan"/>
+              value="39"
+              c:identifier="PANGO_SCRIPT_TIBETAN"
+              glib:nick="tibetan"/>
       <member name="canadian-aboriginal"
-                value="40"
-                c:identifier="PANGO_SCRIPT_CANADIAN_ABORIGINAL"
-                glib:nick="canadian-aboriginal"/>
+              value="40"
+              c:identifier="PANGO_SCRIPT_CANADIAN_ABORIGINAL"
+              glib:nick="canadian-aboriginal"/>
       <member name="yi"
-                value="41"
-                c:identifier="PANGO_SCRIPT_YI"
-                glib:nick="yi"/>
+              value="41"
+              c:identifier="PANGO_SCRIPT_YI"
+              glib:nick="yi"/>
       <member name="tagalog"
-                value="42"
-                c:identifier="PANGO_SCRIPT_TAGALOG"
-                glib:nick="tagalog"/>
+              value="42"
+              c:identifier="PANGO_SCRIPT_TAGALOG"
+              glib:nick="tagalog"/>
       <member name="hanunoo"
-                value="43"
-                c:identifier="PANGO_SCRIPT_HANUNOO"
-                glib:nick="hanunoo"/>
+              value="43"
+              c:identifier="PANGO_SCRIPT_HANUNOO"
+              glib:nick="hanunoo"/>
       <member name="buhid"
-                value="44"
-                c:identifier="PANGO_SCRIPT_BUHID"
-                glib:nick="buhid"/>
+              value="44"
+              c:identifier="PANGO_SCRIPT_BUHID"
+              glib:nick="buhid"/>
       <member name="tagbanwa"
-                value="45"
-                c:identifier="PANGO_SCRIPT_TAGBANWA"
-                glib:nick="tagbanwa"/>
+              value="45"
+              c:identifier="PANGO_SCRIPT_TAGBANWA"
+              glib:nick="tagbanwa"/>
       <member name="braille"
-                value="46"
-                c:identifier="PANGO_SCRIPT_BRAILLE"
-                glib:nick="braille"/>
+              value="46"
+              c:identifier="PANGO_SCRIPT_BRAILLE"
+              glib:nick="braille"/>
       <member name="cypriot"
-                value="47"
-                c:identifier="PANGO_SCRIPT_CYPRIOT"
-                glib:nick="cypriot"/>
+              value="47"
+              c:identifier="PANGO_SCRIPT_CYPRIOT"
+              glib:nick="cypriot"/>
       <member name="limbu"
-                value="48"
-                c:identifier="PANGO_SCRIPT_LIMBU"
-                glib:nick="limbu"/>
+              value="48"
+              c:identifier="PANGO_SCRIPT_LIMBU"
+              glib:nick="limbu"/>
       <member name="osmanya"
-                value="49"
-                c:identifier="PANGO_SCRIPT_OSMANYA"
-                glib:nick="osmanya"/>
+              value="49"
+              c:identifier="PANGO_SCRIPT_OSMANYA"
+              glib:nick="osmanya"/>
       <member name="shavian"
-                value="50"
-                c:identifier="PANGO_SCRIPT_SHAVIAN"
-                glib:nick="shavian"/>
+              value="50"
+              c:identifier="PANGO_SCRIPT_SHAVIAN"
+              glib:nick="shavian"/>
       <member name="linear-b"
-                value="51"
-                c:identifier="PANGO_SCRIPT_LINEAR_B"
-                glib:nick="linear-b"/>
+              value="51"
+              c:identifier="PANGO_SCRIPT_LINEAR_B"
+              glib:nick="linear-b"/>
       <member name="tai-le"
-                value="52"
-                c:identifier="PANGO_SCRIPT_TAI_LE"
-                glib:nick="tai-le"/>
+              value="52"
+              c:identifier="PANGO_SCRIPT_TAI_LE"
+              glib:nick="tai-le"/>
       <member name="ugaritic"
-                value="53"
-                c:identifier="PANGO_SCRIPT_UGARITIC"
-                glib:nick="ugaritic"/>
+              value="53"
+              c:identifier="PANGO_SCRIPT_UGARITIC"
+              glib:nick="ugaritic"/>
       <member name="new-tai-lue"
-                value="54"
-                c:identifier="PANGO_SCRIPT_NEW_TAI_LUE"
-                glib:nick="new-tai-lue"/>
+              value="54"
+              c:identifier="PANGO_SCRIPT_NEW_TAI_LUE"
+              glib:nick="new-tai-lue"/>
       <member name="buginese"
-                value="55"
-                c:identifier="PANGO_SCRIPT_BUGINESE"
-                glib:nick="buginese"/>
+              value="55"
+              c:identifier="PANGO_SCRIPT_BUGINESE"
+              glib:nick="buginese"/>
       <member name="glagolitic"
-                value="56"
-                c:identifier="PANGO_SCRIPT_GLAGOLITIC"
-                glib:nick="glagolitic"/>
+              value="56"
+              c:identifier="PANGO_SCRIPT_GLAGOLITIC"
+              glib:nick="glagolitic"/>
       <member name="tifinagh"
-                value="57"
-                c:identifier="PANGO_SCRIPT_TIFINAGH"
-                glib:nick="tifinagh"/>
+              value="57"
+              c:identifier="PANGO_SCRIPT_TIFINAGH"
+              glib:nick="tifinagh"/>
       <member name="syloti-nagri"
-                value="58"
-                c:identifier="PANGO_SCRIPT_SYLOTI_NAGRI"
-                glib:nick="syloti-nagri"/>
+              value="58"
+              c:identifier="PANGO_SCRIPT_SYLOTI_NAGRI"
+              glib:nick="syloti-nagri"/>
       <member name="old-persian"
-                value="59"
-                c:identifier="PANGO_SCRIPT_OLD_PERSIAN"
-                glib:nick="old-persian"/>
+              value="59"
+              c:identifier="PANGO_SCRIPT_OLD_PERSIAN"
+              glib:nick="old-persian"/>
       <member name="kharoshthi"
-                value="60"
-                c:identifier="PANGO_SCRIPT_KHAROSHTHI"
-                glib:nick="kharoshthi"/>
+              value="60"
+              c:identifier="PANGO_SCRIPT_KHAROSHTHI"
+              glib:nick="kharoshthi"/>
       <member name="unknown"
-                value="61"
-                c:identifier="PANGO_SCRIPT_UNKNOWN"
-                glib:nick="unknown"/>
+              value="61"
+              c:identifier="PANGO_SCRIPT_UNKNOWN"
+              glib:nick="unknown"/>
       <member name="balinese"
-                value="62"
-                c:identifier="PANGO_SCRIPT_BALINESE"
-                glib:nick="balinese"/>
+              value="62"
+              c:identifier="PANGO_SCRIPT_BALINESE"
+              glib:nick="balinese"/>
       <member name="cuneiform"
-                value="63"
-                c:identifier="PANGO_SCRIPT_CUNEIFORM"
-                glib:nick="cuneiform"/>
+              value="63"
+              c:identifier="PANGO_SCRIPT_CUNEIFORM"
+              glib:nick="cuneiform"/>
       <member name="phoenician"
-                value="64"
-                c:identifier="PANGO_SCRIPT_PHOENICIAN"
-                glib:nick="phoenician"/>
+              value="64"
+              c:identifier="PANGO_SCRIPT_PHOENICIAN"
+              glib:nick="phoenician"/>
       <member name="phags-pa"
-                value="65"
-                c:identifier="PANGO_SCRIPT_PHAGS_PA"
-                glib:nick="phags-pa"/>
+              value="65"
+              c:identifier="PANGO_SCRIPT_PHAGS_PA"
+              glib:nick="phags-pa"/>
       <member name="nko"
-                value="66"
-                c:identifier="PANGO_SCRIPT_NKO"
-                glib:nick="nko"/>
+              value="66"
+              c:identifier="PANGO_SCRIPT_NKO"
+              glib:nick="nko"/>
       <member name="kayah-li"
-                value="67"
-                c:identifier="PANGO_SCRIPT_KAYAH_LI"
-                glib:nick="kayah-li"/>
+              value="67"
+              c:identifier="PANGO_SCRIPT_KAYAH_LI"
+              glib:nick="kayah-li"/>
       <member name="lepcha"
-                value="68"
-                c:identifier="PANGO_SCRIPT_LEPCHA"
-                glib:nick="lepcha"/>
+              value="68"
+              c:identifier="PANGO_SCRIPT_LEPCHA"
+              glib:nick="lepcha"/>
       <member name="rejang"
-                value="69"
-                c:identifier="PANGO_SCRIPT_REJANG"
-                glib:nick="rejang"/>
+              value="69"
+              c:identifier="PANGO_SCRIPT_REJANG"
+              glib:nick="rejang"/>
       <member name="sundanese"
-                value="70"
-                c:identifier="PANGO_SCRIPT_SUNDANESE"
-                glib:nick="sundanese"/>
+              value="70"
+              c:identifier="PANGO_SCRIPT_SUNDANESE"
+              glib:nick="sundanese"/>
       <member name="saurashtra"
-                value="71"
-                c:identifier="PANGO_SCRIPT_SAURASHTRA"
-                glib:nick="saurashtra"/>
+              value="71"
+              c:identifier="PANGO_SCRIPT_SAURASHTRA"
+              glib:nick="saurashtra"/>
       <member name="cham"
-                value="72"
-                c:identifier="PANGO_SCRIPT_CHAM"
-                glib:nick="cham"/>
+              value="72"
+              c:identifier="PANGO_SCRIPT_CHAM"
+              glib:nick="cham"/>
       <member name="ol-chiki"
-                value="73"
-                c:identifier="PANGO_SCRIPT_OL_CHIKI"
-                glib:nick="ol-chiki"/>
+              value="73"
+              c:identifier="PANGO_SCRIPT_OL_CHIKI"
+              glib:nick="ol-chiki"/>
       <member name="vai"
-                value="74"
-                c:identifier="PANGO_SCRIPT_VAI"
-                glib:nick="vai"/>
+              value="74"
+              c:identifier="PANGO_SCRIPT_VAI"
+              glib:nick="vai"/>
       <member name="carian"
-                value="75"
-                c:identifier="PANGO_SCRIPT_CARIAN"
-                glib:nick="carian"/>
+              value="75"
+              c:identifier="PANGO_SCRIPT_CARIAN"
+              glib:nick="carian"/>
       <member name="lycian"
-                value="76"
-                c:identifier="PANGO_SCRIPT_LYCIAN"
-                glib:nick="lycian"/>
+              value="76"
+              c:identifier="PANGO_SCRIPT_LYCIAN"
+              glib:nick="lycian"/>
       <member name="lydian"
-                value="77"
-                c:identifier="PANGO_SCRIPT_LYDIAN"
-                glib:nick="lydian"/>
+              value="77"
+              c:identifier="PANGO_SCRIPT_LYDIAN"
+              glib:nick="lydian"/>
     </enumeration>
-    <function name="script_for_unichar" c:identifier="pango_script_for_unichar">
+    <function name="script_for_unichar"
+              c:identifier="pango_script_for_unichar">
       <return-value>
         <type name="PangoScript" c:type="PangoScript"/>
       </return-value>
@@ -816,17 +819,17 @@
       </return-value>
       <parameters>
         <parameter name="text">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="length">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="script_iter_get_range"
               c:identifier="pango_script_iter_get_range">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="iter">
@@ -845,7 +848,7 @@
     </function>
     <function name="script_iter_next" c:identifier="pango_script_iter_next">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="iter">
@@ -855,7 +858,7 @@
     </function>
     <function name="script_iter_free" c:identifier="pango_script_iter_free">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="iter">
@@ -918,81 +921,81 @@
                  glib:type-name="PangoBidiType"
                  glib:get-type="pango_bidi_type_get_type">
       <member name="l"
-                value="0"
-                c:identifier="PANGO_BIDI_TYPE_L"
-                glib:nick="l"/>
+              value="0"
+              c:identifier="PANGO_BIDI_TYPE_L"
+              glib:nick="l"/>
       <member name="lre"
-                value="1"
-                c:identifier="PANGO_BIDI_TYPE_LRE"
-                glib:nick="lre"/>
+              value="1"
+              c:identifier="PANGO_BIDI_TYPE_LRE"
+              glib:nick="lre"/>
       <member name="lro"
-                value="2"
-                c:identifier="PANGO_BIDI_TYPE_LRO"
-                glib:nick="lro"/>
+              value="2"
+              c:identifier="PANGO_BIDI_TYPE_LRO"
+              glib:nick="lro"/>
       <member name="r"
-                value="3"
-                c:identifier="PANGO_BIDI_TYPE_R"
-                glib:nick="r"/>
+              value="3"
+              c:identifier="PANGO_BIDI_TYPE_R"
+              glib:nick="r"/>
       <member name="al"
-                value="4"
-                c:identifier="PANGO_BIDI_TYPE_AL"
-                glib:nick="al"/>
+              value="4"
+              c:identifier="PANGO_BIDI_TYPE_AL"
+              glib:nick="al"/>
       <member name="rle"
-                value="5"
-                c:identifier="PANGO_BIDI_TYPE_RLE"
-                glib:nick="rle"/>
+              value="5"
+              c:identifier="PANGO_BIDI_TYPE_RLE"
+              glib:nick="rle"/>
       <member name="rlo"
-                value="6"
-                c:identifier="PANGO_BIDI_TYPE_RLO"
-                glib:nick="rlo"/>
+              value="6"
+              c:identifier="PANGO_BIDI_TYPE_RLO"
+              glib:nick="rlo"/>
       <member name="pdf"
-                value="7"
-                c:identifier="PANGO_BIDI_TYPE_PDF"
-                glib:nick="pdf"/>
+              value="7"
+              c:identifier="PANGO_BIDI_TYPE_PDF"
+              glib:nick="pdf"/>
       <member name="en"
-                value="8"
-                c:identifier="PANGO_BIDI_TYPE_EN"
-                glib:nick="en"/>
+              value="8"
+              c:identifier="PANGO_BIDI_TYPE_EN"
+              glib:nick="en"/>
       <member name="es"
-                value="9"
-                c:identifier="PANGO_BIDI_TYPE_ES"
-                glib:nick="es"/>
+              value="9"
+              c:identifier="PANGO_BIDI_TYPE_ES"
+              glib:nick="es"/>
       <member name="et"
-                value="10"
-                c:identifier="PANGO_BIDI_TYPE_ET"
-                glib:nick="et"/>
+              value="10"
+              c:identifier="PANGO_BIDI_TYPE_ET"
+              glib:nick="et"/>
       <member name="an"
-                value="11"
-                c:identifier="PANGO_BIDI_TYPE_AN"
-                glib:nick="an"/>
+              value="11"
+              c:identifier="PANGO_BIDI_TYPE_AN"
+              glib:nick="an"/>
       <member name="cs"
-                value="12"
-                c:identifier="PANGO_BIDI_TYPE_CS"
-                glib:nick="cs"/>
+              value="12"
+              c:identifier="PANGO_BIDI_TYPE_CS"
+              glib:nick="cs"/>
       <member name="nsm"
-                value="13"
-                c:identifier="PANGO_BIDI_TYPE_NSM"
-                glib:nick="nsm"/>
+              value="13"
+              c:identifier="PANGO_BIDI_TYPE_NSM"
+              glib:nick="nsm"/>
       <member name="bn"
-                value="14"
-                c:identifier="PANGO_BIDI_TYPE_BN"
-                glib:nick="bn"/>
+              value="14"
+              c:identifier="PANGO_BIDI_TYPE_BN"
+              glib:nick="bn"/>
       <member name="b"
-                value="15"
-                c:identifier="PANGO_BIDI_TYPE_B"
-                glib:nick="b"/>
+              value="15"
+              c:identifier="PANGO_BIDI_TYPE_B"
+              glib:nick="b"/>
       <member name="s"
-                value="16"
-                c:identifier="PANGO_BIDI_TYPE_S"
-                glib:nick="s"/>
+              value="16"
+              c:identifier="PANGO_BIDI_TYPE_S"
+              glib:nick="s"/>
       <member name="ws"
-                value="17"
-                c:identifier="PANGO_BIDI_TYPE_WS"
-                glib:nick="ws"/>
+              value="17"
+              c:identifier="PANGO_BIDI_TYPE_WS"
+              glib:nick="ws"/>
       <member name="on"
-                value="18"
-                c:identifier="PANGO_BIDI_TYPE_ON"
-                glib:nick="on"/>
+              value="18"
+              c:identifier="PANGO_BIDI_TYPE_ON"
+              glib:nick="on"/>
     </enumeration>
     <function name="bidi_type_for_unichar"
               c:identifier="pango_bidi_type_for_unichar">
@@ -1010,33 +1013,33 @@
                  glib:type-name="PangoDirection"
                  glib:get-type="pango_direction_get_type">
       <member name="ltr"
-                value="0"
-                c:identifier="PANGO_DIRECTION_LTR"
-                glib:nick="ltr"/>
+              value="0"
+              c:identifier="PANGO_DIRECTION_LTR"
+              glib:nick="ltr"/>
       <member name="rtl"
-                value="1"
-                c:identifier="PANGO_DIRECTION_RTL"
-                glib:nick="rtl"/>
+              value="1"
+              c:identifier="PANGO_DIRECTION_RTL"
+              glib:nick="rtl"/>
       <member name="ttb-ltr"
-                value="2"
-                c:identifier="PANGO_DIRECTION_TTB_LTR"
-                glib:nick="ttb-ltr"/>
+              value="2"
+              c:identifier="PANGO_DIRECTION_TTB_LTR"
+              glib:nick="ttb-ltr"/>
       <member name="ttb-rtl"
-                value="3"
-                c:identifier="PANGO_DIRECTION_TTB_RTL"
-                glib:nick="ttb-rtl"/>
+              value="3"
+              c:identifier="PANGO_DIRECTION_TTB_RTL"
+              glib:nick="ttb-rtl"/>
       <member name="weak-ltr"
-                value="4"
-                c:identifier="PANGO_DIRECTION_WEAK_LTR"
-                glib:nick="weak-ltr"/>
+              value="4"
+              c:identifier="PANGO_DIRECTION_WEAK_LTR"
+              glib:nick="weak-ltr"/>
       <member name="weak-rtl"
-                value="5"
-                c:identifier="PANGO_DIRECTION_WEAK_RTL"
-                glib:nick="weak-rtl"/>
+              value="5"
+              c:identifier="PANGO_DIRECTION_WEAK_RTL"
+              glib:nick="weak-rtl"/>
       <member name="neutral"
-                value="6"
-                c:identifier="PANGO_DIRECTION_NEUTRAL"
-                glib:nick="neutral"/>
+              value="6"
+              c:identifier="PANGO_DIRECTION_NEUTRAL"
+              glib:nick="neutral"/>
     </enumeration>
     <function name="unichar_direction" c:identifier="pango_unichar_direction">
       <return-value>
@@ -1054,16 +1057,16 @@
       </return-value>
       <parameters>
         <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="get_mirror_char" c:identifier="pango_get_mirror_char">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="ch">
@@ -1079,137 +1082,137 @@
                  glib:type-name="PangoStyle"
                  glib:get-type="pango_style_get_type">
       <member name="normal"
-                value="0"
-                c:identifier="PANGO_STYLE_NORMAL"
-                glib:nick="normal"/>
+              value="0"
+              c:identifier="PANGO_STYLE_NORMAL"
+              glib:nick="normal"/>
       <member name="oblique"
-                value="1"
-                c:identifier="PANGO_STYLE_OBLIQUE"
-                glib:nick="oblique"/>
+              value="1"
+              c:identifier="PANGO_STYLE_OBLIQUE"
+              glib:nick="oblique"/>
       <member name="italic"
-                value="2"
-                c:identifier="PANGO_STYLE_ITALIC"
-                glib:nick="italic"/>
+              value="2"
+              c:identifier="PANGO_STYLE_ITALIC"
+              glib:nick="italic"/>
     </enumeration>
     <enumeration name="Variant"
                  c:type="PangoVariant"
                  glib:type-name="PangoVariant"
                  glib:get-type="pango_variant_get_type">
       <member name="normal"
-                value="0"
-                c:identifier="PANGO_VARIANT_NORMAL"
-                glib:nick="normal"/>
+              value="0"
+              c:identifier="PANGO_VARIANT_NORMAL"
+              glib:nick="normal"/>
       <member name="small-caps"
-                value="1"
-                c:identifier="PANGO_VARIANT_SMALL_CAPS"
-                glib:nick="small-caps"/>
+              value="1"
+              c:identifier="PANGO_VARIANT_SMALL_CAPS"
+              glib:nick="small-caps"/>
     </enumeration>
     <enumeration name="Weight"
                  c:type="PangoWeight"
                  glib:type-name="PangoWeight"
                  glib:get-type="pango_weight_get_type">
       <member name="ultralight"
-                value="200"
-                c:identifier="PANGO_WEIGHT_ULTRALIGHT"
-                glib:nick="ultralight"/>
+              value="200"
+              c:identifier="PANGO_WEIGHT_ULTRALIGHT"
+              glib:nick="ultralight"/>
       <member name="light"
-                value="300"
-                c:identifier="PANGO_WEIGHT_LIGHT"
-                glib:nick="light"/>
+              value="300"
+              c:identifier="PANGO_WEIGHT_LIGHT"
+              glib:nick="light"/>
       <member name="normal"
-                value="400"
-                c:identifier="PANGO_WEIGHT_NORMAL"
-                glib:nick="normal"/>
+              value="400"
+              c:identifier="PANGO_WEIGHT_NORMAL"
+              glib:nick="normal"/>
       <member name="semibold"
-                value="600"
-                c:identifier="PANGO_WEIGHT_SEMIBOLD"
-                glib:nick="semibold"/>
+              value="600"
+              c:identifier="PANGO_WEIGHT_SEMIBOLD"
+              glib:nick="semibold"/>
       <member name="bold"
-                value="700"
-                c:identifier="PANGO_WEIGHT_BOLD"
-                glib:nick="bold"/>
+              value="700"
+              c:identifier="PANGO_WEIGHT_BOLD"
+              glib:nick="bold"/>
       <member name="ultrabold"
-                value="800"
-                c:identifier="PANGO_WEIGHT_ULTRABOLD"
-                glib:nick="ultrabold"/>
+              value="800"
+              c:identifier="PANGO_WEIGHT_ULTRABOLD"
+              glib:nick="ultrabold"/>
       <member name="heavy"
-                value="900"
-                c:identifier="PANGO_WEIGHT_HEAVY"
-                glib:nick="heavy"/>
+              value="900"
+              c:identifier="PANGO_WEIGHT_HEAVY"
+              glib:nick="heavy"/>
     </enumeration>
     <enumeration name="Stretch"
                  c:type="PangoStretch"
                  glib:type-name="PangoStretch"
                  glib:get-type="pango_stretch_get_type">
       <member name="ultra-condensed"
-                value="0"
-                c:identifier="PANGO_STRETCH_ULTRA_CONDENSED"
-                glib:nick="ultra-condensed"/>
+              value="0"
+              c:identifier="PANGO_STRETCH_ULTRA_CONDENSED"
+              glib:nick="ultra-condensed"/>
       <member name="extra-condensed"
-                value="1"
-                c:identifier="PANGO_STRETCH_EXTRA_CONDENSED"
-                glib:nick="extra-condensed"/>
+              value="1"
+              c:identifier="PANGO_STRETCH_EXTRA_CONDENSED"
+              glib:nick="extra-condensed"/>
       <member name="condensed"
-                value="2"
-                c:identifier="PANGO_STRETCH_CONDENSED"
-                glib:nick="condensed"/>
+              value="2"
+              c:identifier="PANGO_STRETCH_CONDENSED"
+              glib:nick="condensed"/>
       <member name="semi-condensed"
-                value="3"
-                c:identifier="PANGO_STRETCH_SEMI_CONDENSED"
-                glib:nick="semi-condensed"/>
+              value="3"
+              c:identifier="PANGO_STRETCH_SEMI_CONDENSED"
+              glib:nick="semi-condensed"/>
       <member name="normal"
-                value="4"
-                c:identifier="PANGO_STRETCH_NORMAL"
-                glib:nick="normal"/>
+              value="4"
+              c:identifier="PANGO_STRETCH_NORMAL"
+              glib:nick="normal"/>
       <member name="semi-expanded"
-                value="5"
-                c:identifier="PANGO_STRETCH_SEMI_EXPANDED"
-                glib:nick="semi-expanded"/>
+              value="5"
+              c:identifier="PANGO_STRETCH_SEMI_EXPANDED"
+              glib:nick="semi-expanded"/>
       <member name="expanded"
-                value="6"
-                c:identifier="PANGO_STRETCH_EXPANDED"
-                glib:nick="expanded"/>
+              value="6"
+              c:identifier="PANGO_STRETCH_EXPANDED"
+              glib:nick="expanded"/>
       <member name="extra-expanded"
-                value="7"
-                c:identifier="PANGO_STRETCH_EXTRA_EXPANDED"
-                glib:nick="extra-expanded"/>
+              value="7"
+              c:identifier="PANGO_STRETCH_EXTRA_EXPANDED"
+              glib:nick="extra-expanded"/>
       <member name="ultra-expanded"
-                value="8"
-                c:identifier="PANGO_STRETCH_ULTRA_EXPANDED"
-                glib:nick="ultra-expanded"/>
+              value="8"
+              c:identifier="PANGO_STRETCH_ULTRA_EXPANDED"
+              glib:nick="ultra-expanded"/>
     </enumeration>
     <bitfield name="FontMask"
               c:type="PangoFontMask"
               glib:type-name="PangoFontMask"
               glib:get-type="pango_font_mask_get_type">
       <member name="family"
-                value="1"
-                c:identifier="PANGO_FONT_MASK_FAMILY"
-                glib:nick="family"/>
+              value="1"
+              c:identifier="PANGO_FONT_MASK_FAMILY"
+              glib:nick="family"/>
       <member name="style"
-                value="2"
-                c:identifier="PANGO_FONT_MASK_STYLE"
-                glib:nick="style"/>
+              value="2"
+              c:identifier="PANGO_FONT_MASK_STYLE"
+              glib:nick="style"/>
       <member name="variant"
-                value="4"
-                c:identifier="PANGO_FONT_MASK_VARIANT"
-                glib:nick="variant"/>
+              value="4"
+              c:identifier="PANGO_FONT_MASK_VARIANT"
+              glib:nick="variant"/>
       <member name="weight"
-                value="8"
-                c:identifier="PANGO_FONT_MASK_WEIGHT"
-                glib:nick="weight"/>
+              value="8"
+              c:identifier="PANGO_FONT_MASK_WEIGHT"
+              glib:nick="weight"/>
       <member name="stretch"
-                value="16"
-                c:identifier="PANGO_FONT_MASK_STRETCH"
-                glib:nick="stretch"/>
+              value="16"
+              c:identifier="PANGO_FONT_MASK_STRETCH"
+              glib:nick="stretch"/>
       <member name="size"
-                value="32"
-                c:identifier="PANGO_FONT_MASK_SIZE"
-                glib:nick="size"/>
+              value="32"
+              c:identifier="PANGO_FONT_MASK_SIZE"
+              glib:nick="size"/>
       <member name="gravity"
-                value="64"
-                c:identifier="PANGO_FONT_MASK_GRAVITY"
-                glib:nick="gravity"/>
+              value="64"
+              c:identifier="PANGO_FONT_MASK_GRAVITY"
+              glib:nick="gravity"/>
     </bitfield>
     <glib:boxed c:type="FontDescription"
                 glib:name="FontDescription"
@@ -1248,7 +1251,7 @@
         </return-value>
         <parameters>
           <parameter name="str">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -1264,7 +1267,7 @@
       </method>
       <method name="equal" c:identifier="pango_font_description_equal">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="desc1">
@@ -1277,7 +1280,7 @@
       </method>
       <method name="free" c:identifier="pango_font_description_free">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1288,35 +1291,35 @@
       <method name="set_family"
               c:identifier="pango_font_description_set_family">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="desc">
             <type name="FontDescription" c:type="PangoFontDescription*"/>
           </parameter>
           <parameter name="family">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_family_static"
               c:identifier="pango_font_description_set_family_static">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="desc">
             <type name="FontDescription" c:type="PangoFontDescription*"/>
           </parameter>
           <parameter name="family">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_family"
               c:identifier="pango_font_description_get_family">
         <return-value>
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1326,7 +1329,7 @@
       </method>
       <method name="set_style" c:identifier="pango_font_description_set_style">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1350,7 +1353,7 @@
       <method name="set_variant"
               c:identifier="pango_font_description_set_variant">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1375,7 +1378,7 @@
       <method name="set_weight"
               c:identifier="pango_font_description_set_weight">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1400,7 +1403,7 @@
       <method name="set_stretch"
               c:identifier="pango_font_description_set_stretch">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1424,20 +1427,20 @@
       </method>
       <method name="set_size" c:identifier="pango_font_description_set_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="desc">
             <type name="FontDescription" c:type="PangoFontDescription*"/>
           </parameter>
           <parameter name="size">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_size" c:identifier="pango_font_description_get_size">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1448,7 +1451,7 @@
       <method name="set_absolute_size"
               c:identifier="pango_font_description_set_absolute_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1462,7 +1465,7 @@
       <method name="get_size_is_absolute"
               c:identifier="pango_font_description_get_size_is_absolute">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1473,7 +1476,7 @@
       <method name="set_gravity"
               c:identifier="pango_font_description_set_gravity">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1509,7 +1512,7 @@
       <method name="unset_fields"
               c:identifier="pango_font_description_unset_fields">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1522,7 +1525,7 @@
       </method>
       <method name="merge" c:identifier="pango_font_description_merge">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1532,14 +1535,14 @@
             <type name="FontDescription" c:type="PangoFontDescription*"/>
           </parameter>
           <parameter name="replace_existing">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="merge_static"
               c:identifier="pango_font_description_merge_static">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1549,14 +1552,14 @@
             <type name="FontDescription" c:type="PangoFontDescription*"/>
           </parameter>
           <parameter name="replace_existing">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="better_match"
               c:identifier="pango_font_description_better_match">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1572,7 +1575,7 @@
       </method>
       <method name="to_string" c:identifier="pango_font_description_to_string">
         <return-value>
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1583,7 +1586,7 @@
       <method name="to_filename"
               c:identifier="pango_font_description_to_filename">
         <return-value>
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="desc">
@@ -1595,14 +1598,14 @@
     <function name="font_descriptions_free"
               c:identifier="pango_font_descriptions_free">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="descs">
           <type name="FontDescription" c:type="PangoFontDescription**"/>
         </parameter>
         <parameter name="n_descs">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -1622,7 +1625,7 @@
       </constructor>
       <method name="unref" c:identifier="pango_font_metrics_unref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1632,7 +1635,7 @@
       </method>
       <method name="get_ascent" c:identifier="pango_font_metrics_get_ascent">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1642,7 +1645,7 @@
       </method>
       <method name="get_descent" c:identifier="pango_font_metrics_get_descent">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1653,7 +1656,7 @@
       <method name="get_approximate_char_width"
               c:identifier="pango_font_metrics_get_approximate_char_width">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1664,7 +1667,7 @@
       <method name="get_approximate_digit_width"
               c:identifier="pango_font_metrics_get_approximate_digit_width">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1675,7 +1678,7 @@
       <method name="get_underline_position"
               c:identifier="pango_font_metrics_get_underline_position">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1686,7 +1689,7 @@
       <method name="get_underline_thickness"
               c:identifier="pango_font_metrics_get_underline_thickness">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1697,7 +1700,7 @@
       <method name="get_strikethrough_position"
               c:identifier="pango_font_metrics_get_strikethrough_position">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1708,7 +1711,7 @@
       <method name="get_strikethrough_thickness"
               c:identifier="pango_font_metrics_get_strikethrough_thickness">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1724,7 +1727,7 @@
            glib:get-type="pango_font_family_get_type">
       <method name="list_faces" c:identifier="pango_font_family_list_faces">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="family">
@@ -1740,7 +1743,7 @@
       </method>
       <method name="get_name" c:identifier="pango_font_family_get_name">
         <return-value>
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="family">
@@ -1748,9 +1751,10 @@
           </parameter>
         </parameters>
       </method>
-      <method name="is_monospace" c:identifier="pango_font_family_is_monospace">
+      <method name="is_monospace"
+              c:identifier="pango_font_family_is_monospace">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="family">
@@ -1774,9 +1778,10 @@
           </parameter>
         </parameters>
       </method>
-      <method name="get_face_name" c:identifier="pango_font_face_get_face_name">
+      <method name="get_face_name"
+              c:identifier="pango_font_face_get_face_name">
         <return-value>
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="face">
@@ -1786,7 +1791,7 @@
       </method>
       <method name="list_sizes" c:identifier="pango_font_face_list_sizes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="face">
@@ -1803,7 +1808,7 @@
       <method name="is_synthesized"
               c:identifier="pango_font_face_is_synthesized">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="face">
@@ -1817,7 +1822,8 @@
            parent="GLib.Object"
            glib:type-name="PangoFont"
            glib:get-type="pango_font_get_type">
-      <constructor name="map_load_font" c:identifier="pango_font_map_load_font">
+      <constructor name="map_load_font"
+                   c:identifier="pango_font_map_load_font">
         <return-value>
           <type name="Font" c:type="PangoFont*"/>
         </return-value>
@@ -1879,7 +1885,7 @@
             <type name="Language" c:type="PangoLanguage*"/>
           </parameter>
           <parameter name="ch">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
@@ -1899,7 +1905,7 @@
       <method name="get_glyph_extents"
               c:identifier="pango_font_get_glyph_extents">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="font">
@@ -1943,7 +1949,7 @@
       </constructor>
       <method name="free" c:identifier="pango_color_free">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="color">
@@ -1953,20 +1959,20 @@
       </method>
       <method name="parse" c:identifier="pango_color_parse">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="color">
             <type name="Color" c:type="PangoColor*"/>
           </parameter>
           <parameter name="spec">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </method>
       <method name="to_string" c:identifier="pango_color_to_string">
         <return-value>
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="color">
@@ -1991,7 +1997,7 @@
         <type name="PangoAttribute" c:type="PangoAttribute"/>
       </field>
       <field name="value">
-        <type name="char*" c:type="char*"/>
+        <type name="string" c:type="char*"/>
       </field>
     </record>
     <record name="PangoAttrLanguage" c:type="PangoAttrLanguage">
@@ -2007,7 +2013,7 @@
         <type name="PangoAttribute" c:type="PangoAttribute"/>
       </field>
       <field name="value">
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </field>
     </record>
     <record name="PangoAttrSize" c:type="PangoAttrSize">
@@ -2015,7 +2021,7 @@
         <type name="PangoAttribute" c:type="PangoAttribute"/>
       </field>
       <field name="size">
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </field>
       <field name="absolute">
         <type name="guint" c:type="guint"/>
@@ -2056,7 +2062,7 @@
         <type name="PangoRectangle" c:type="PangoRectangle"/>
       </field>
       <field name="data">
-        <type name="gpointer" c:type="gpointer"/>
+        <type name="any" c:type="gpointer"/>
       </field>
       <field name="copy_func">
         <type name="PangoAttrDataCopyFunc" c:type="PangoAttrDataCopyFunc"/>
@@ -2071,139 +2077,139 @@
                  glib:type-name="PangoAttrType"
                  glib:get-type="pango_attr_type_get_type">
       <member name="invalid"
-                value="0"
-                c:identifier="PANGO_ATTR_INVALID"
-                glib:nick="invalid"/>
+              value="0"
+              c:identifier="PANGO_ATTR_INVALID"
+              glib:nick="invalid"/>
       <member name="language"
-                value="1"
-                c:identifier="PANGO_ATTR_LANGUAGE"
-                glib:nick="language"/>
+              value="1"
+              c:identifier="PANGO_ATTR_LANGUAGE"
+              glib:nick="language"/>
       <member name="family"
-                value="2"
-                c:identifier="PANGO_ATTR_FAMILY"
-                glib:nick="family"/>
+              value="2"
+              c:identifier="PANGO_ATTR_FAMILY"
+              glib:nick="family"/>
       <member name="style"
-                value="3"
-                c:identifier="PANGO_ATTR_STYLE"
-                glib:nick="style"/>
+              value="3"
+              c:identifier="PANGO_ATTR_STYLE"
+              glib:nick="style"/>
       <member name="weight"
-                value="4"
-                c:identifier="PANGO_ATTR_WEIGHT"
-                glib:nick="weight"/>
+              value="4"
+              c:identifier="PANGO_ATTR_WEIGHT"
+              glib:nick="weight"/>
       <member name="variant"
-                value="5"
-                c:identifier="PANGO_ATTR_VARIANT"
-                glib:nick="variant"/>
+              value="5"
+              c:identifier="PANGO_ATTR_VARIANT"
+              glib:nick="variant"/>
       <member name="stretch"
-                value="6"
-                c:identifier="PANGO_ATTR_STRETCH"
-                glib:nick="stretch"/>
+              value="6"
+              c:identifier="PANGO_ATTR_STRETCH"
+              glib:nick="stretch"/>
       <member name="size"
-                value="7"
-                c:identifier="PANGO_ATTR_SIZE"
-                glib:nick="size"/>
+              value="7"
+              c:identifier="PANGO_ATTR_SIZE"
+              glib:nick="size"/>
       <member name="font-desc"
-                value="8"
-                c:identifier="PANGO_ATTR_FONT_DESC"
-                glib:nick="font-desc"/>
+              value="8"
+              c:identifier="PANGO_ATTR_FONT_DESC"
+              glib:nick="font-desc"/>
       <member name="foreground"
-                value="9"
-                c:identifier="PANGO_ATTR_FOREGROUND"
-                glib:nick="foreground"/>
+              value="9"
+              c:identifier="PANGO_ATTR_FOREGROUND"
+              glib:nick="foreground"/>
       <member name="background"
-                value="10"
-                c:identifier="PANGO_ATTR_BACKGROUND"
-                glib:nick="background"/>
+              value="10"
+              c:identifier="PANGO_ATTR_BACKGROUND"
+              glib:nick="background"/>
       <member name="underline"
-                value="11"
-                c:identifier="PANGO_ATTR_UNDERLINE"
-                glib:nick="underline"/>
+              value="11"
+              c:identifier="PANGO_ATTR_UNDERLINE"
+              glib:nick="underline"/>
       <member name="strikethrough"
-                value="12"
-                c:identifier="PANGO_ATTR_STRIKETHROUGH"
-                glib:nick="strikethrough"/>
+              value="12"
+              c:identifier="PANGO_ATTR_STRIKETHROUGH"
+              glib:nick="strikethrough"/>
       <member name="rise"
-                value="13"
-                c:identifier="PANGO_ATTR_RISE"
-                glib:nick="rise"/>
+              value="13"
+              c:identifier="PANGO_ATTR_RISE"
+              glib:nick="rise"/>
       <member name="shape"
-                value="14"
-                c:identifier="PANGO_ATTR_SHAPE"
-                glib:nick="shape"/>
+              value="14"
+              c:identifier="PANGO_ATTR_SHAPE"
+              glib:nick="shape"/>
       <member name="scale"
-                value="15"
-                c:identifier="PANGO_ATTR_SCALE"
-                glib:nick="scale"/>
+              value="15"
+              c:identifier="PANGO_ATTR_SCALE"
+              glib:nick="scale"/>
       <member name="fallback"
-                value="16"
-                c:identifier="PANGO_ATTR_FALLBACK"
-                glib:nick="fallback"/>
+              value="16"
+              c:identifier="PANGO_ATTR_FALLBACK"
+              glib:nick="fallback"/>
       <member name="letter-spacing"
-                value="17"
-                c:identifier="PANGO_ATTR_LETTER_SPACING"
-                glib:nick="letter-spacing"/>
+              value="17"
+              c:identifier="PANGO_ATTR_LETTER_SPACING"
+              glib:nick="letter-spacing"/>
       <member name="underline-color"
-                value="18"
-                c:identifier="PANGO_ATTR_UNDERLINE_COLOR"
-                glib:nick="underline-color"/>
+              value="18"
+              c:identifier="PANGO_ATTR_UNDERLINE_COLOR"
+              glib:nick="underline-color"/>
       <member name="strikethrough-color"
-                value="19"
-                c:identifier="PANGO_ATTR_STRIKETHROUGH_COLOR"
-                glib:nick="strikethrough-color"/>
+              value="19"
+              c:identifier="PANGO_ATTR_STRIKETHROUGH_COLOR"
+              glib:nick="strikethrough-color"/>
       <member name="absolute-size"
-                value="20"
-                c:identifier="PANGO_ATTR_ABSOLUTE_SIZE"
-                glib:nick="absolute-size"/>
+              value="20"
+              c:identifier="PANGO_ATTR_ABSOLUTE_SIZE"
+              glib:nick="absolute-size"/>
       <member name="gravity"
-                value="21"
-                c:identifier="PANGO_ATTR_GRAVITY"
-                glib:nick="gravity"/>
+              value="21"
+              c:identifier="PANGO_ATTR_GRAVITY"
+              glib:nick="gravity"/>
       <member name="gravity-hint"
-                value="22"
-                c:identifier="PANGO_ATTR_GRAVITY_HINT"
-                glib:nick="gravity-hint"/>
+              value="22"
+              c:identifier="PANGO_ATTR_GRAVITY_HINT"
+              glib:nick="gravity-hint"/>
     </enumeration>
     <enumeration name="Underline"
                  c:type="PangoUnderline"
                  glib:type-name="PangoUnderline"
                  glib:get-type="pango_underline_get_type">
       <member name="none"
-                value="0"
-                c:identifier="PANGO_UNDERLINE_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="PANGO_UNDERLINE_NONE"
+              glib:nick="none"/>
       <member name="single"
-                value="1"
-                c:identifier="PANGO_UNDERLINE_SINGLE"
-                glib:nick="single"/>
+              value="1"
+              c:identifier="PANGO_UNDERLINE_SINGLE"
+              glib:nick="single"/>
       <member name="double"
-                value="2"
-                c:identifier="PANGO_UNDERLINE_DOUBLE"
-                glib:nick="double"/>
+              value="2"
+              c:identifier="PANGO_UNDERLINE_DOUBLE"
+              glib:nick="double"/>
       <member name="low"
-                value="3"
-                c:identifier="PANGO_UNDERLINE_LOW"
-                glib:nick="low"/>
+              value="3"
+              c:identifier="PANGO_UNDERLINE_LOW"
+              glib:nick="low"/>
       <member name="error"
-                value="4"
-                c:identifier="PANGO_UNDERLINE_ERROR"
-                glib:nick="error"/>
+              value="4"
+              c:identifier="PANGO_UNDERLINE_ERROR"
+              glib:nick="error"/>
     </enumeration>
     <callback name="PangoAttrFilterFunc">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="attribute">
           <type name="PangoAttribute*" c:type="PangoAttribute*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
     <callback name="PangoAttrDataCopyFunc">
       <return-value>
-        <type name="gpointer" c:type="gpointer"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
         <parameter name="data">
@@ -2211,19 +2217,21 @@
         </parameter>
       </parameters>
     </callback>
-    <function name="attr_type_register" c:identifier="pango_attr_type_register">
+    <function name="attr_type_register"
+              c:identifier="pango_attr_type_register">
       <return-value>
         <type name="PangoAttrType" c:type="PangoAttrType"/>
       </return-value>
       <parameters>
         <parameter name="name">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="attr_type_get_name" c:identifier="pango_attr_type_get_name">
+    <function name="attr_type_get_name"
+              c:identifier="pango_attr_type_get_name">
       <return-value>
-        <type name="char*" c:type="char*"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
         <parameter name="type">
@@ -2233,7 +2241,7 @@
     </function>
     <function name="attribute_init" c:identifier="pango_attribute_init">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="attr">
@@ -2256,7 +2264,7 @@
     </function>
     <function name="attribute_destroy" c:identifier="pango_attribute_destroy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="attr">
@@ -2266,7 +2274,7 @@
     </function>
     <function name="attribute_equal" c:identifier="pango_attribute_equal">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="attr1">
@@ -2293,7 +2301,7 @@
       </return-value>
       <parameters>
         <parameter name="family">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
@@ -2304,13 +2312,13 @@
       </return-value>
       <parameters>
         <parameter name="red">
-          <type name="guint16" c:type="guint16"/>
+          <type name="uint16" c:type="guint16"/>
         </parameter>
         <parameter name="green">
-          <type name="guint16" c:type="guint16"/>
+          <type name="uint16" c:type="guint16"/>
         </parameter>
         <parameter name="blue">
-          <type name="guint16" c:type="guint16"/>
+          <type name="uint16" c:type="guint16"/>
         </parameter>
       </parameters>
     </function>
@@ -2321,13 +2329,13 @@
       </return-value>
       <parameters>
         <parameter name="red">
-          <type name="guint16" c:type="guint16"/>
+          <type name="uint16" c:type="guint16"/>
         </parameter>
         <parameter name="green">
-          <type name="guint16" c:type="guint16"/>
+          <type name="uint16" c:type="guint16"/>
         </parameter>
         <parameter name="blue">
-          <type name="guint16" c:type="guint16"/>
+          <type name="uint16" c:type="guint16"/>
         </parameter>
       </parameters>
     </function>
@@ -2337,7 +2345,7 @@
       </return-value>
       <parameters>
         <parameter name="size">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -2348,7 +2356,7 @@
       </return-value>
       <parameters>
         <parameter name="size">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -2392,7 +2400,8 @@
         </parameter>
       </parameters>
     </function>
-    <function name="attr_font_desc_new" c:identifier="pango_attr_font_desc_new">
+    <function name="attr_font_desc_new"
+              c:identifier="pango_attr_font_desc_new">
       <return-value>
         <type name="PangoAttribute*" c:type="PangoAttribute*"/>
       </return-value>
@@ -2402,7 +2411,8 @@
         </parameter>
       </parameters>
     </function>
-    <function name="attr_underline_new" c:identifier="pango_attr_underline_new">
+    <function name="attr_underline_new"
+              c:identifier="pango_attr_underline_new">
       <return-value>
         <type name="PangoAttribute*" c:type="PangoAttribute*"/>
       </return-value>
@@ -2419,13 +2429,13 @@
       </return-value>
       <parameters>
         <parameter name="red">
-          <type name="guint16" c:type="guint16"/>
+          <type name="uint16" c:type="guint16"/>
         </parameter>
         <parameter name="green">
-          <type name="guint16" c:type="guint16"/>
+          <type name="uint16" c:type="guint16"/>
         </parameter>
         <parameter name="blue">
-          <type name="guint16" c:type="guint16"/>
+          <type name="uint16" c:type="guint16"/>
         </parameter>
       </parameters>
     </function>
@@ -2436,7 +2446,7 @@
       </return-value>
       <parameters>
         <parameter name="strikethrough">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
@@ -2447,13 +2457,13 @@
       </return-value>
       <parameters>
         <parameter name="red">
-          <type name="guint16" c:type="guint16"/>
+          <type name="uint16" c:type="guint16"/>
         </parameter>
         <parameter name="green">
-          <type name="guint16" c:type="guint16"/>
+          <type name="uint16" c:type="guint16"/>
         </parameter>
         <parameter name="blue">
-          <type name="guint16" c:type="guint16"/>
+          <type name="uint16" c:type="guint16"/>
         </parameter>
       </parameters>
     </function>
@@ -2463,7 +2473,7 @@
       </return-value>
       <parameters>
         <parameter name="rise">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -2483,7 +2493,7 @@
       </return-value>
       <parameters>
         <parameter name="enable_fallback">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
@@ -2494,7 +2504,7 @@
       </return-value>
       <parameters>
         <parameter name="letter_spacing">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -2524,7 +2534,7 @@
           <type name="PangoRectangle" c:type="PangoRectangle*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="copy_func">
           <type name="PangoAttrDataCopyFunc" c:type="PangoAttrDataCopyFunc"/>
@@ -2596,13 +2606,13 @@
             <type name="PangoAttrFilterFunc" c:type="PangoAttrFilterFunc"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </constructor>
       <method name="unref" c:identifier="pango_attr_list_unref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="list">
@@ -2612,7 +2622,7 @@
       </method>
       <method name="insert" c:identifier="pango_attr_list_insert">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="list">
@@ -2623,9 +2633,10 @@
           </parameter>
         </parameters>
       </method>
-      <method name="insert_before" c:identifier="pango_attr_list_insert_before">
+      <method name="insert_before"
+              c:identifier="pango_attr_list_insert_before">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="list">
@@ -2638,7 +2649,7 @@
       </method>
       <method name="change" c:identifier="pango_attr_list_change">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="list">
@@ -2651,7 +2662,7 @@
       </method>
       <method name="splice" c:identifier="pango_attr_list_splice">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="list">
@@ -2661,10 +2672,10 @@
             <type name="AttrList" c:type="PangoAttrList*"/>
           </parameter>
           <parameter name="pos">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="len">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -2682,7 +2693,7 @@
     <function name="attr_iterator_range"
               c:identifier="pango_attr_iterator_range">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="iterator">
@@ -2696,9 +2707,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="attr_iterator_next" c:identifier="pango_attr_iterator_next">
+    <function name="attr_iterator_next"
+              c:identifier="pango_attr_iterator_next">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="iterator">
@@ -2706,7 +2718,8 @@
         </parameter>
       </parameters>
     </function>
-    <function name="attr_iterator_copy" c:identifier="pango_attr_iterator_copy">
+    <function name="attr_iterator_copy"
+              c:identifier="pango_attr_iterator_copy">
       <return-value>
         <type name="PangoAttrIterator*" c:type="PangoAttrIterator*"/>
       </return-value>
@@ -2719,7 +2732,7 @@
     <function name="attr_iterator_destroy"
               c:identifier="pango_attr_iterator_destroy">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="iterator">
@@ -2743,7 +2756,7 @@
     <function name="attr_iterator_get_font"
               c:identifier="pango_attr_iterator_get_font">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="iterator">
@@ -2773,14 +2786,14 @@
     </function>
     <function name="parse_markup" c:identifier="pango_parse_markup">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="markup_text">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="length">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="accel_marker">
           <type name="gunichar" c:type="gunichar"/>
@@ -2810,16 +2823,16 @@
         <type name="PangoFont*" c:type="PangoFont*"/>
       </field>
       <field name="level">
-        <type name="guint8" c:type="guint8"/>
+        <type name="uint8" c:type="guint8"/>
       </field>
       <field name="gravity">
-        <type name="guint8" c:type="guint8"/>
+        <type name="uint8" c:type="guint8"/>
       </field>
       <field name="flags">
-        <type name="guint8" c:type="guint8"/>
+        <type name="uint8" c:type="guint8"/>
       </field>
       <field name="script">
-        <type name="guint8" c:type="guint8"/>
+        <type name="uint8" c:type="guint8"/>
       </field>
       <field name="language">
         <type name="PangoLanguage*" c:type="PangoLanguage*"/>
@@ -2856,16 +2869,16 @@
             <type name="Item" c:type="PangoItem*"/>
           </parameter>
           <parameter name="split_index">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="split_offset">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </constructor>
       <method name="free" c:identifier="pango_item_free">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="item">
@@ -2876,14 +2889,14 @@
     </glib:boxed>
     <function name="break" c:identifier="pango_break">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="analysis">
           <type name="PangoAnalysis" c:type="PangoAnalysis*"/>
@@ -2892,21 +2905,21 @@
           <type name="PangoLogAttr" c:type="PangoLogAttr*"/>
         </parameter>
         <parameter name="attrs_len">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="find_paragraph_boundary"
               c:identifier="pango_find_paragraph_boundary">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="paragraph_delimiter_index">
           <type name="gint" c:type="gint*"/>
@@ -2918,17 +2931,17 @@
     </function>
     <function name="get_log_attrs" c:identifier="pango_get_log_attrs">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="text">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="length">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="level">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="language">
           <type name="Language" c:type="PangoLanguage*"/>
@@ -2937,7 +2950,7 @@
           <type name="PangoLogAttr" c:type="PangoLogAttr*"/>
         </parameter>
         <parameter name="attrs_len">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -2971,7 +2984,7 @@
       </method>
       <method name="foreach" c:identifier="pango_fontset_foreach">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="fontset">
@@ -2979,10 +2992,10 @@
           </parameter>
           <parameter name="func">
             <type name="PangoFontsetForeachFunc"
-                    c:type="PangoFontsetForeachFunc"/>
+                  c:type="PangoFontsetForeachFunc"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer" c:type="gpointer"/>
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
@@ -2990,7 +3003,7 @@
     <record name="PangoFontset" c:type="PangoFontset"/>
     <callback name="PangoFontsetForeachFunc">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="fontset">
@@ -3000,7 +3013,7 @@
           <type name="PangoFont*" c:type="PangoFont*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
@@ -3030,7 +3043,7 @@
       </method>
       <method name="list_families" c:identifier="pango_font_map_list_families">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="fontmap">
@@ -3062,7 +3075,7 @@
       </method>
       <method name="list_families" c:identifier="pango_context_list_families">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
@@ -3124,7 +3137,7 @@
       <method name="set_font_description"
               c:identifier="pango_context_set_font_description">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
@@ -3158,7 +3171,7 @@
       </method>
       <method name="set_language" c:identifier="pango_context_set_language">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
@@ -3171,7 +3184,7 @@
       </method>
       <method name="set_base_dir" c:identifier="pango_context_set_base_dir">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
@@ -3195,7 +3208,7 @@
       <method name="set_base_gravity"
               c:identifier="pango_context_set_base_gravity">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
@@ -3230,7 +3243,7 @@
       <method name="set_gravity_hint"
               c:identifier="pango_context_set_gravity_hint">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
@@ -3254,7 +3267,7 @@
       </method>
       <method name="set_matrix" c:identifier="pango_context_set_matrix">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="context">
@@ -3285,13 +3298,13 @@
           <type name="Context" c:type="PangoContext*"/>
         </parameter>
         <parameter name="text">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="start_index">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="length">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="attrs">
           <type name="AttrList" c:type="PangoAttrList*"/>
@@ -3314,13 +3327,13 @@
           <type name="PangoDirection" c:type="PangoDirection"/>
         </parameter>
         <parameter name="text">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="start_index">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="length">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="attrs">
           <type name="AttrList" c:type="PangoAttrList*"/>
@@ -3365,14 +3378,14 @@
     <function name="glyph_string_set_size"
               c:identifier="pango_glyph_string_set_size">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="string">
           <type name="PangoGlyphString" c:type="PangoGlyphString*"/>
         </parameter>
         <parameter name="new_len">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -3392,7 +3405,7 @@
       </constructor>
       <method name="free" c:identifier="pango_glyph_string_free">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="string">
@@ -3402,7 +3415,7 @@
       </method>
       <method name="extents" c:identifier="pango_glyph_string_extents">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="glyphs">
@@ -3421,7 +3434,7 @@
       </method>
       <method name="get_width" c:identifier="pango_glyph_string_get_width">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="glyphs">
@@ -3432,17 +3445,17 @@
       <method name="extents_range"
               c:identifier="pango_glyph_string_extents_range">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="glyphs">
             <type name="GlyphString" c:type="PangoGlyphString*"/>
           </parameter>
           <parameter name="start">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="end">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="font">
             <type name="Font" c:type="PangoFont*"/>
@@ -3458,20 +3471,20 @@
       <method name="get_logical_widths"
               c:identifier="pango_glyph_string_get_logical_widths">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="glyphs">
             <type name="GlyphString" c:type="PangoGlyphString*"/>
           </parameter>
           <parameter name="text">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="length">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="embedding_level">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="logical_widths">
             <type name="int" c:type="int*"/>
@@ -3480,26 +3493,26 @@
       </method>
       <method name="index_to_x" c:identifier="pango_glyph_string_index_to_x">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="glyphs">
             <type name="GlyphString" c:type="PangoGlyphString*"/>
           </parameter>
           <parameter name="text">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="length">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="analysis">
             <type name="PangoAnalysis" c:type="PangoAnalysis*"/>
           </parameter>
           <parameter name="index_">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="trailing">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="x_pos">
             <type name="int" c:type="int*"/>
@@ -3508,23 +3521,23 @@
       </method>
       <method name="x_to_index" c:identifier="pango_glyph_string_x_to_index">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="glyphs">
             <type name="GlyphString" c:type="PangoGlyphString*"/>
           </parameter>
           <parameter name="text">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="length">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="analysis">
             <type name="PangoAnalysis" c:type="PangoAnalysis*"/>
           </parameter>
           <parameter name="x_pos">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="index_">
             <type name="int" c:type="int*"/>
@@ -3537,14 +3550,14 @@
     </glib:boxed>
     <function name="shape" c:identifier="pango_shape">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="analysis">
           <type name="PangoAnalysis" c:type="PangoAnalysis*"/>
@@ -3569,85 +3582,85 @@
                  glib:type-name="PangoAlignment"
                  glib:get-type="pango_alignment_get_type">
       <member name="left"
-                value="0"
-                c:identifier="PANGO_ALIGN_LEFT"
-                glib:nick="left"/>
+              value="0"
+              c:identifier="PANGO_ALIGN_LEFT"
+              glib:nick="left"/>
       <member name="center"
-                value="1"
-                c:identifier="PANGO_ALIGN_CENTER"
-                glib:nick="center"/>
+              value="1"
+              c:identifier="PANGO_ALIGN_CENTER"
+              glib:nick="center"/>
       <member name="right"
-                value="2"
-                c:identifier="PANGO_ALIGN_RIGHT"
-                glib:nick="right"/>
+              value="2"
+              c:identifier="PANGO_ALIGN_RIGHT"
+              glib:nick="right"/>
     </enumeration>
     <enumeration name="WrapMode"
                  c:type="PangoWrapMode"
                  glib:type-name="PangoWrapMode"
                  glib:get-type="pango_wrap_mode_get_type">
       <member name="word"
-                value="0"
-                c:identifier="PANGO_WRAP_WORD"
-                glib:nick="word"/>
+              value="0"
+              c:identifier="PANGO_WRAP_WORD"
+              glib:nick="word"/>
       <member name="char"
-                value="1"
-                c:identifier="PANGO_WRAP_CHAR"
-                glib:nick="char"/>
+              value="1"
+              c:identifier="PANGO_WRAP_CHAR"
+              glib:nick="char"/>
       <member name="word-char"
-                value="2"
-                c:identifier="PANGO_WRAP_WORD_CHAR"
-                glib:nick="word-char"/>
+              value="2"
+              c:identifier="PANGO_WRAP_WORD_CHAR"
+              glib:nick="word-char"/>
     </enumeration>
     <enumeration name="EllipsizeMode"
                  c:type="PangoEllipsizeMode"
                  glib:type-name="PangoEllipsizeMode"
                  glib:get-type="pango_ellipsize_mode_get_type">
       <member name="none"
-                value="0"
-                c:identifier="PANGO_ELLIPSIZE_NONE"
-                glib:nick="none"/>
+              value="0"
+              c:identifier="PANGO_ELLIPSIZE_NONE"
+              glib:nick="none"/>
       <member name="start"
-                value="1"
-                c:identifier="PANGO_ELLIPSIZE_START"
-                glib:nick="start"/>
+              value="1"
+              c:identifier="PANGO_ELLIPSIZE_START"
+              glib:nick="start"/>
       <member name="middle"
-                value="2"
-                c:identifier="PANGO_ELLIPSIZE_MIDDLE"
-                glib:nick="middle"/>
+              value="2"
+              c:identifier="PANGO_ELLIPSIZE_MIDDLE"
+              glib:nick="middle"/>
       <member name="end"
-                value="3"
-                c:identifier="PANGO_ELLIPSIZE_END"
-                glib:nick="end"/>
+              value="3"
+              c:identifier="PANGO_ELLIPSIZE_END"
+              glib:nick="end"/>
     </enumeration>
     <enumeration name="RenderPart"
                  c:type="PangoRenderPart"
                  glib:type-name="PangoRenderPart"
                  glib:get-type="pango_render_part_get_type">
       <member name="foreground"
-                value="0"
-                c:identifier="PANGO_RENDER_PART_FOREGROUND"
-                glib:nick="foreground"/>
+              value="0"
+              c:identifier="PANGO_RENDER_PART_FOREGROUND"
+              glib:nick="foreground"/>
       <member name="background"
-                value="1"
-                c:identifier="PANGO_RENDER_PART_BACKGROUND"
-                glib:nick="background"/>
+              value="1"
+              c:identifier="PANGO_RENDER_PART_BACKGROUND"
+              glib:nick="background"/>
       <member name="underline"
-                value="2"
-                c:identifier="PANGO_RENDER_PART_UNDERLINE"
-                glib:nick="underline"/>
+              value="2"
+              c:identifier="PANGO_RENDER_PART_UNDERLINE"
+              glib:nick="underline"/>
       <member name="strikethrough"
-                value="3"
-                c:identifier="PANGO_RENDER_PART_STRIKETHROUGH"
-                glib:nick="strikethrough"/>
+              value="3"
+              c:identifier="PANGO_RENDER_PART_STRIKETHROUGH"
+              glib:nick="strikethrough"/>
     </enumeration>
     <enumeration name="TabAlign"
                  c:type="PangoTabAlign"
                  glib:type-name="PangoTabAlign"
                  glib:get-type="pango_tab_align_get_type">
       <member name="left"
-                value="0"
-                c:identifier="PANGO_TAB_LEFT"
-                glib:nick="left"/>
+              value="0"
+              c:identifier="PANGO_TAB_LEFT"
+              glib:nick="left"/>
     </enumeration>
     <glib:boxed c:type="GlyphItem"
                 glib:name="GlyphItem"
@@ -3662,10 +3675,10 @@
             <type name="GlyphItem" c:type="PangoGlyphItem*"/>
           </parameter>
           <parameter name="text">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="split_index">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </constructor>
@@ -3681,7 +3694,7 @@
       </constructor>
       <method name="free" c:identifier="pango_glyph_item_free">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="glyph_item">
@@ -3698,7 +3711,7 @@
             <type name="GlyphItem" c:type="PangoGlyphItem*"/>
           </parameter>
           <parameter name="text">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="list">
             <type name="AttrList" c:type="PangoAttrList*"/>
@@ -3707,20 +3720,20 @@
       </method>
       <method name="letter_space" c:identifier="pango_glyph_item_letter_space">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="glyph_item">
             <type name="GlyphItem" c:type="PangoGlyphItem*"/>
           </parameter>
           <parameter name="text">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="log_attrs">
             <type name="PangoLogAttr" c:type="PangoLogAttr*"/>
           </parameter>
           <parameter name="letter_spacing">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </method>
@@ -3731,10 +3744,10 @@
       </return-value>
       <parameters>
         <parameter name="initial_size">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="positions_in_pixels">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
@@ -3745,16 +3758,16 @@
       </return-value>
       <parameters>
         <parameter name="size">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="positions_in_pixels">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="first_alignment">
           <type name="TabAlign" c:type="PangoTabAlign"/>
         </parameter>
         <parameter name="first_position">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -3774,7 +3787,7 @@
       </constructor>
       <method name="free" c:identifier="pango_tab_array_free">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="tab_array">
@@ -3784,7 +3797,7 @@
       </method>
       <method name="get_size" c:identifier="pango_tab_array_get_size">
         <return-value>
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="tab_array">
@@ -3794,46 +3807,46 @@
       </method>
       <method name="resize" c:identifier="pango_tab_array_resize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="tab_array">
             <type name="TabArray" c:type="PangoTabArray*"/>
           </parameter>
           <parameter name="new_size">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_tab" c:identifier="pango_tab_array_set_tab">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="tab_array">
             <type name="TabArray" c:type="PangoTabArray*"/>
           </parameter>
           <parameter name="tab_index">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="alignment">
             <type name="TabAlign" c:type="PangoTabAlign"/>
           </parameter>
           <parameter name="location">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_tab" c:identifier="pango_tab_array_get_tab">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="tab_array">
             <type name="TabArray" c:type="PangoTabArray*"/>
           </parameter>
           <parameter name="tab_index">
-            <type name="gint" c:type="gint"/>
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="alignment">
             <type name="TabAlign" c:type="PangoTabAlign*"/>
@@ -3845,7 +3858,7 @@
       </method>
       <method name="get_tabs" c:identifier="pango_tab_array_get_tabs">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="tab_array">
@@ -3862,7 +3875,7 @@
       <method name="get_positions_in_pixels"
               c:identifier="pango_tab_array_get_positions_in_pixels">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="tab_array">
@@ -3919,7 +3932,7 @@
       </method>
       <method name="set_attributes" c:identifier="pango_layout_set_attributes">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -3942,23 +3955,23 @@
       </method>
       <method name="set_text" c:identifier="pango_layout_set_text">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="text">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="length">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_text" c:identifier="pango_layout_get_text">
         <return-value>
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -3968,34 +3981,34 @@
       </method>
       <method name="set_markup" c:identifier="pango_layout_set_markup">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="markup">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="length">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_markup_with_accel"
               c:identifier="pango_layout_set_markup_with_accel">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="markup">
-            <type name="char" c:type="char*"/>
+            <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="length">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="accel_marker">
             <type name="gunichar" c:type="gunichar"/>
@@ -4008,7 +4021,7 @@
       <method name="set_font_description"
               c:identifier="pango_layout_set_font_description">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4032,20 +4045,20 @@
       </method>
       <method name="set_width" c:identifier="pango_layout_set_width">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="width">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_width" c:identifier="pango_layout_get_width">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4055,20 +4068,20 @@
       </method>
       <method name="set_height" c:identifier="pango_layout_set_height">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="height">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_height" c:identifier="pango_layout_get_height">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4078,7 +4091,7 @@
       </method>
       <method name="set_wrap" c:identifier="pango_layout_set_wrap">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4101,7 +4114,7 @@
       </method>
       <method name="is_wrapped" c:identifier="pango_layout_is_wrapped">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4111,20 +4124,20 @@
       </method>
       <method name="set_indent" c:identifier="pango_layout_set_indent">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="indent">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_indent" c:identifier="pango_layout_get_indent">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4134,20 +4147,20 @@
       </method>
       <method name="set_spacing" c:identifier="pango_layout_set_spacing">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="spacing">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_spacing" c:identifier="pango_layout_get_spacing">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4157,20 +4170,20 @@
       </method>
       <method name="set_justify" c:identifier="pango_layout_set_justify">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="justify">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_justify" c:identifier="pango_layout_get_justify">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4180,20 +4193,20 @@
       </method>
       <method name="set_auto_dir" c:identifier="pango_layout_set_auto_dir">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="auto_dir">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_auto_dir" c:identifier="pango_layout_get_auto_dir">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4203,7 +4216,7 @@
       </method>
       <method name="set_alignment" c:identifier="pango_layout_set_alignment">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4226,7 +4239,7 @@
       </method>
       <method name="set_tabs" c:identifier="pango_layout_set_tabs">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4250,21 +4263,21 @@
       <method name="set_single_paragraph_mode"
               c:identifier="pango_layout_set_single_paragraph_mode">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="setting">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_single_paragraph_mode"
               c:identifier="pango_layout_get_single_paragraph_mode">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4274,7 +4287,7 @@
       </method>
       <method name="set_ellipsize" c:identifier="pango_layout_set_ellipsize">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4297,7 +4310,7 @@
       </method>
       <method name="is_ellipsized" c:identifier="pango_layout_is_ellipsized">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4308,7 +4321,7 @@
       <method name="get_unknown_glyphs_count"
               c:identifier="pango_layout_get_unknown_glyphs_count">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4319,7 +4332,7 @@
       <method name="context_changed"
               c:identifier="pango_layout_context_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4329,7 +4342,7 @@
       </method>
       <method name="get_log_attrs" c:identifier="pango_layout_get_log_attrs">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4345,14 +4358,14 @@
       </method>
       <method name="index_to_pos" c:identifier="pango_layout_index_to_pos">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="index_">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="pos">
             <type name="PangoRectangle" c:type="PangoRectangle*"/>
@@ -4362,17 +4375,17 @@
       <method name="index_to_line_x"
               c:identifier="pango_layout_index_to_line_x">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="index_">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="trailing">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="line">
             <type name="int" c:type="int*"/>
@@ -4384,14 +4397,14 @@
       </method>
       <method name="get_cursor_pos" c:identifier="pango_layout_get_cursor_pos">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="index_">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="strong_pos">
             <type name="PangoRectangle" c:type="PangoRectangle*"/>
@@ -4404,23 +4417,23 @@
       <method name="move_cursor_visually"
               c:identifier="pango_layout_move_cursor_visually">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="strong">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="old_index">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="old_trailing">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="direction">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="new_index">
             <type name="int" c:type="int*"/>
@@ -4432,17 +4445,17 @@
       </method>
       <method name="xy_to_index" c:identifier="pango_layout_xy_to_index">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="layout">
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="x">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="index_">
             <type name="int" c:type="int*"/>
@@ -4454,7 +4467,7 @@
       </method>
       <method name="get_extents" c:identifier="pango_layout_get_extents">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4471,7 +4484,7 @@
       <method name="get_pixel_extents"
               c:identifier="pango_layout_get_pixel_extents">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4487,7 +4500,7 @@
       </method>
       <method name="get_size" c:identifier="pango_layout_get_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4503,7 +4516,7 @@
       </method>
       <method name="get_pixel_size" c:identifier="pango_layout_get_pixel_size">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4519,7 +4532,7 @@
       </method>
       <method name="get_baseline" c:identifier="pango_layout_get_baseline">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4529,7 +4542,7 @@
       </method>
       <method name="get_line_count" c:identifier="pango_layout_get_line_count">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4546,7 +4559,7 @@
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="line">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </method>
@@ -4560,7 +4573,7 @@
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="line">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </method>
@@ -4612,7 +4625,7 @@
       </constructor>
       <method name="unref" c:identifier="pango_layout_line_unref">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="line">
@@ -4622,14 +4635,14 @@
       </method>
       <method name="x_to_index" c:identifier="pango_layout_line_x_to_index">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="line">
             <type name="LayoutLine" c:type="PangoLayoutLine*"/>
           </parameter>
           <parameter name="x_pos">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="index_">
             <type name="int" c:type="int*"/>
@@ -4641,36 +4654,37 @@
       </method>
       <method name="index_to_x" c:identifier="pango_layout_line_index_to_x">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="line">
             <type name="LayoutLine" c:type="PangoLayoutLine*"/>
           </parameter>
           <parameter name="index_">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="trailing">
-            <type name="gboolean" c:type="gboolean"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="x_pos">
             <type name="int" c:type="int*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_x_ranges" c:identifier="pango_layout_line_get_x_ranges">
+      <method name="get_x_ranges"
+              c:identifier="pango_layout_line_get_x_ranges">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="line">
             <type name="LayoutLine" c:type="PangoLayoutLine*"/>
           </parameter>
           <parameter name="start_index">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="end_index">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="ranges">
             <type name="int" c:type="int**"/>
@@ -4682,7 +4696,7 @@
       </method>
       <method name="get_extents" c:identifier="pango_layout_line_get_extents">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="line">
@@ -4699,7 +4713,7 @@
       <method name="get_pixel_extents"
               c:identifier="pango_layout_line_get_pixel_extents">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="layout_line">
@@ -4730,7 +4744,7 @@
       </constructor>
       <method name="free" c:identifier="pango_layout_iter_free">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4740,7 +4754,7 @@
       </method>
       <method name="get_index" c:identifier="pango_layout_iter_get_index">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4790,9 +4804,10 @@
           </parameter>
         </parameters>
       </method>
-      <method name="at_last_line" c:identifier="pango_layout_iter_at_last_line">
+      <method name="at_last_line"
+              c:identifier="pango_layout_iter_at_last_line">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4802,7 +4817,7 @@
       </method>
       <method name="next_char" c:identifier="pango_layout_iter_next_char">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4810,9 +4825,10 @@
           </parameter>
         </parameters>
       </method>
-      <method name="next_cluster" c:identifier="pango_layout_iter_next_cluster">
+      <method name="next_cluster"
+              c:identifier="pango_layout_iter_next_cluster">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4822,7 +4838,7 @@
       </method>
       <method name="next_run" c:identifier="pango_layout_iter_next_run">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4832,7 +4848,7 @@
       </method>
       <method name="next_line" c:identifier="pango_layout_iter_next_line">
         <return-value>
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4843,7 +4859,7 @@
       <method name="get_char_extents"
               c:identifier="pango_layout_iter_get_char_extents">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4857,7 +4873,7 @@
       <method name="get_cluster_extents"
               c:identifier="pango_layout_iter_get_cluster_extents">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4874,7 +4890,7 @@
       <method name="get_run_extents"
               c:identifier="pango_layout_iter_get_run_extents">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4891,7 +4907,7 @@
       <method name="get_line_extents"
               c:identifier="pango_layout_iter_get_line_extents">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4908,7 +4924,7 @@
       <method name="get_line_yrange"
               c:identifier="pango_layout_iter_get_line_yrange">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4925,7 +4941,7 @@
       <method name="get_layout_extents"
               c:identifier="pango_layout_iter_get_layout_extents">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4939,9 +4955,10 @@
           </parameter>
         </parameters>
       </method>
-      <method name="get_baseline" c:identifier="pango_layout_iter_get_baseline">
+      <method name="get_baseline"
+              c:identifier="pango_layout_iter_get_baseline">
         <return-value>
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4958,7 +4975,7 @@
            glib:get-type="pango_renderer_get_type">
       <method name="draw_layout" c:identifier="pango_renderer_draw_layout">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -4968,17 +4985,17 @@
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="x">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="draw_layout_line"
               c:identifier="pango_renderer_draw_layout_line">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -4988,16 +5005,16 @@
             <type name="LayoutLine" c:type="PangoLayoutLine*"/>
           </parameter>
           <parameter name="x">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="draw_glyphs" c:identifier="pango_renderer_draw_glyphs">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5010,17 +5027,17 @@
             <type name="GlyphString" c:type="PangoGlyphString*"/>
           </parameter>
           <parameter name="x">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="draw_rectangle"
               c:identifier="pango_renderer_draw_rectangle">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5030,46 +5047,46 @@
             <type name="RenderPart" c:type="PangoRenderPart"/>
           </parameter>
           <parameter name="x">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="width">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="draw_error_underline"
               c:identifier="pango_renderer_draw_error_underline">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
             <type name="Renderer" c:type="PangoRenderer*"/>
           </parameter>
           <parameter name="x">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="width">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="draw_trapezoid"
               c:identifier="pango_renderer_draw_trapezoid">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5100,7 +5117,7 @@
       </method>
       <method name="draw_glyph" c:identifier="pango_renderer_draw_glyph">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5122,7 +5139,7 @@
       </method>
       <method name="activate" c:identifier="pango_renderer_activate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5132,7 +5149,7 @@
       </method>
       <method name="deactivate" c:identifier="pango_renderer_deactivate">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5142,7 +5159,7 @@
       </method>
       <method name="part_changed" c:identifier="pango_renderer_part_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5155,7 +5172,7 @@
       </method>
       <method name="set_color" c:identifier="pango_renderer_set_color">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5184,7 +5201,7 @@
       </method>
       <method name="set_matrix" c:identifier="pango_renderer_set_matrix">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5228,7 +5245,7 @@
       </method>
       <callback name="draw_glyphs">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5241,16 +5258,16 @@
             <type name="PangoGlyphString*" c:type="PangoGlyphString*"/>
           </parameter>
           <parameter name="x">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_rectangle">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5260,44 +5277,44 @@
             <type name="PangoRenderPart" c:type="PangoRenderPart"/>
           </parameter>
           <parameter name="x">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="width">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_error_underline">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
             <type name="PangoRenderer*" c:type="PangoRenderer*"/>
           </parameter>
           <parameter name="x">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="width">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_shape">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5307,16 +5324,16 @@
             <type name="PangoAttrShape*" c:type="PangoAttrShape*"/>
           </parameter>
           <parameter name="x">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="draw_trapezoid">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5347,7 +5364,7 @@
       </callback>
       <callback name="draw_glyph">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5369,7 +5386,7 @@
       </callback>
       <callback name="part_changed">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5382,7 +5399,7 @@
       </callback>
       <callback name="begin">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5392,7 +5409,7 @@
       </callback>
       <callback name="end">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5402,7 +5419,7 @@
       </callback>
       <callback name="prepare_run">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="renderer">
@@ -5415,22 +5432,22 @@
       </callback>
       <callback name="_pango_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_pango_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_pango_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_pango_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
@@ -5440,23 +5457,23 @@
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
     <function name="trim_string" c:identifier="pango_trim_string">
       <return-value>
-        <type name="char*" c:type="char*"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
     <function name="read_line" c:identifier="pango_read_line">
       <return-value>
-        <type name="gint" c:type="gint"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="stream">
@@ -5469,7 +5486,7 @@
     </function>
     <function name="skip_space" c:identifier="pango_skip_space">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="pos">
@@ -5479,7 +5496,7 @@
     </function>
     <function name="scan_word" c:identifier="pango_scan_word">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="pos">
@@ -5492,7 +5509,7 @@
     </function>
     <function name="scan_string" c:identifier="pango_scan_string">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="pos">
@@ -5505,7 +5522,7 @@
     </function>
     <function name="scan_int" c:identifier="pango_scan_int">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="pos">
@@ -5518,20 +5535,20 @@
     </function>
     <function name="parse_enum" c:identifier="pango_parse_enum">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="type">
           <type name="GType" c:type="GType"/>
         </parameter>
         <parameter name="str">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="value">
           <type name="int" c:type="int*"/>
         </parameter>
         <parameter name="warn">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="possible_values">
           <type name="char" c:type="char**"/>
@@ -5540,72 +5557,72 @@
     </function>
     <function name="parse_style" c:identifier="pango_parse_style">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="style">
           <type name="Style" c:type="PangoStyle*"/>
         </parameter>
         <parameter name="warn">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="parse_variant" c:identifier="pango_parse_variant">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="variant">
           <type name="Variant" c:type="PangoVariant*"/>
         </parameter>
         <parameter name="warn">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="parse_weight" c:identifier="pango_parse_weight">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="weight">
           <type name="Weight" c:type="PangoWeight*"/>
         </parameter>
         <parameter name="warn">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="parse_stretch" c:identifier="pango_parse_stretch">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="str">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="stretch">
           <type name="Stretch" c:type="PangoStretch*"/>
         </parameter>
         <parameter name="warn">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <function name="quantize_line_geometry"
               c:identifier="pango_quantize_line_geometry">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="thickness">
@@ -5623,10 +5640,10 @@
       </return-value>
       <parameters>
         <parameter name="text">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="pbase_dir">
           <type name="Direction" c:type="PangoDirection*"/>
@@ -5635,7 +5652,7 @@
     </function>
     <function name="is_zero_width" c:identifier="pango_is_zero_width">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="ch">
@@ -5645,27 +5662,27 @@
     </function>
     <function name="version" c:identifier="pango_version">
       <return-value>
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </return-value>
     </function>
     <function name="version_string" c:identifier="pango_version_string">
       <return-value>
-        <type name="char*" c:type="char*"/>
+        <type name="string" c:type="char*"/>
       </return-value>
     </function>
     <function name="version_check" c:identifier="pango_version_check">
       <return-value>
-        <type name="char*" c:type="char*"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
         <parameter name="required_major">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="required_minor">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="required_micro">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -5673,7 +5690,7 @@
     <record name="PangoCairoFontMap" c:type="PangoCairoFontMap"/>
     <callback name="PangoCairoShapeRendererFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -5683,10 +5700,10 @@
           <type name="PangoAttrShape*" c:type="PangoAttrShape*"/>
         </parameter>
         <parameter name="do_path">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
@@ -5696,7 +5713,8 @@
         <type name="GType" c:type="GType"/>
       </return-value>
     </function>
-    <function name="cairo_font_map_new" c:identifier="pango_cairo_font_map_new">
+    <function name="cairo_font_map_new"
+              c:identifier="pango_cairo_font_map_new">
       <return-value>
         <type name="PangoFontMap*" c:type="PangoFontMap*"/>
       </return-value>
@@ -5718,17 +5736,6 @@
         <type name="PangoFontMap*" c:type="PangoFontMap*"/>
       </return-value>
     </function>
-    <function name="cairo_font_map_set_default"
-              c:identifier="pango_cairo_font_map_set_default">
-      <return-value>
-        <type name="void" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="fontmap">
-          <type name="PangoCairoFontMap" c:type="PangoCairoFontMap*"/>
-        </parameter>
-      </parameters>
-    </function>
     <function name="cairo_font_map_get_font_type"
               c:identifier="pango_cairo_font_map_get_font_type">
       <return-value>
@@ -5743,7 +5750,7 @@
     <function name="cairo_font_map_set_resolution"
               c:identifier="pango_cairo_font_map_set_resolution">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="fontmap">
@@ -5796,7 +5803,7 @@
     <function name="cairo_update_context"
               c:identifier="pango_cairo_update_context">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -5810,7 +5817,7 @@
     <function name="cairo_context_set_font_options"
               c:identifier="pango_cairo_context_set_font_options">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -5835,7 +5842,7 @@
     <function name="cairo_context_set_resolution"
               c:identifier="pango_cairo_context_set_resolution">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -5860,7 +5867,7 @@
     <function name="cairo_context_set_shape_renderer"
               c:identifier="pango_cairo_context_set_shape_renderer">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -5868,10 +5875,10 @@
         </parameter>
         <parameter name="func">
           <type name="PangoCairoShapeRendererFunc"
-                  c:type="PangoCairoShapeRendererFunc"/>
+                c:type="PangoCairoShapeRendererFunc"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="dnotify">
           <type name="GDestroyNotify" c:type="GDestroyNotify"/>
@@ -5882,7 +5889,7 @@
               c:identifier="pango_cairo_context_get_shape_renderer">
       <return-value>
         <type name="PangoCairoShapeRendererFunc"
-                c:type="PangoCairoShapeRendererFunc"/>
+              c:type="PangoCairoShapeRendererFunc"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -5893,17 +5900,6 @@
         </parameter>
       </parameters>
     </function>
-    <function name="cairo_create_context"
-              c:identifier="pango_cairo_create_context">
-      <return-value>
-        <type name="PangoContext*" c:type="PangoContext*"/>
-      </return-value>
-      <parameters>
-        <parameter name="cr">
-          <type name="cairo_t" c:type="cairo_t*"/>
-        </parameter>
-      </parameters>
-    </function>
     <function name="cairo_create_layout"
               c:identifier="pango_cairo_create_layout">
       <return-value>
@@ -5918,7 +5914,7 @@
     <function name="cairo_update_layout"
               c:identifier="pango_cairo_update_layout">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -5932,7 +5928,7 @@
     <function name="cairo_show_glyph_string"
               c:identifier="pango_cairo_show_glyph_string">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -5949,7 +5945,7 @@
     <function name="cairo_show_layout_line"
               c:identifier="pango_cairo_show_layout_line">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -5962,7 +5958,7 @@
     </function>
     <function name="cairo_show_layout" c:identifier="pango_cairo_show_layout">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -5976,7 +5972,7 @@
     <function name="cairo_show_error_underline"
               c:identifier="pango_cairo_show_error_underline">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -5999,7 +5995,7 @@
     <function name="cairo_glyph_string_path"
               c:identifier="pango_cairo_glyph_string_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -6016,7 +6012,7 @@
     <function name="cairo_layout_line_path"
               c:identifier="pango_cairo_layout_line_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -6029,7 +6025,7 @@
     </function>
     <function name="cairo_layout_path" c:identifier="pango_cairo_layout_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -6043,7 +6039,7 @@
     <function name="cairo_error_underline_path"
               c:identifier="pango_cairo_error_underline_path">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cr">
@@ -6082,7 +6078,7 @@
     <function name="fc_font_unlock_face"
               c:identifier="pango_fc_font_unlock_face">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="font">
@@ -6119,28 +6115,28 @@
             <type name="PangoFcFont*" c:type="PangoFcFont*"/>
           </parameter>
           <parameter name="wc">
-            <type name="guint32" c:type="guint32"/>
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="_pango_reserved1">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_pango_reserved2">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_pango_reserved3">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
       <callback name="_pango_reserved4">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </record>
@@ -6177,7 +6173,7 @@
           <type name="PangoFcFont" c:type="PangoFcFont*"/>
         </parameter>
         <parameter name="wc">
-          <type name="guint32" c:type="guint32"/>
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
@@ -6198,14 +6194,14 @@
           <type name="FcPattern*" c:type="FcPattern*"/>
         </parameter>
         <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
     <function name="fc_font_map_add_decoder_find_func"
               c:identifier="pango_fc_font_map_add_decoder_find_func">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="fcfontmap">
@@ -6215,7 +6211,7 @@
           <type name="PangoFcDecoderFindFunc" c:type="PangoFcDecoderFindFunc"/>
         </parameter>
         <parameter name="user_data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="dnotify">
           <type name="GDestroyNotify" c:type="GDestroyNotify"/>
@@ -6232,27 +6228,27 @@
           <type name="FcPattern" c:type="FcPattern*"/>
         </parameter>
         <parameter name="include_size">
-          <type name="gboolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
     <record name="PangoFT2FontMap" c:type="PangoFT2FontMap"/>
     <callback name="PangoFT2SubstituteFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
           <type name="FcPattern*" c:type="FcPattern*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
     <function name="ft2_render" c:identifier="pango_ft2_render">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="bitmap">
@@ -6265,17 +6261,17 @@
           <type name="GlyphString" c:type="PangoGlyphString*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="ft2_render_transformed"
               c:identifier="pango_ft2_render_transformed">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="bitmap">
@@ -6291,17 +6287,17 @@
           <type name="GlyphString" c:type="PangoGlyphString*"/>
         </parameter>
         <parameter name="x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="ft2_render_layout_line"
               c:identifier="pango_ft2_render_layout_line">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="bitmap">
@@ -6311,17 +6307,17 @@
           <type name="LayoutLine" c:type="PangoLayoutLine*"/>
         </parameter>
         <parameter name="x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="ft2_render_layout_line_subpixel"
               c:identifier="pango_ft2_render_layout_line_subpixel">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="bitmap">
@@ -6331,16 +6327,16 @@
           <type name="LayoutLine" c:type="PangoLayoutLine*"/>
         </parameter>
         <parameter name="x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="ft2_render_layout" c:identifier="pango_ft2_render_layout">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="bitmap">
@@ -6350,17 +6346,17 @@
           <type name="Layout" c:type="PangoLayout*"/>
         </parameter>
         <parameter name="x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="ft2_render_layout_subpixel"
               c:identifier="pango_ft2_render_layout_subpixel">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="bitmap">
@@ -6370,10 +6366,10 @@
           <type name="Layout" c:type="PangoLayout*"/>
         </parameter>
         <parameter name="x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -6391,7 +6387,7 @@
     <function name="ft2_font_map_set_resolution"
               c:identifier="pango_ft2_font_map_set_resolution">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="fontmap">
@@ -6408,7 +6404,7 @@
     <function name="ft2_font_map_set_default_substitute"
               c:identifier="pango_ft2_font_map_set_default_substitute">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="fontmap">
@@ -6418,7 +6414,7 @@
           <type name="PangoFT2SubstituteFunc" c:type="PangoFT2SubstituteFunc"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="notify">
           <type name="GDestroyNotify" c:type="GDestroyNotify"/>
@@ -6428,7 +6424,7 @@
     <function name="ft2_font_map_substitute_changed"
               c:identifier="pango_ft2_font_map_substitute_changed">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="fontmap">
@@ -6469,7 +6465,7 @@
     <function name="ft2_shutdown_display"
               c:identifier="pango_ft2_shutdown_display">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
     <function name="ft2_get_unknown_glyph"
@@ -6486,7 +6482,7 @@
     <function name="ft2_font_get_kerning"
               c:identifier="pango_ft2_font_get_kerning">
       <return-value>
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="font">
@@ -6532,18 +6528,18 @@
         <type name="Display*" c:type="Display*"/>
       </field>
       <field name="screen">
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </field>
       <field name="draw">
         <type name="XftDraw*" c:type="XftDraw*"/>
       </field>
       <field name="priv">
         <type name="PangoXftRendererPrivate*"
-                c:type="PangoXftRendererPrivate*"/>
+              c:type="PangoXftRendererPrivate*"/>
       </field>
       <callback name="composite_trapezoids">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="xftrenderer">
@@ -6556,13 +6552,13 @@
             <type name="XTrapezoid*" c:type="XTrapezoid*"/>
           </parameter>
           <parameter name="n_trapezoids">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="composite_glyphs">
         <return-value>
-          <type name="void" c:type="void"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="xftrenderer">
@@ -6575,7 +6571,7 @@
             <type name="XftGlyphSpec*" c:type="XftGlyphSpec*"/>
           </parameter>
           <parameter name="n_glyphs">
-            <type name="int" c:type="int"/>
+            <type name="int32" c:type="int"/>
           </parameter>
         </parameters>
       </callback>
@@ -6596,14 +6592,14 @@
           <type name="Display" c:type="Display*"/>
         </parameter>
         <parameter name="screen">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="xft_renderer_set_draw"
               c:identifier="pango_xft_renderer_set_draw">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="xftrenderer">
@@ -6617,7 +6613,7 @@
     <function name="xft_renderer_set_default_color"
               c:identifier="pango_xft_renderer_set_default_color">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="xftrenderer">
@@ -6630,7 +6626,7 @@
     </function>
     <function name="xft_render" c:identifier="pango_xft_render">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="draw">
@@ -6646,16 +6642,17 @@
           <type name="GlyphString" c:type="PangoGlyphString*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="xft_picture_render" c:identifier="pango_xft_picture_render">
+    <function name="xft_picture_render"
+              c:identifier="pango_xft_picture_render">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -6674,17 +6671,17 @@
           <type name="GlyphString" c:type="PangoGlyphString*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="xft_render_transformed"
               c:identifier="pango_xft_render_transformed">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="draw">
@@ -6703,17 +6700,17 @@
           <type name="GlyphString" c:type="PangoGlyphString*"/>
         </parameter>
         <parameter name="x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="xft_render_layout_line"
               c:identifier="pango_xft_render_layout_line">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="draw">
@@ -6726,16 +6723,16 @@
           <type name="LayoutLine" c:type="PangoLayoutLine*"/>
         </parameter>
         <parameter name="x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="xft_render_layout" c:identifier="pango_xft_render_layout">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="draw">
@@ -6748,10 +6745,10 @@
           <type name="Layout" c:type="PangoLayout*"/>
         </parameter>
         <parameter name="x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -6759,14 +6756,14 @@
     <record name="PangoXftFont" c:type="PangoXftFont"/>
     <callback name="PangoXftSubstituteFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
           <type name="FcPattern*" c:type="FcPattern*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
@@ -6779,7 +6776,7 @@
           <type name="Display" c:type="Display*"/>
         </parameter>
         <parameter name="screen">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -6792,41 +6789,41 @@
           <type name="Display" c:type="Display*"/>
         </parameter>
         <parameter name="screen">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="xft_shutdown_display"
               c:identifier="pango_xft_shutdown_display">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="display">
           <type name="Display" c:type="Display*"/>
         </parameter>
         <parameter name="screen">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="xft_set_default_substitute"
               c:identifier="pango_xft_set_default_substitute">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="display">
           <type name="Display" c:type="Display*"/>
         </parameter>
         <parameter name="screen">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="func">
           <type name="PangoXftSubstituteFunc" c:type="PangoXftSubstituteFunc"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="notify">
           <type name="GDestroyNotify" c:type="GDestroyNotify"/>
@@ -6836,14 +6833,14 @@
     <function name="xft_substitute_changed"
               c:identifier="pango_xft_substitute_changed">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="display">
           <type name="Display" c:type="Display*"/>
         </parameter>
         <parameter name="screen">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -6876,7 +6873,7 @@
     </callback>
     <callback name="PangoFreeGCFunc">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -6900,7 +6897,7 @@
     <function name="x_context_set_funcs"
               c:identifier="pango_x_context_set_funcs">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -6923,13 +6920,13 @@
           <type name="Display" c:type="Display*"/>
         </parameter>
         <parameter name="spec">
-          <type name="gchar" c:type="gchar*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
     <function name="x_render" c:identifier="pango_x_render">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -6948,17 +6945,17 @@
           <type name="GlyphString" c:type="PangoGlyphString*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint"/>
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="x_render_layout_line"
               c:identifier="pango_x_render_layout_line">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -6974,16 +6971,16 @@
           <type name="LayoutLine" c:type="PangoLayoutLine*"/>
         </parameter>
         <parameter name="x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="x_render_layout" c:identifier="pango_x_render_layout">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -6999,16 +6996,16 @@
           <type name="Layout" c:type="PangoLayout*"/>
         </parameter>
         <parameter name="x">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="x_list_subfonts" c:identifier="pango_x_list_subfonts">
       <return-value>
-        <type name="int" c:type="int"/>
+        <type name="int32" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="font">
@@ -7018,7 +7015,7 @@
           <type name="char" c:type="char**"/>
         </parameter>
         <parameter name="n_charsets">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="subfont_ids">
           <type name="PangoXSubfont" c:type="PangoXSubfont**"/>
@@ -7030,7 +7027,7 @@
     </function>
     <function name="x_has_glyph" c:identifier="pango_x_has_glyph">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="font">
@@ -7065,7 +7062,7 @@
     </function>
     <function name="x_font_cache_free" c:identifier="pango_x_font_cache_free">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cache">
@@ -7082,14 +7079,14 @@
           <type name="PangoXFontCache" c:type="PangoXFontCache*"/>
         </parameter>
         <parameter name="xlfd">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
       </parameters>
     </function>
     <function name="x_font_cache_unload"
               c:identifier="pango_x_font_cache_unload">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="cache">
@@ -7111,9 +7108,10 @@
         </parameter>
       </parameters>
     </function>
-    <function name="x_shutdown_display" c:identifier="pango_x_shutdown_display">
+    <function name="x_shutdown_display"
+              c:identifier="pango_x_shutdown_display">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -7135,7 +7133,7 @@
     <function name="x_font_subfont_xlfd"
               c:identifier="pango_x_font_subfont_xlfd">
       <return-value>
-        <type name="char*" c:type="char*"/>
+        <type name="string" c:type="char*"/>
       </return-value>
       <parameters>
         <parameter name="font">
@@ -7149,7 +7147,7 @@
     <function name="x_find_first_subfont"
               c:identifier="pango_x_find_first_subfont">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="font">
@@ -7159,7 +7157,7 @@
           <type name="char" c:type="char**"/>
         </parameter>
         <parameter name="n_charsets">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="rfont">
           <type name="PangoXSubfont" c:type="PangoXSubfont*"/>
@@ -7168,7 +7166,7 @@
     </function>
     <function name="x_fallback_shape" c:identifier="pango_x_fallback_shape">
       <return-value>
-        <type name="void" c:type="void"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="font">
@@ -7178,16 +7176,16 @@
           <type name="GlyphString" c:type="PangoGlyphString*"/>
         </parameter>
         <parameter name="text">
-          <type name="char" c:type="char*"/>
+          <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="n_chars">
-          <type name="int" c:type="int"/>
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="x_apply_ligatures" c:identifier="pango_x_apply_ligatures">
       <return-value>
-        <type name="gboolean" c:type="gboolean"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="font">
-- 
2.11.4.GIT