gir-repository r20 - trunk/gir



Author: walters
Date: Thu Aug 14 16:13:47 2008
New Revision: 20
URL: http://svn.gnome.org/viewvc/gir-repository?rev=20&view=rev

Log:
Regenerate.



Modified:
   trunk/gir/atk.gir
   trunk/gir/gdk-x11-2.0.gir
   trunk/gir/gtk-x11-2.0.gir

Modified: trunk/gir/atk.gir
==============================================================================
--- trunk/gir/atk.gir	(original)
+++ trunk/gir/atk.gir	Thu Aug 14 16:13:47 2008
@@ -3,6 +3,8 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="Atk">
+    <alias name="AtkState" target="guint64"/>
+    <alias name="AtkAttributeSet" target="GSList"/>
     <enumeration name="StateType"
                  c:type="AtkStateType"
                  glib:type-name="AtkStateType"
@@ -171,7 +173,7 @@
     <function name="state_type_register"
               c:identifier="atk_state_type_register">
       <return-value>
-        <type name="AtkStateType" c:type="AtkStateType"/>
+        <type name="StateType" c:type="AtkStateType"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -186,14 +188,14 @@
       </return-value>
       <parameters>
         <parameter name="type">
-          <type name="AtkStateType" c:type="AtkStateType"/>
+          <type name="StateType" c:type="AtkStateType"/>
         </parameter>
       </parameters>
     </function>
     <function name="state_type_for_name"
               c:identifier="atk_state_type_for_name">
       <return-value>
-        <type name="AtkStateType" c:type="AtkStateType"/>
+        <type name="StateType" c:type="AtkStateType"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -637,7 +639,7 @@
     </enumeration>
     <function name="role_register" c:identifier="atk_role_register">
       <return-value>
-        <type name="AtkRole" c:type="AtkRole"/>
+        <type name="Role" c:type="AtkRole"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -693,11 +695,11 @@
     <record name="AtkImplementor" c:type="AtkImplementor">
       <callback name="ref_accessible">
         <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="implementor">
-            <type name="AtkImplementor*" c:type="AtkImplementor*"/>
+            <type name="AtkImplementor" c:type="AtkImplementor*"/>
           </parameter>
         </parameters>
       </callback>
@@ -719,16 +721,16 @@
       </return-value>
       <parameters>
         <parameter>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </parameter>
         <parameter>
-          <type name="AtkPropertyValues*" c:type="AtkPropertyValues*"/>
+          <type name="AtkPropertyValues" c:type="AtkPropertyValues*"/>
         </parameter>
       </parameters>
     </callback>
     <class name="Object"
            c:type="AtkObject"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="AtkObject"
            glib:get-type="atk_object_get_type">
       <constructor name="get_parent" c:identifier="atk_object_get_parent">
@@ -765,7 +767,7 @@
             <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
           </parameter>
           <parameter name="obj">
-            <type name="GLib.Object" c:type="GObject*"/>
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -803,7 +805,7 @@
       <method name="ref_relation_set"
               c:identifier="atk_object_ref_relation_set">
         <return-value>
-          <type name="AtkRelationSet" c:type="AtkRelationSet*"/>
+          <type name="RelationSet" c:type="AtkRelationSet*"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
@@ -813,7 +815,7 @@
       </method>
       <method name="get_role" c:identifier="atk_object_get_role">
         <return-value>
-          <type name="AtkRole" c:type="AtkRole"/>
+          <type name="Role" c:type="AtkRole"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
@@ -823,7 +825,7 @@
       </method>
       <method name="get_layer" c:identifier="atk_object_get_layer">
         <return-value>
-          <type name="AtkLayer" c:type="AtkLayer"/>
+          <type name="Layer" c:type="AtkLayer"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
@@ -853,7 +855,7 @@
       </method>
       <method name="ref_state_set" c:identifier="atk_object_ref_state_set">
         <return-value>
-          <type name="AtkStateSet" c:type="AtkStateSet*"/>
+          <type name="StateSet" c:type="AtkStateSet*"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
@@ -920,14 +922,14 @@
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="role">
-            <type name="AtkRole" c:type="AtkRole"/>
+            <type name="Role" c:type="AtkRole"/>
           </parameter>
         </parameters>
       </method>
       <method name="connect_property_change_handler"
               c:identifier="atk_object_connect_property_change_handler">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
@@ -949,7 +951,7 @@
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="handler_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -993,7 +995,7 @@
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="relationship">
-            <type name="AtkRelationType" c:type="AtkRelationType"/>
+            <type name="RelationType" c:type="AtkRelationType"/>
           </parameter>
           <parameter name="target">
             <type name="Object" c:type="AtkObject*"/>
@@ -1010,7 +1012,7 @@
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="relationship">
-            <type name="AtkRelationType" c:type="AtkRelationType"/>
+            <type name="RelationType" c:type="AtkRelationType"/>
           </parameter>
           <parameter name="target">
             <type name="Object" c:type="AtkObject*"/>
@@ -1024,7 +1026,7 @@
         <type name="string" c:type="gchararray"/>
       </property>
       <property name="accessible-parent">
-        <type name="AtkObject" c:type="AtkObject"/>
+        <type name="Object" c:type="AtkObject"/>
       </property>
       <property name="accessible-value">
         <type name="double" c:type="gdouble"/>
@@ -1045,19 +1047,19 @@
         <type name="string" c:type="gchararray"/>
       </property>
       <property name="accessible-table-column-header">
-        <type name="AtkObject" c:type="AtkObject"/>
+        <type name="Object" c:type="AtkObject"/>
       </property>
       <property name="accessible-table-row-description">
         <type name="string" c:type="gchararray"/>
       </property>
       <property name="accessible-table-row-header">
-        <type name="AtkObject" c:type="AtkObject"/>
+        <type name="Object" c:type="AtkObject"/>
       </property>
       <property name="accessible-table-summary">
-        <type name="AtkObject" c:type="AtkObject"/>
+        <type name="Object" c:type="AtkObject"/>
       </property>
       <property name="accessible-table-caption-object">
-        <type name="AtkObject" c:type="AtkObject"/>
+        <type name="Object" c:type="AtkObject"/>
       </property>
       <property name="accessible-hypertext-nlinks">
         <type name="int32" c:type="gint"/>
@@ -1068,7 +1070,7 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1078,17 +1080,17 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_parent">
         <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1098,17 +1100,17 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="ref_child">
         <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="i">
             <type name="int32" c:type="gint"/>
@@ -1121,37 +1123,37 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="ref_relation_set">
         <return-value>
-          <type name="AtkRelationSet*" c:type="AtkRelationSet*"/>
+          <type name="RelationSet" c:type="AtkRelationSet*"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_role">
         <return-value>
-          <type name="AtkRole" c:type="AtkRole"/>
+          <type name="Role" c:type="AtkRole"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_layer">
         <return-value>
-          <type name="AtkLayer" c:type="AtkLayer"/>
+          <type name="Layer" c:type="AtkLayer"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1161,17 +1163,17 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="ref_state_set">
         <return-value>
-          <type name="AtkStateSet*" c:type="AtkStateSet*"/>
+          <type name="StateSet" c:type="AtkStateSet*"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1181,7 +1183,7 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="name">
             <type name="string" c:type="gchar*"/>
@@ -1194,7 +1196,7 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="description">
             <type name="string" c:type="gchar*"/>
@@ -1207,10 +1209,10 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="parent">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1220,23 +1222,23 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="role">
-            <type name="AtkRole" c:type="AtkRole"/>
+            <type name="Role" c:type="AtkRole"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="connect_property_change_handler">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="handler">
-            <type name="AtkPropertyChangeHandler*"
+            <type name="AtkPropertyChangeHandler"
                   c:type="AtkPropertyChangeHandler*"/>
           </parameter>
         </parameters>
@@ -1247,10 +1249,10 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="handler_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
@@ -1260,7 +1262,7 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="data">
             <type name="any" c:type="gpointer"/>
@@ -1273,10 +1275,10 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="change_index">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="changed_child">
             <type name="any" c:type="gpointer"/>
@@ -1289,7 +1291,7 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="focus_in">
             <type name="boolean" c:type="gboolean"/>
@@ -1302,10 +1304,10 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="values">
-            <type name="AtkPropertyValues*" c:type="AtkPropertyValues*"/>
+            <type name="AtkPropertyValues" c:type="AtkPropertyValues*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1315,7 +1317,7 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="name">
             <type name="string" c:type="gchar*"/>
@@ -1331,7 +1333,7 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1341,20 +1343,20 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="child">
-            <type name="gpointer*" c:type="gpointer*"/>
+            <type name="gpointer" c:type="gpointer*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_attributes">
         <return-value>
-          <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
+          <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1370,7 +1372,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="p0">
             <type name="any" c:type="gpointer"/>
@@ -1434,7 +1436,7 @@
     <function name="implementor_ref_accessible"
               c:identifier="atk_implementor_ref_accessible">
       <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
+        <type name="Object" c:type="AtkObject*"/>
       </return-value>
       <parameters>
         <parameter name="implementor">
@@ -1448,13 +1450,13 @@
       </return-value>
       <parameters>
         <parameter name="role">
-          <type name="AtkRole" c:type="AtkRole"/>
+          <type name="Role" c:type="AtkRole"/>
         </parameter>
       </parameters>
     </function>
     <function name="role_for_name" c:identifier="atk_role_for_name">
       <return-value>
-        <type name="AtkRole" c:type="AtkRole"/>
+        <type name="Role" c:type="AtkRole"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -1469,7 +1471,7 @@
       </return-value>
       <parameters>
         <parameter name="role">
-          <type name="AtkRole" c:type="AtkRole"/>
+          <type name="Role" c:type="AtkRole"/>
         </parameter>
       </parameters>
     </function>
@@ -1484,7 +1486,7 @@
         </return-value>
         <parameters>
           <parameter name="action">
-            <type name="AtkAction*" c:type="AtkAction*"/>
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
           <parameter name="i">
             <type name="int32" c:type="gint"/>
@@ -1497,7 +1499,7 @@
         </return-value>
         <parameters>
           <parameter name="action">
-            <type name="AtkAction*" c:type="AtkAction*"/>
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1507,7 +1509,7 @@
         </return-value>
         <parameters>
           <parameter name="action">
-            <type name="AtkAction*" c:type="AtkAction*"/>
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
           <parameter name="i">
             <type name="int32" c:type="gint"/>
@@ -1520,7 +1522,7 @@
         </return-value>
         <parameters>
           <parameter name="action">
-            <type name="AtkAction*" c:type="AtkAction*"/>
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
           <parameter name="i">
             <type name="int32" c:type="gint"/>
@@ -1533,7 +1535,7 @@
         </return-value>
         <parameters>
           <parameter name="action">
-            <type name="AtkAction*" c:type="AtkAction*"/>
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
           <parameter name="i">
             <type name="int32" c:type="gint"/>
@@ -1546,7 +1548,7 @@
         </return-value>
         <parameters>
           <parameter name="action">
-            <type name="AtkAction*" c:type="AtkAction*"/>
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
           <parameter name="i">
             <type name="int32" c:type="gint"/>
@@ -1562,7 +1564,7 @@
         </return-value>
         <parameters>
           <parameter name="action">
-            <type name="AtkAction*" c:type="AtkAction*"/>
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
           <parameter name="i">
             <type name="int32" c:type="gint"/>
@@ -1674,10 +1676,10 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="state">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="keyval">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="length">
         <type name="int32" c:type="gint"/>
@@ -1698,7 +1700,7 @@
       </return-value>
       <parameters>
         <parameter name="obj">
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </parameter>
       </parameters>
     </callback>
@@ -1713,7 +1715,7 @@
       </return-value>
       <parameters>
         <parameter name="event">
-          <type name="AtkKeyEventStruct*" c:type="AtkKeyEventStruct*"/>
+          <type name="AtkKeyEventStruct" c:type="AtkKeyEventStruct*"/>
         </parameter>
         <parameter name="func_data">
           <type name="any" c:type="gpointer"/>
@@ -1739,16 +1741,17 @@
     </enumeration>
     <class name="Util"
            c:type="AtkUtil"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="AtkUtil"
            glib:get-type="atk_util_get_type">
       <callback name="add_global_event_listener">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="listener">
-            <type name="GSignalEmissionHook" c:type="GSignalEmissionHook"/>
+            <type name="GObject.GSignalEmissionHook"
+                  c:type="GSignalEmissionHook"/>
           </parameter>
           <parameter name="event_type">
             <type name="string" c:type="gchar*"/>
@@ -1761,13 +1764,13 @@
         </return-value>
         <parameters>
           <parameter name="listener_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="add_key_event_listener">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="listener">
@@ -1784,13 +1787,13 @@
         </return-value>
         <parameters>
           <parameter name="listener_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_root">
         <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
       </callback>
       <callback name="get_toolkit_name">
@@ -1819,7 +1822,7 @@
     </enumeration>
     <function name="add_focus_tracker" c:identifier="atk_add_focus_tracker">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="focus_tracker">
@@ -1834,7 +1837,7 @@
       </return-value>
       <parameters>
         <parameter name="tracker_id">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -1862,11 +1865,12 @@
     <function name="add_global_event_listener"
               c:identifier="atk_add_global_event_listener">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="listener">
-          <type name="GSignalEmissionHook" c:type="GSignalEmissionHook"/>
+          <type name="GObject.GSignalEmissionHook"
+                c:type="GSignalEmissionHook"/>
         </parameter>
         <parameter name="event_type">
           <type name="string" c:type="gchar*"/>
@@ -1880,14 +1884,14 @@
       </return-value>
       <parameters>
         <parameter name="listener_id">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="add_key_event_listener"
               c:identifier="atk_add_key_event_listener">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="listener">
@@ -1905,18 +1909,18 @@
       </return-value>
       <parameters>
         <parameter name="listener_id">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="get_root" c:identifier="atk_get_root">
       <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
+        <type name="Object" c:type="AtkObject*"/>
       </return-value>
     </function>
     <function name="get_focus_object" c:identifier="atk_get_focus_object">
       <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
+        <type name="Object" c:type="AtkObject*"/>
       </return-value>
     </function>
     <function name="get_toolkit_name" c:identifier="atk_get_toolkit_name">
@@ -1942,7 +1946,7 @@
       </return-value>
       <parameters>
         <parameter>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </parameter>
         <parameter>
           <type name="boolean" c:type="gboolean"/>
@@ -1960,11 +1964,11 @@
                glib:get-type="atk_component_get_type">
       <callback name="add_focus_handler">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="handler">
             <type name="AtkFocusHandler" c:type="AtkFocusHandler"/>
@@ -1977,7 +1981,7 @@
         </return-value>
         <parameters>
           <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -1986,17 +1990,17 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="ref_accessible_at_point">
         <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -2005,7 +2009,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
@@ -2015,22 +2019,22 @@
         </return-value>
         <parameters>
           <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
@@ -2040,16 +2044,16 @@
         </return-value>
         <parameters>
           <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
@@ -2059,13 +2063,13 @@
         </return-value>
         <parameters>
           <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2075,7 +2079,7 @@
         </return-value>
         <parameters>
           <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2085,10 +2089,10 @@
         </return-value>
         <parameters>
           <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="handler_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
@@ -2098,7 +2102,7 @@
         </return-value>
         <parameters>
           <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -2113,7 +2117,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
@@ -2123,7 +2127,7 @@
         </return-value>
         <parameters>
           <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -2132,7 +2136,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
@@ -2142,7 +2146,7 @@
         </return-value>
         <parameters>
           <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="width">
             <type name="int32" c:type="gint"/>
@@ -2154,11 +2158,11 @@
       </callback>
       <callback name="get_layer">
         <return-value>
-          <type name="AtkLayer" c:type="AtkLayer"/>
+          <type name="Layer" c:type="AtkLayer"/>
         </return-value>
         <parameters>
           <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2168,7 +2172,7 @@
         </return-value>
         <parameters>
           <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2178,10 +2182,10 @@
         </return-value>
         <parameters>
           <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="bounds">
-            <type name="AtkRectangle*" c:type="AtkRectangle*"/>
+            <type name="Rectangle" c:type="AtkRectangle*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2191,7 +2195,7 @@
         </return-value>
         <parameters>
           <parameter name="component">
-            <type name="AtkComponent*" c:type="AtkComponent*"/>
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2201,7 +2205,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="AtkRectangle" c:type="AtkRectangle"/>
+            <type name="Rectangle" c:type="AtkRectangle"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -2209,7 +2213,7 @@
     <function name="component_add_focus_handler"
               c:identifier="atk_component_add_focus_handler">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="component">
@@ -2235,14 +2239,14 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
+          <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
       </parameters>
     </function>
     <function name="component_ref_accessible_at_point"
               c:identifier="atk_component_ref_accessible_at_point">
       <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
+        <type name="Object" c:type="AtkObject*"/>
       </return-value>
       <parameters>
         <parameter name="component">
@@ -2255,7 +2259,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
+          <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
       </parameters>
     </function>
@@ -2269,19 +2273,19 @@
           <type name="Component" c:type="AtkComponent*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
+          <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
       </parameters>
     </function>
@@ -2295,13 +2299,13 @@
           <type name="Component" c:type="AtkComponent*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
+          <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
       </parameters>
     </function>
@@ -2314,17 +2318,17 @@
           <type name="Component" c:type="AtkComponent*"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
     <function name="component_get_layer"
               c:identifier="atk_component_get_layer">
       <return-value>
-        <type name="AtkLayer" c:type="AtkLayer"/>
+        <type name="Layer" c:type="AtkLayer"/>
       </return-value>
       <parameters>
         <parameter name="component">
@@ -2364,7 +2368,7 @@
           <type name="Component" c:type="AtkComponent*"/>
         </parameter>
         <parameter name="handler_id">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -2390,7 +2394,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
+          <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
       </parameters>
     </function>
@@ -2410,7 +2414,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
+          <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
       </parameters>
     </function>
@@ -2452,7 +2456,7 @@
         </return-value>
         <parameters>
           <parameter name="document">
-            <type name="AtkDocument*" c:type="AtkDocument*"/>
+            <type name="Document" c:type="AtkDocument*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2462,7 +2466,7 @@
         </return-value>
         <parameters>
           <parameter name="document">
-            <type name="AtkDocument*" c:type="AtkDocument*"/>
+            <type name="Document" c:type="AtkDocument*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2472,17 +2476,17 @@
         </return-value>
         <parameters>
           <parameter name="document">
-            <type name="AtkDocument*" c:type="AtkDocument*"/>
+            <type name="Document" c:type="AtkDocument*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_document_attributes">
         <return-value>
-          <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
+          <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
         </return-value>
         <parameters>
           <parameter name="document">
-            <type name="AtkDocument*" c:type="AtkDocument*"/>
+            <type name="Document" c:type="AtkDocument*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2492,7 +2496,7 @@
         </return-value>
         <parameters>
           <parameter name="document">
-            <type name="AtkDocument*" c:type="AtkDocument*"/>
+            <type name="Document" c:type="AtkDocument*"/>
           </parameter>
           <parameter name="attribute_name">
             <type name="string" c:type="gchar*"/>
@@ -2505,7 +2509,7 @@
         </return-value>
         <parameters>
           <parameter name="document">
-            <type name="AtkDocument*" c:type="AtkDocument*"/>
+            <type name="Document" c:type="AtkDocument*"/>
           </parameter>
           <parameter name="attribute_name">
             <type name="string" c:type="gchar*"/>
@@ -2579,7 +2583,7 @@
     <function name="document_get_attributes"
               c:identifier="atk_document_get_attributes">
       <return-value>
-        <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
+        <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
       </return-value>
       <parameters>
         <parameter name="document">
@@ -2742,7 +2746,7 @@
     <function name="text_attribute_register"
               c:identifier="atk_text_attribute_register">
       <return-value>
-        <type name="AtkTextAttribute" c:type="AtkTextAttribute"/>
+        <type name="TextAttribute" c:type="AtkTextAttribute"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -2843,7 +2847,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="start_offset">
             <type name="int32" c:type="gint"/>
@@ -2859,19 +2863,19 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="offset">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="boundary_type">
-            <type name="AtkTextBoundary" c:type="AtkTextBoundary"/>
+            <type name="TextBoundary" c:type="AtkTextBoundary"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2881,29 +2885,29 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="offset">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="boundary_type">
-            <type name="AtkTextBoundary" c:type="AtkTextBoundary"/>
+            <type name="TextBoundary" c:type="AtkTextBoundary"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_character_at_offset">
         <return-value>
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="GLib.gunichar" c:type="gunichar"/>
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="offset">
             <type name="int32" c:type="gint"/>
@@ -2916,19 +2920,19 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="offset">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="boundary_type">
-            <type name="AtkTextBoundary" c:type="AtkTextBoundary"/>
+            <type name="TextBoundary" c:type="AtkTextBoundary"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2938,36 +2942,36 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_run_attributes">
         <return-value>
-          <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
+          <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="offset">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_default_attributes">
         <return-value>
-          <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
+          <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2977,25 +2981,25 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="offset">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="x">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="coords">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
@@ -3005,7 +3009,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
         </parameters>
       </callback>
@@ -3015,7 +3019,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -3024,7 +3028,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="coords">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
@@ -3034,7 +3038,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
         </parameters>
       </callback>
@@ -3044,16 +3048,16 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="selection_num">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -3063,7 +3067,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="start_offset">
             <type name="int32" c:type="gint"/>
@@ -3079,7 +3083,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="selection_num">
             <type name="int32" c:type="gint"/>
@@ -3092,7 +3096,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="selection_num">
             <type name="int32" c:type="gint"/>
@@ -3111,7 +3115,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="offset">
             <type name="int32" c:type="gint"/>
@@ -3124,7 +3128,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="position">
             <type name="int32" c:type="gint"/>
@@ -3140,7 +3144,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="location">
             <type name="int32" c:type="gint"/>
@@ -3153,7 +3157,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
         </parameters>
       </callback>
@@ -3163,7 +3167,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
         </parameters>
       </callback>
@@ -3173,7 +3177,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="start_offset">
             <type name="int32" c:type="gint"/>
@@ -3182,32 +3186,32 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
           <parameter name="rect">
-            <type name="AtkTextRectangle*" c:type="AtkTextRectangle*"/>
+            <type name="AtkTextRectangle" c:type="AtkTextRectangle*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_bounded_ranges">
         <return-value>
-          <type name="AtkTextRange**" c:type="AtkTextRange**"/>
+          <type name="AtkTextRange" c:type="AtkTextRange**"/>
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkText*" c:type="AtkText*"/>
+            <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="rect">
-            <type name="AtkTextRectangle*" c:type="AtkTextRectangle*"/>
+            <type name="AtkTextRectangle" c:type="AtkTextRectangle*"/>
           </parameter>
           <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
           <parameter name="x_clip_type">
-            <type name="AtkTextClipType" c:type="AtkTextClipType"/>
+            <type name="TextClipType" c:type="AtkTextClipType"/>
           </parameter>
           <parameter name="y_clip_type">
-            <type name="AtkTextClipType" c:type="AtkTextClipType"/>
+            <type name="TextClipType" c:type="AtkTextClipType"/>
           </parameter>
         </parameters>
       </callback>
@@ -3267,7 +3271,7 @@
     <function name="text_get_character_at_offset"
               c:identifier="atk_text_get_character_at_offset">
       <return-value>
-        <type name="gunichar" c:type="gunichar"/>
+        <type name="GLib.gunichar" c:type="gunichar"/>
       </return-value>
       <parameters>
         <parameter name="text">
@@ -3291,13 +3295,13 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="boundary_type">
-          <type name="AtkTextBoundary" c:type="AtkTextBoundary"/>
+          <type name="TextBoundary" c:type="AtkTextBoundary"/>
         </parameter>
         <parameter name="start_offset">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="end_offset">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -3314,13 +3318,13 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="boundary_type">
-          <type name="AtkTextBoundary" c:type="AtkTextBoundary"/>
+          <type name="TextBoundary" c:type="AtkTextBoundary"/>
         </parameter>
         <parameter name="start_offset">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="end_offset">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -3337,13 +3341,13 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="boundary_type">
-          <type name="AtkTextBoundary" c:type="AtkTextBoundary"/>
+          <type name="TextBoundary" c:type="AtkTextBoundary"/>
         </parameter>
         <parameter name="start_offset">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="end_offset">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -3371,26 +3375,26 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="coords">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
+          <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
       </parameters>
     </function>
     <function name="text_get_run_attributes"
               c:identifier="atk_text_get_run_attributes">
       <return-value>
-        <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
+        <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
       </return-value>
       <parameters>
         <parameter name="text">
@@ -3400,17 +3404,17 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="start_offset">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="end_offset">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
     <function name="text_get_default_attributes"
               c:identifier="atk_text_get_default_attributes">
       <return-value>
-        <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
+        <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
       </return-value>
       <parameters>
         <parameter name="text">
@@ -3445,7 +3449,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="coords">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
+          <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
       </parameters>
     </function>
@@ -3472,10 +3476,10 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="start_offset">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="end_offset">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -3558,7 +3562,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
+          <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
         <parameter name="rect">
           <type name="AtkTextRectangle" c:type="AtkTextRectangle*"/>
@@ -3568,7 +3572,7 @@
     <function name="text_get_bounded_ranges"
               c:identifier="atk_text_get_bounded_ranges">
       <return-value>
-        <type name="AtkTextRange**" c:type="AtkTextRange**"/>
+        <type name="AtkTextRange" c:type="AtkTextRange**"/>
       </return-value>
       <parameters>
         <parameter name="text">
@@ -3578,13 +3582,13 @@
           <type name="AtkTextRectangle" c:type="AtkTextRectangle*"/>
         </parameter>
         <parameter name="coord_type">
-          <type name="AtkCoordType" c:type="AtkCoordType"/>
+          <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
         <parameter name="x_clip_type">
-          <type name="AtkTextClipType" c:type="AtkTextClipType"/>
+          <type name="TextClipType" c:type="AtkTextClipType"/>
         </parameter>
         <parameter name="y_clip_type">
-          <type name="AtkTextClipType" c:type="AtkTextClipType"/>
+          <type name="TextClipType" c:type="AtkTextClipType"/>
         </parameter>
       </parameters>
     </function>
@@ -3615,14 +3619,14 @@
       </return-value>
       <parameters>
         <parameter name="attr">
-          <type name="AtkTextAttribute" c:type="AtkTextAttribute"/>
+          <type name="TextAttribute" c:type="AtkTextAttribute"/>
         </parameter>
       </parameters>
     </function>
     <function name="text_attribute_for_name"
               c:identifier="atk_text_attribute_for_name">
       <return-value>
-        <type name="AtkTextAttribute" c:type="AtkTextAttribute"/>
+        <type name="TextAttribute" c:type="AtkTextAttribute"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -3637,7 +3641,7 @@
       </return-value>
       <parameters>
         <parameter name="attr">
-          <type name="AtkTextAttribute" c:type="AtkTextAttribute"/>
+          <type name="TextAttribute" c:type="AtkTextAttribute"/>
         </parameter>
         <parameter name="index_">
           <type name="int32" c:type="gint"/>
@@ -3655,10 +3659,10 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkEditableText*" c:type="AtkEditableText*"/>
+            <type name="EditableText" c:type="AtkEditableText*"/>
           </parameter>
           <parameter name="attrib_set">
-            <type name="AtkAttributeSet*" c:type="AtkAttributeSet*"/>
+            <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
           </parameter>
           <parameter name="start_offset">
             <type name="int32" c:type="gint"/>
@@ -3674,7 +3678,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkEditableText*" c:type="AtkEditableText*"/>
+            <type name="EditableText" c:type="AtkEditableText*"/>
           </parameter>
           <parameter name="string">
             <type name="string" c:type="gchar*"/>
@@ -3687,7 +3691,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkEditableText*" c:type="AtkEditableText*"/>
+            <type name="EditableText" c:type="AtkEditableText*"/>
           </parameter>
           <parameter name="string">
             <type name="string" c:type="gchar*"/>
@@ -3696,7 +3700,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="position">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -3706,7 +3710,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkEditableText*" c:type="AtkEditableText*"/>
+            <type name="EditableText" c:type="AtkEditableText*"/>
           </parameter>
           <parameter name="start_pos">
             <type name="int32" c:type="gint"/>
@@ -3722,7 +3726,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkEditableText*" c:type="AtkEditableText*"/>
+            <type name="EditableText" c:type="AtkEditableText*"/>
           </parameter>
           <parameter name="start_pos">
             <type name="int32" c:type="gint"/>
@@ -3738,7 +3742,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkEditableText*" c:type="AtkEditableText*"/>
+            <type name="EditableText" c:type="AtkEditableText*"/>
           </parameter>
           <parameter name="start_pos">
             <type name="int32" c:type="gint"/>
@@ -3754,7 +3758,7 @@
         </return-value>
         <parameters>
           <parameter name="text">
-            <type name="AtkEditableText*" c:type="AtkEditableText*"/>
+            <type name="EditableText" c:type="AtkEditableText*"/>
           </parameter>
           <parameter name="position">
             <type name="int32" c:type="gint"/>
@@ -3818,7 +3822,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="position">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -3898,7 +3902,7 @@
     </bitfield>
     <class name="Hyperlink"
            c:type="AtkHyperlink"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="AtkHyperlink"
            glib:get-type="atk_hyperlink_get_type">
       <constructor name="impl_get_hyperlink"
@@ -4018,7 +4022,7 @@
         </return-value>
         <parameters>
           <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
           </parameter>
           <parameter name="i">
             <type name="int32" c:type="gint"/>
@@ -4027,11 +4031,11 @@
       </callback>
       <callback name="get_object">
         <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
           </parameter>
           <parameter name="i">
             <type name="int32" c:type="gint"/>
@@ -4044,7 +4048,7 @@
         </return-value>
         <parameters>
           <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4054,7 +4058,7 @@
         </return-value>
         <parameters>
           <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4064,7 +4068,7 @@
         </return-value>
         <parameters>
           <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4074,17 +4078,17 @@
         </return-value>
         <parameters>
           <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="link_state">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4094,7 +4098,7 @@
         </return-value>
         <parameters>
           <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4104,7 +4108,7 @@
         </return-value>
         <parameters>
           <parameter name="link_">
-            <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4124,11 +4128,11 @@
                glib:get-type="atk_hyperlink_impl_get_type">
       <callback name="get_hyperlink">
         <return-value>
-          <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
+          <type name="Hyperlink" c:type="AtkHyperlink*"/>
         </return-value>
         <parameters>
           <parameter name="impl">
-            <type name="AtkHyperlinkImpl*" c:type="AtkHyperlinkImpl*"/>
+            <type name="HyperlinkImpl" c:type="AtkHyperlinkImpl*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4143,11 +4147,11 @@
                glib:get-type="atk_hypertext_get_type">
       <callback name="get_link">
         <return-value>
-          <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
+          <type name="Hyperlink" c:type="AtkHyperlink*"/>
         </return-value>
         <parameters>
           <parameter name="hypertext">
-            <type name="AtkHypertext*" c:type="AtkHypertext*"/>
+            <type name="Hypertext" c:type="AtkHypertext*"/>
           </parameter>
           <parameter name="link_index">
             <type name="int32" c:type="gint"/>
@@ -4160,7 +4164,7 @@
         </return-value>
         <parameters>
           <parameter name="hypertext">
-            <type name="AtkHypertext*" c:type="AtkHypertext*"/>
+            <type name="Hypertext" c:type="AtkHypertext*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4170,7 +4174,7 @@
         </return-value>
         <parameters>
           <parameter name="hypertext">
-            <type name="AtkHypertext*" c:type="AtkHypertext*"/>
+            <type name="Hypertext" c:type="AtkHypertext*"/>
           </parameter>
           <parameter name="char_index">
             <type name="int32" c:type="gint"/>
@@ -4183,7 +4187,7 @@
         </return-value>
         <parameters>
           <parameter name="hypertext">
-            <type name="AtkHypertext*" c:type="AtkHypertext*"/>
+            <type name="Hypertext" c:type="AtkHypertext*"/>
           </parameter>
           <parameter name="link_index">
             <type name="int32" c:type="gint"/>
@@ -4212,7 +4216,7 @@
     </interface>
     <function name="hypertext_get_link" c:identifier="atk_hypertext_get_link">
       <return-value>
-        <type name="AtkHyperlink*" c:type="AtkHyperlink*"/>
+        <type name="Hyperlink" c:type="AtkHyperlink*"/>
       </return-value>
       <parameters>
         <parameter name="hypertext">
@@ -4259,16 +4263,16 @@
         </return-value>
         <parameters>
           <parameter name="image">
-            <type name="AtkImage*" c:type="AtkImage*"/>
+            <type name="Image" c:type="AtkImage*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="coord_type">
-            <type name="AtkCoordType" c:type="AtkCoordType"/>
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
@@ -4278,7 +4282,7 @@
         </return-value>
         <parameters>
           <parameter name="image">
-            <type name="AtkImage*" c:type="AtkImage*"/>
+            <type name="Image" c:type="AtkImage*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4288,13 +4292,13 @@
         </return-value>
         <parameters>
           <parameter name="image">
-            <type name="AtkImage*" c:type="AtkImage*"/>
+            <type name="Image" c:type="AtkImage*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4304,7 +4308,7 @@
         </return-value>
         <parameters>
           <parameter name="image">
-            <type name="AtkImage*" c:type="AtkImage*"/>
+            <type name="Image" c:type="AtkImage*"/>
           </parameter>
           <parameter name="description">
             <type name="string" c:type="gchar*"/>
@@ -4317,7 +4321,7 @@
         </return-value>
         <parameters>
           <parameter name="image">
-            <type name="AtkImage*" c:type="AtkImage*"/>
+            <type name="Image" c:type="AtkImage*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4346,10 +4350,10 @@
           <type name="Image" c:type="AtkImage*"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -4377,10 +4381,10 @@
           <type name="Image" c:type="AtkImage*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="coord_type">
           <type name="CoordType" c:type="AtkCoordType"/>
@@ -4406,17 +4410,17 @@
     </class>
     <function name="no_op_object_new" c:identifier="atk_no_op_object_new">
       <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
+        <type name="Object" c:type="AtkObject*"/>
       </return-value>
       <parameters>
         <parameter name="obj">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
       </parameters>
     </function>
     <class name="ObjectFactory"
            c:type="AtkObjectFactory"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="AtkObjectFactory"
            glib:get-type="atk_object_factory_get_type">
       <method name="invalidate" c:identifier="atk_object_factory_invalidate">
@@ -4432,7 +4436,7 @@
       <method name="get_accessible_type"
               c:identifier="atk_object_factory_get_accessible_type">
         <return-value>
-          <type name="GType" c:type="GType"/>
+          <type name="GObject.GType" c:type="GType"/>
         </return-value>
         <parameters>
           <parameter name="factory">
@@ -4442,11 +4446,11 @@
       </method>
       <callback name="create_accessible">
         <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="obj">
-            <type name="GObject*" c:type="GObject*"/>
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4456,13 +4460,13 @@
         </return-value>
         <parameters>
           <parameter name="factory">
-            <type name="AtkObjectFactory*" c:type="AtkObjectFactory*"/>
+            <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_accessible_type">
         <return-value>
-          <type name="GType" c:type="GType"/>
+          <type name="GObject.GType" c:type="GType"/>
         </return-value>
       </callback>
       <field name="pad1">
@@ -4481,12 +4485,12 @@
     <function name="no_op_object_factory_new"
               c:identifier="atk_no_op_object_factory_new">
       <return-value>
-        <type name="AtkObjectFactory*" c:type="AtkObjectFactory*"/>
+        <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
       </return-value>
     </function>
     <class name="Registry"
            c:type="AtkRegistry"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="AtkRegistry"
            glib:get-type="atk_registry_get_type">
       <method name="set_factory_type"
@@ -4499,24 +4503,24 @@
             <type name="Registry" c:type="AtkRegistry*"/>
           </parameter>
           <parameter name="type">
-            <type name="GType" c:type="GType"/>
+            <type name="GObject.GType" c:type="GType"/>
           </parameter>
           <parameter name="factory_type">
-            <type name="GType" c:type="GType"/>
+            <type name="GObject.GType" c:type="GType"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_factory_type"
               c:identifier="atk_registry_get_factory_type">
         <return-value>
-          <type name="GType" c:type="GType"/>
+          <type name="GObject.GType" c:type="GType"/>
         </return-value>
         <parameters>
           <parameter name="registry">
             <type name="Registry" c:type="AtkRegistry*"/>
           </parameter>
           <parameter name="type">
-            <type name="GType" c:type="GType"/>
+            <type name="GObject.GType" c:type="GType"/>
           </parameter>
         </parameters>
       </method>
@@ -4529,7 +4533,7 @@
             <type name="Registry" c:type="AtkRegistry*"/>
           </parameter>
           <parameter name="type">
-            <type name="GType" c:type="GType"/>
+            <type name="GObject.GType" c:type="GType"/>
           </parameter>
         </parameters>
       </method>
@@ -4537,12 +4541,12 @@
     <function name="get_default_registry"
               c:identifier="atk_get_default_registry">
       <return-value>
-        <type name="AtkRegistry*" c:type="AtkRegistry*"/>
+        <type name="Registry" c:type="AtkRegistry*"/>
       </return-value>
     </function>
     <class name="Relation"
            c:type="AtkRelation"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="AtkRelation"
            glib:get-type="atk_relation_get_type">
       <constructor name="new" c:identifier="atk_relation_new">
@@ -4602,7 +4606,7 @@
       </method>
       <method name="get_target" c:identifier="atk_relation_get_target">
         <return-value>
-          <type name="GPtrArray" c:type="GPtrArray*"/>
+          <type name="GLib.GPtrArray" c:type="GPtrArray*"/>
         </return-value>
         <parameters>
           <parameter name="relation">
@@ -4624,16 +4628,16 @@
         </parameters>
       </method>
       <property name="relation-type">
-        <type name="AtkRelationType" c:type="AtkRelationType"/>
+        <type name="RelationType" c:type="AtkRelationType"/>
       </property>
       <property name="target">
-        <type name="GValueArray" c:type="GValueArray"/>
+        <type name="GObject.GValueArray" c:type="GValueArray"/>
       </property>
     </class>
     <function name="relation_type_register"
               c:identifier="atk_relation_type_register">
       <return-value>
-        <type name="AtkRelationType" c:type="AtkRelationType"/>
+        <type name="RelationType" c:type="AtkRelationType"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -4655,7 +4659,7 @@
     <function name="relation_type_for_name"
               c:identifier="atk_relation_type_for_name">
       <return-value>
-        <type name="AtkRelationType" c:type="AtkRelationType"/>
+        <type name="RelationType" c:type="AtkRelationType"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -4665,7 +4669,7 @@
     </function>
     <class name="RelationSet"
            c:type="AtkRelationSet"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="AtkRelationSet"
            glib:get-type="atk_relation_set_get_type">
       <constructor name="new" c:identifier="atk_relation_set_new">
@@ -4758,7 +4762,7 @@
         </return-value>
         <parameters>
           <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
           <parameter name="i">
             <type name="int32" c:type="gint"/>
@@ -4771,17 +4775,17 @@
         </return-value>
         <parameters>
           <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="ref_selection">
         <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
           <parameter name="i">
             <type name="int32" c:type="gint"/>
@@ -4794,7 +4798,7 @@
         </return-value>
         <parameters>
           <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4804,7 +4808,7 @@
         </return-value>
         <parameters>
           <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
           <parameter name="i">
             <type name="int32" c:type="gint"/>
@@ -4817,7 +4821,7 @@
         </return-value>
         <parameters>
           <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
           <parameter name="i">
             <type name="int32" c:type="gint"/>
@@ -4830,7 +4834,7 @@
         </return-value>
         <parameters>
           <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4840,7 +4844,7 @@
         </return-value>
         <parameters>
           <parameter name="selection">
-            <type name="AtkSelection*" c:type="AtkSelection*"/>
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4884,7 +4888,7 @@
     <function name="selection_ref_selection"
               c:identifier="atk_selection_ref_selection">
       <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
+        <type name="Object" c:type="AtkObject*"/>
       </return-value>
       <parameters>
         <parameter name="selection">
@@ -4947,7 +4951,7 @@
     </function>
     <class name="StateSet"
            c:type="AtkStateSet"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="AtkStateSet"
            glib:get-type="atk_state_set_get_type">
       <constructor name="new" c:identifier="atk_state_set_new">
@@ -5099,7 +5103,7 @@
         </return-value>
         <parameters>
           <parameter name="streamable">
-            <type name="AtkStreamableContent*" c:type="AtkStreamableContent*"/>
+            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5109,7 +5113,7 @@
         </return-value>
         <parameters>
           <parameter name="streamable">
-            <type name="AtkStreamableContent*" c:type="AtkStreamableContent*"/>
+            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
           </parameter>
           <parameter name="i">
             <type name="int32" c:type="gint"/>
@@ -5118,11 +5122,11 @@
       </callback>
       <callback name="get_stream">
         <return-value>
-          <type name="GIOChannel*" c:type="GIOChannel*"/>
+          <type name="GLib.GIOChannel" c:type="GIOChannel*"/>
         </return-value>
         <parameters>
           <parameter name="streamable">
-            <type name="AtkStreamableContent*" c:type="AtkStreamableContent*"/>
+            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
           </parameter>
           <parameter name="mime_type">
             <type name="string" c:type="gchar*"/>
@@ -5135,7 +5139,7 @@
         </return-value>
         <parameters>
           <parameter name="streamable">
-            <type name="AtkStreamableContent*" c:type="AtkStreamableContent*"/>
+            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
           </parameter>
           <parameter name="mime_type">
             <type name="string" c:type="gchar*"/>
@@ -5180,7 +5184,7 @@
     <function name="streamable_content_get_stream"
               c:identifier="atk_streamable_content_get_stream">
       <return-value>
-        <type name="GIOChannel*" c:type="GIOChannel*"/>
+        <type name="GLib.GIOChannel" c:type="GIOChannel*"/>
       </return-value>
       <parameters>
         <parameter name="streamable">
@@ -5212,11 +5216,11 @@
                glib:get-type="atk_table_get_type">
       <callback name="ref_at">
         <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -5232,7 +5236,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -5248,7 +5252,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="index_">
             <type name="int32" c:type="gint"/>
@@ -5261,7 +5265,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="index_">
             <type name="int32" c:type="gint"/>
@@ -5274,7 +5278,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5284,7 +5288,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5294,7 +5298,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -5310,7 +5314,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -5322,11 +5326,11 @@
       </callback>
       <callback name="get_caption">
         <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5336,7 +5340,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
             <type name="int32" c:type="gint"/>
@@ -5345,11 +5349,11 @@
       </callback>
       <callback name="get_column_header">
         <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
             <type name="int32" c:type="gint"/>
@@ -5362,7 +5366,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -5371,11 +5375,11 @@
       </callback>
       <callback name="get_row_header">
         <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -5384,11 +5388,11 @@
       </callback>
       <callback name="get_summary">
         <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5398,10 +5402,10 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="caption">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5411,7 +5415,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
             <type name="int32" c:type="gint"/>
@@ -5427,13 +5431,13 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="header">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5443,7 +5447,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -5459,13 +5463,13 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="header">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5475,10 +5479,10 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="accessible">
-            <type name="AtkObject*" c:type="AtkObject*"/>
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5488,10 +5492,10 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="selected">
-            <type name="gint**" c:type="gint**"/>
+            <type name="GLib.gint" c:type="gint**"/>
           </parameter>
         </parameters>
       </callback>
@@ -5501,10 +5505,10 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="selected">
-            <type name="gint**" c:type="gint**"/>
+            <type name="GLib.gint" c:type="gint**"/>
           </parameter>
         </parameters>
       </callback>
@@ -5514,7 +5518,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
             <type name="int32" c:type="gint"/>
@@ -5527,7 +5531,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -5540,7 +5544,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -5556,7 +5560,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -5569,7 +5573,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -5582,7 +5586,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
             <type name="int32" c:type="gint"/>
@@ -5595,7 +5599,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
             <type name="int32" c:type="gint"/>
@@ -5608,7 +5612,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -5624,7 +5628,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
             <type name="int32" c:type="gint"/>
@@ -5640,7 +5644,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -5656,7 +5660,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
             <type name="int32" c:type="gint"/>
@@ -5672,7 +5676,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5682,7 +5686,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5692,7 +5696,7 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="AtkTable*" c:type="AtkTable*"/>
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5778,7 +5782,7 @@
     </interface>
     <function name="table_ref_at" c:identifier="atk_table_ref_at">
       <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
+        <type name="Object" c:type="AtkObject*"/>
       </return-value>
       <parameters>
         <parameter name="table">
@@ -5893,7 +5897,7 @@
     </function>
     <function name="table_get_caption" c:identifier="atk_table_get_caption">
       <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
+        <type name="Object" c:type="AtkObject*"/>
       </return-value>
       <parameters>
         <parameter name="table">
@@ -5918,7 +5922,7 @@
     <function name="table_get_column_header"
               c:identifier="atk_table_get_column_header">
       <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
+        <type name="Object" c:type="AtkObject*"/>
       </return-value>
       <parameters>
         <parameter name="table">
@@ -5946,7 +5950,7 @@
     <function name="table_get_row_header"
               c:identifier="atk_table_get_row_header">
       <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
+        <type name="Object" c:type="AtkObject*"/>
       </return-value>
       <parameters>
         <parameter name="table">
@@ -5959,7 +5963,7 @@
     </function>
     <function name="table_get_summary" c:identifier="atk_table_get_summary">
       <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
+        <type name="Object" c:type="AtkObject*"/>
       </return-value>
       <parameters>
         <parameter name="table">
@@ -6071,7 +6075,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="selected">
-          <type name="gint" c:type="gint**"/>
+          <type name="GLib.gint" c:type="gint**"/>
         </parameter>
       </parameters>
     </function>
@@ -6085,7 +6089,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="selected">
-          <type name="gint" c:type="gint**"/>
+          <type name="GLib.gint" c:type="gint**"/>
         </parameter>
       </parameters>
     </function>
@@ -6191,7 +6195,7 @@
     </function>
     <class name="Misc"
            c:type="AtkMisc"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="AtkMisc"
            glib:get-type="atk_misc_get_type">
       <constructor name="get_instance" c:identifier="atk_misc_get_instance">
@@ -6225,7 +6229,7 @@
         </return-value>
         <parameters>
           <parameter name="misc">
-            <type name="AtkMisc*" c:type="AtkMisc*"/>
+            <type name="Misc" c:type="AtkMisc*"/>
           </parameter>
         </parameters>
       </callback>
@@ -6235,7 +6239,7 @@
         </return-value>
         <parameters>
           <parameter name="misc">
-            <type name="AtkMisc*" c:type="AtkMisc*"/>
+            <type name="Misc" c:type="AtkMisc*"/>
           </parameter>
         </parameters>
       </callback>
@@ -6254,10 +6258,10 @@
         </return-value>
         <parameters>
           <parameter name="obj">
-            <type name="AtkValue*" c:type="AtkValue*"/>
+            <type name="Value" c:type="AtkValue*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -6267,10 +6271,10 @@
         </return-value>
         <parameters>
           <parameter name="obj">
-            <type name="AtkValue*" c:type="AtkValue*"/>
+            <type name="Value" c:type="AtkValue*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -6280,10 +6284,10 @@
         </return-value>
         <parameters>
           <parameter name="obj">
-            <type name="AtkValue*" c:type="AtkValue*"/>
+            <type name="Value" c:type="AtkValue*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -6293,10 +6297,10 @@
         </return-value>
         <parameters>
           <parameter name="obj">
-            <type name="AtkValue*" c:type="AtkValue*"/>
+            <type name="Value" c:type="AtkValue*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -6306,10 +6310,10 @@
         </return-value>
         <parameters>
           <parameter name="obj">
-            <type name="AtkValue*" c:type="AtkValue*"/>
+            <type name="Value" c:type="AtkValue*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -6327,7 +6331,7 @@
           <type name="Value" c:type="AtkValue*"/>
         </parameter>
         <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -6341,7 +6345,7 @@
           <type name="Value" c:type="AtkValue*"/>
         </parameter>
         <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -6355,7 +6359,7 @@
           <type name="Value" c:type="AtkValue*"/>
         </parameter>
         <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -6369,7 +6373,7 @@
           <type name="Value" c:type="AtkValue*"/>
         </parameter>
         <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -6383,7 +6387,7 @@
           <type name="Value" c:type="AtkValue*"/>
         </parameter>
         <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -6395,7 +6399,7 @@
       <method name="get_object"
               c:identifier="atk_gobject_accessible_get_object">
         <return-value>
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </return-value>
         <parameters>
           <parameter name="obj">
@@ -6413,11 +6417,11 @@
     <function name="gobject_accessible_for_object"
               c:identifier="atk_gobject_accessible_for_object">
       <return-value>
-        <type name="AtkObject*" c:type="AtkObject*"/>
+        <type name="Object" c:type="AtkObject*"/>
       </return-value>
       <parameters>
         <parameter name="obj">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
       </parameters>
     </function>

Modified: trunk/gir/gdk-x11-2.0.gir
==============================================================================
--- trunk/gir/gdk-x11-2.0.gir	(original)
+++ trunk/gir/gdk-x11-2.0.gir	Thu Aug 14 16:13:47 2008
@@ -3,6 +3,12 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="Gdk">
+    <alias name="GdkWChar" target="guint32"/>
+    <alias name="GdkNativeWindow" target="guint32"/>
+    <alias name="GdkEvent" target="_GdkEvent"/>
+    <alias name="GdkSelection" target="GdkAtom"/>
+    <alias name="GdkTarget" target="GdkAtom"/>
+    <alias name="GdkSelectionType" target="GdkAtom"/>
     <record name="GdkPoint" c:type="GdkPoint">
       <field name="x">
         <type name="int32" c:type="gint"/>
@@ -204,7 +210,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="condition">
-          <type name="GdkInputCondition" c:type="GdkInputCondition"/>
+          <type name="InputCondition" c:type="GdkInputCondition"/>
         </parameter>
       </parameters>
     </callback>
@@ -220,7 +226,7 @@
     </callback>
     <class name="Colormap"
            c:type="GdkColormap"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GdkColormap"
            glib:get-type="gdk_colormap_get_type">
       <constructor name="new" c:identifier="gdk_colormap_new">
@@ -229,7 +235,7 @@
         </return-value>
         <parameters>
           <parameter name="visual">
-            <type name="GdkVisual" c:type="GdkVisual*"/>
+            <type name="Visual" c:type="GdkVisual*"/>
           </parameter>
           <parameter name="allocate">
             <type name="boolean" c:type="gboolean"/>
@@ -263,7 +269,7 @@
       </method>
       <method name="get_screen" c:identifier="gdk_colormap_get_screen">
         <return-value>
-          <type name="GdkScreen" c:type="GdkScreen*"/>
+          <type name="Screen" c:type="GdkScreen*"/>
         </return-value>
         <parameters>
           <parameter name="cmap">
@@ -293,9 +299,9 @@
             <type name="Colormap" c:type="GdkColormap*"/>
           </parameter>
           <parameter name="colors">
-            <type name="GdkColor" c:type="GdkColor*"/>
+            <type name="Color" c:type="GdkColor*"/>
           </parameter>
-          <parameter name="n_colors">
+          <parameter name="ncolors">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="writeable">
@@ -305,7 +311,7 @@
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="success">
-            <type name="gboolean" c:type="gboolean*"/>
+            <type name="GLib.gboolean" c:type="gboolean*"/>
           </parameter>
         </parameters>
       </method>
@@ -318,7 +324,7 @@
             <type name="Colormap" c:type="GdkColormap*"/>
           </parameter>
           <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+            <type name="Color" c:type="GdkColor*"/>
           </parameter>
           <parameter name="writeable">
             <type name="boolean" c:type="gboolean"/>
@@ -337,9 +343,9 @@
             <type name="Colormap" c:type="GdkColormap*"/>
           </parameter>
           <parameter name="colors">
-            <type name="GdkColor" c:type="GdkColor*"/>
+            <type name="Color" c:type="GdkColor*"/>
           </parameter>
-          <parameter name="n_colors">
+          <parameter name="ncolors">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
@@ -356,13 +362,13 @@
             <type name="ulong" c:type="gulong"/>
           </parameter>
           <parameter name="result">
-            <type name="GdkColor" c:type="GdkColor*"/>
+            <type name="Color" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_visual" c:identifier="gdk_colormap_get_visual">
         <return-value>
-          <type name="GdkVisual" c:type="GdkVisual*"/>
+          <type name="Visual" c:type="GdkVisual*"/>
         </return-value>
         <parameters>
           <parameter name="colormap">
@@ -379,11 +385,11 @@
     </function>
     <function name="color_copy" c:identifier="gdk_color_copy">
       <return-value>
-        <type name="GdkColor*" c:type="GdkColor*"/>
+        <type name="Color" c:type="GdkColor*"/>
       </return-value>
       <parameters>
         <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
+          <type name="Color" c:type="GdkColor*"/>
         </parameter>
       </parameters>
     </function>
@@ -393,7 +399,7 @@
       </return-value>
       <parameters>
         <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
+          <type name="Color" c:type="GdkColor*"/>
         </parameter>
       </parameters>
     </function>
@@ -406,17 +412,17 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
+          <type name="Color" c:type="GdkColor*"/>
         </parameter>
       </parameters>
     </function>
     <function name="color_hash" c:identifier="gdk_color_hash">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="colora">
-          <type name="GdkColor" c:type="GdkColor*"/>
+          <type name="Color" c:type="GdkColor*"/>
         </parameter>
       </parameters>
     </function>
@@ -426,10 +432,10 @@
       </return-value>
       <parameters>
         <parameter name="colora">
-          <type name="GdkColor" c:type="GdkColor*"/>
+          <type name="Color" c:type="GdkColor*"/>
         </parameter>
         <parameter name="colorb">
-          <type name="GdkColor" c:type="GdkColor*"/>
+          <type name="Color" c:type="GdkColor*"/>
         </parameter>
       </parameters>
     </function>
@@ -439,7 +445,7 @@
       </return-value>
       <parameters>
         <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
+          <type name="Color" c:type="GdkColor*"/>
         </parameter>
       </parameters>
     </function>
@@ -528,13 +534,13 @@
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="planes">
-          <type name="gulong" c:type="gulong*"/>
+          <type name="GLib.gulong" c:type="gulong*"/>
         </parameter>
         <parameter name="nplanes">
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="pixels">
-          <type name="gulong" c:type="gulong*"/>
+          <type name="GLib.gulong" c:type="gulong*"/>
         </parameter>
         <parameter name="npixels">
           <type name="int32" c:type="gint"/>
@@ -550,7 +556,7 @@
           <type name="Colormap" c:type="GdkColormap*"/>
         </parameter>
         <parameter name="pixels">
-          <type name="gulong" c:type="gulong*"/>
+          <type name="GLib.gulong" c:type="gulong*"/>
         </parameter>
         <parameter name="npixels">
           <type name="int32" c:type="gint"/>
@@ -560,2936 +566,440 @@
         </parameter>
       </parameters>
     </function>
-    <bitfield name="DragAction"
-              c:type="GdkDragAction"
-              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"/>
-      <member name="copy"
-              value="2"
-              c:identifier="GDK_ACTION_COPY"
-              glib:nick="copy"/>
-      <member name="move"
-              value="4"
-              c:identifier="GDK_ACTION_MOVE"
-              glib:nick="move"/>
-      <member name="link"
-              value="8"
-              c:identifier="GDK_ACTION_LINK"
-              glib:nick="link"/>
-      <member name="private"
-              value="16"
-              c:identifier="GDK_ACTION_PRIVATE"
-              glib:nick="private"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-    </enumeration>
-    <class name="DragContext"
-           c:type="GdkDragContext"
-           parent="GLib.Object"
-           glib:type-name="GdkDragContext"
-           glib:get-type="gdk_drag_context_get_type">
-      <constructor name="new" c:identifier="gdk_drag_context_new">
-        <return-value>
-          <type name="DragContext" c:type="GdkDragContext*"/>
-        </return-value>
-      </constructor>
-      <method name="ref" c:identifier="gdk_drag_context_ref">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="DragContext" c:type="GdkDragContext*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unref" c:identifier="gdk_drag_context_unref">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="DragContext" c:type="GdkDragContext*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </class>
-    <function name="drag_status" c:identifier="gdk_drag_status">
+    <record name="GdkRgbCmap" c:type="GdkRgbCmap">
+      <field name="colors">
+        <type name="uint32" c:type="guint32"/>
+      </field>
+      <field name="n_colors">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="info_list">
+        <type name="GLib.GSList" c:type="GSList*"/>
+      </field>
+    </record>
+    <function name="rgb_init" c:identifier="gdk_rgb_init">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
-      <parameters>
-        <parameter name="context">
-          <type name="DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="action">
-          <type name="GdkDragAction" c:type="GdkDragAction"/>
-        </parameter>
-        <parameter name="time_">
-          <type name="uint32" c:type="guint32"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="drop_reply" c:identifier="gdk_drop_reply">
+    <function name="rgb_xpixel_from_rgb"
+              c:identifier="gdk_rgb_xpixel_from_rgb">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ulong" c:type="gulong"/>
       </return-value>
       <parameters>
-        <parameter name="context">
-          <type name="DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="ok">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="time_">
+        <parameter name="rgb">
           <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drop_finish" c:identifier="gdk_drop_finish">
+    <function name="rgb_gc_set_foreground"
+              c:identifier="gdk_rgb_gc_set_foreground">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="context">
-          <type name="DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="success">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="gc">
+          <type name="GC" c:type="GdkGC*"/>
         </parameter>
-        <parameter name="time_">
+        <parameter name="rgb">
           <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_get_selection" c:identifier="gdk_drag_get_selection">
-      <return-value>
-        <type name="GdkAtom" c:type="GdkAtom"/>
-      </return-value>
-      <parameters>
-        <parameter name="context">
-          <type name="DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_begin" c:identifier="gdk_drag_begin">
+    <function name="rgb_gc_set_background"
+              c:identifier="gdk_rgb_gc_set_background">
       <return-value>
-        <type name="GdkDragContext*" c:type="GdkDragContext*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="window">
-          <type name="GdkWindow" c:type="GdkWindow*"/>
+        <parameter name="gc">
+          <type name="GC" c:type="GdkGC*"/>
         </parameter>
-        <parameter name="targets">
-          <type name="GList" c:type="GList*"/>
+        <parameter name="rgb">
+          <type name="uint32" c:type="guint32"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_get_protocol_for_display"
-              c:identifier="gdk_drag_get_protocol_for_display">
+    <function name="rgb_find_color" c:identifier="gdk_rgb_find_color">
       <return-value>
-        <type name="uint32" c:type="guint32"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="display">
-          <type name="GdkDisplay" c:type="GdkDisplay*"/>
-        </parameter>
-        <parameter name="xid">
-          <type name="uint32" c:type="guint32"/>
+        <parameter name="colormap">
+          <type name="Colormap" c:type="GdkColormap*"/>
         </parameter>
-        <parameter name="protocol">
-          <type name="GdkDragProtocol" c:type="GdkDragProtocol*"/>
+        <parameter name="color">
+          <type name="Color" c:type="GdkColor*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_find_window_for_screen"
-              c:identifier="gdk_drag_find_window_for_screen">
+    <enumeration name="RgbDither"
+                 c:type="GdkRgbDither"
+                 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"/>
+      <member name="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"/>
+    </enumeration>
+    <function name="draw_rgb_image" c:identifier="gdk_draw_rgb_image">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="context">
-          <type name="DragContext" c:type="GdkDragContext*"/>
+        <parameter name="drawable">
+          <type name="Drawable" c:type="GdkDrawable*"/>
         </parameter>
-        <parameter name="drag_window">
-          <type name="GdkWindow" c:type="GdkWindow*"/>
+        <parameter name="gc">
+          <type name="GC" c:type="GdkGC*"/>
         </parameter>
-        <parameter name="screen">
-          <type name="GdkScreen" c:type="GdkScreen*"/>
+        <parameter name="x">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="x_root">
+        <parameter name="y">
           <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="y_root">
+        <parameter name="width">
           <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="dest_window" direction="out">
-          <type name="GdkWindow" c:type="GdkWindow**"/>
+        <parameter name="height">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="protocol" direction="out">
-          <type name="GdkDragProtocol" c:type="GdkDragProtocol*"/>
+        <parameter name="dith">
+          <type name="RgbDither" c:type="GdkRgbDither"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="drag_get_protocol" c:identifier="gdk_drag_get_protocol">
-      <return-value>
-        <type name="uint32" c:type="guint32"/>
-      </return-value>
-      <parameters>
-        <parameter name="xid">
-          <type name="uint32" c:type="guint32"/>
+        <parameter name="rgb_buf">
+          <type name="GLib.guchar" c:type="guchar*"/>
         </parameter>
-        <parameter name="protocol">
-          <type name="GdkDragProtocol" c:type="GdkDragProtocol*"/>
+        <parameter name="rowstride">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_find_window" c:identifier="gdk_drag_find_window">
+    <function name="draw_rgb_image_dithalign"
+              c:identifier="gdk_draw_rgb_image_dithalign">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="context">
-          <type name="DragContext" c:type="GdkDragContext*"/>
+        <parameter name="drawable">
+          <type name="Drawable" c:type="GdkDrawable*"/>
         </parameter>
-        <parameter name="drag_window">
-          <type name="GdkWindow" c:type="GdkWindow*"/>
+        <parameter name="gc">
+          <type name="GC" c:type="GdkGC*"/>
         </parameter>
-        <parameter name="x_root">
+        <parameter name="x">
           <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="y_root">
+        <parameter name="y">
           <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="dest_window" direction="out">
-          <type name="GdkWindow" c:type="GdkWindow**"/>
+        <parameter name="width">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="protocol" direction="out">
-          <type name="GdkDragProtocol" c:type="GdkDragProtocol*"/>
+        <parameter name="height">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="dith">
+          <type name="RgbDither" c:type="GdkRgbDither"/>
+        </parameter>
+        <parameter name="rgb_buf">
+          <type name="GLib.guchar" c:type="guchar*"/>
+        </parameter>
+        <parameter name="rowstride">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="xdith">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="ydith">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_motion" c:identifier="gdk_drag_motion">
+    <function name="draw_rgb_32_image" c:identifier="gdk_draw_rgb_32_image">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="context">
-          <type name="DragContext" c:type="GdkDragContext*"/>
+        <parameter name="drawable">
+          <type name="Drawable" c:type="GdkDrawable*"/>
         </parameter>
-        <parameter name="dest_window">
-          <type name="GdkWindow" c:type="GdkWindow*"/>
+        <parameter name="gc">
+          <type name="GC" c:type="GdkGC*"/>
         </parameter>
-        <parameter name="protocol">
-          <type name="GdkDragProtocol" c:type="GdkDragProtocol"/>
+        <parameter name="x">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="x_root">
+        <parameter name="y">
           <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="y_root">
+        <parameter name="width">
           <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="suggested_action">
-          <type name="GdkDragAction" c:type="GdkDragAction"/>
+        <parameter name="height">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="possible_actions">
-          <type name="GdkDragAction" c:type="GdkDragAction"/>
+        <parameter name="dith">
+          <type name="RgbDither" c:type="GdkRgbDither"/>
         </parameter>
-        <parameter name="time_">
-          <type name="uint32" c:type="guint32"/>
+        <parameter name="buf">
+          <type name="GLib.guchar" c:type="guchar*"/>
+        </parameter>
+        <parameter name="rowstride">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_drop" c:identifier="gdk_drag_drop">
+    <function name="draw_rgb_32_image_dithalign"
+              c:identifier="gdk_draw_rgb_32_image_dithalign">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="context">
-          <type name="DragContext" c:type="GdkDragContext*"/>
+        <parameter name="drawable">
+          <type name="Drawable" c:type="GdkDrawable*"/>
         </parameter>
-        <parameter name="time_">
-          <type name="uint32" c:type="guint32"/>
+        <parameter name="gc">
+          <type name="GC" c:type="GdkGC*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="dith">
+          <type name="RgbDither" c:type="GdkRgbDither"/>
+        </parameter>
+        <parameter name="buf">
+          <type name="GLib.guchar" c:type="guchar*"/>
+        </parameter>
+        <parameter name="rowstride">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="xdith">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="ydith">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_abort" c:identifier="gdk_drag_abort">
+    <function name="draw_gray_image" c:identifier="gdk_draw_gray_image">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="context">
-          <type name="DragContext" c:type="GdkDragContext*"/>
+        <parameter name="drawable">
+          <type name="Drawable" c:type="GdkDrawable*"/>
         </parameter>
-        <parameter name="time_">
-          <type name="uint32" c:type="guint32"/>
+        <parameter name="gc">
+          <type name="GC" c:type="GdkGC*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="dith">
+          <type name="RgbDither" c:type="GdkRgbDither"/>
+        </parameter>
+        <parameter name="buf">
+          <type name="GLib.guchar" c:type="guchar*"/>
+        </parameter>
+        <parameter name="rowstride">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_drop_succeeded"
-              c:identifier="gdk_drag_drop_succeeded">
+    <function name="draw_indexed_image" c:identifier="gdk_draw_indexed_image">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="drawable">
+          <type name="Drawable" c:type="GdkDrawable*"/>
+        </parameter>
+        <parameter name="gc">
+          <type name="GC" c:type="GdkGC*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="dith">
+          <type name="RgbDither" c:type="GdkRgbDither"/>
+        </parameter>
+        <parameter name="buf">
+          <type name="GLib.guchar" c:type="guchar*"/>
+        </parameter>
+        <parameter name="rowstride">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="cmap">
+          <type name="GdkRgbCmap" c:type="GdkRgbCmap*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rgb_cmap_new" c:identifier="gdk_rgb_cmap_new">
+      <return-value>
+        <type name="GdkRgbCmap" c:type="GdkRgbCmap*"/>
+      </return-value>
+      <parameters>
+        <parameter name="colors">
+          <type name="guint32" c:type="guint32*"/>
+        </parameter>
+        <parameter name="n_colors">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rgb_cmap_free" c:identifier="gdk_rgb_cmap_free">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="cmap">
+          <type name="GdkRgbCmap" c:type="GdkRgbCmap*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rgb_set_verbose" c:identifier="gdk_rgb_set_verbose">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="verbose">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rgb_set_install" c:identifier="gdk_rgb_set_install">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="install">
+          <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="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="min_colors">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rgb_get_colormap" c:identifier="gdk_rgb_get_colormap">
+      <return-value>
+        <type name="Colormap" c:type="GdkColormap*"/>
+      </return-value>
+    </function>
+    <function name="rgb_get_visual" c:identifier="gdk_rgb_get_visual">
+      <return-value>
+        <type name="Visual" c:type="GdkVisual*"/>
+      </return-value>
+    </function>
+    <function name="rgb_ditherable" c:identifier="gdk_rgb_ditherable">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+    </function>
+    <function name="rgb_colormap_ditherable"
+              c:identifier="gdk_rgb_colormap_ditherable">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="context">
-          <type name="DragContext" c:type="GdkDragContext*"/>
+        <parameter name="cmap">
+          <type name="Colormap" c:type="GdkColormap*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GdkDeviceKey" c:type="GdkDeviceKey">
-      <field name="keyval">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="modifiers">
-        <type name="GdkModifierType" c:type="GdkModifierType"/>
-      </field>
-    </record>
-    <record name="GdkDeviceAxis" c:type="GdkDeviceAxis">
-      <field name="use">
-        <type name="GdkAxisUse" c:type="GdkAxisUse"/>
-      </field>
-      <field name="min">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="max">
-        <type name="double" c:type="gdouble"/>
-      </field>
-    </record>
-    <record name="GdkTimeCoord" c:type="GdkTimeCoord">
-      <field name="time">
-        <type name="uint32" c:type="guint32"/>
-      </field>
-      <field name="axes">
-        <type name="double" c:type="gdouble"/>
-      </field>
-    </record>
-    <enumeration name="ExtensionMode"
-                 c:type="GdkExtensionMode"
-                 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"/>
-      <member name="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"/>
-    </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"/>
-      <member name="pen"
-              value="1"
-              c:identifier="GDK_SOURCE_PEN"
-              glib:nick="pen"/>
-      <member name="eraser"
-              value="2"
-              c:identifier="GDK_SOURCE_ERASER"
-              glib:nick="eraser"/>
-      <member name="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"/>
-      <member name="screen"
-              value="1"
-              c:identifier="GDK_MODE_SCREEN"
-              glib:nick="screen"/>
-      <member name="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"/>
-      <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"/>
-      <member name="xtilt"
-              value="4"
-              c:identifier="GDK_AXIS_XTILT"
-              glib:nick="xtilt"/>
-      <member name="ytilt"
-              value="5"
-              c:identifier="GDK_AXIS_YTILT"
-              glib:nick="ytilt"/>
-      <member name="wheel"
-              value="6"
-              c:identifier="GDK_AXIS_WHEEL"
-              glib:nick="wheel"/>
-      <member name="last"
-              value="7"
-              c:identifier="GDK_AXIS_LAST"
-              glib:nick="last"/>
-    </enumeration>
-    <class name="Device"
-           c:type="GdkDevice"
-           parent="GLib.Object"
-           glib:type-name="GdkDevice"
-           glib:get-type="gdk_device_get_type">
-      <constructor name="get_core_pointer"
-                   c:identifier="gdk_device_get_core_pointer">
-        <return-value>
-          <type name="Device" c:type="GdkDevice*"/>
-        </return-value>
-      </constructor>
-      <method name="set_source" c:identifier="gdk_device_set_source">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="device">
-            <type name="Device" c:type="GdkDevice*"/>
-          </parameter>
-          <parameter name="source">
-            <type name="GdkInputSource" c:type="GdkInputSource"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_mode" c:identifier="gdk_device_set_mode">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="device">
-            <type name="Device" c:type="GdkDevice*"/>
-          </parameter>
-          <parameter name="mode">
-            <type name="GdkInputMode" c:type="GdkInputMode"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_key" c:identifier="gdk_device_set_key">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="device">
-            <type name="Device" c:type="GdkDevice*"/>
-          </parameter>
-          <parameter name="index_">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="keyval">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="modifiers">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_axis_use" c:identifier="gdk_device_set_axis_use">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="device">
-            <type name="Device" c:type="GdkDevice*"/>
-          </parameter>
-          <parameter name="index_">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-          <parameter name="use">
-            <type name="GdkAxisUse" c:type="GdkAxisUse"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_state" c:identifier="gdk_device_get_state">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="device">
-            <type name="Device" c:type="GdkDevice*"/>
-          </parameter>
-          <parameter name="window">
-            <type name="GdkWindow" c:type="GdkWindow*"/>
-          </parameter>
-          <parameter name="axes">
-            <type name="gdouble" c:type="gdouble*"/>
-          </parameter>
-          <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="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="device">
-            <type name="Device" c:type="GdkDevice*"/>
-          </parameter>
-          <parameter name="window">
-            <type name="GdkWindow" c:type="GdkWindow*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="uint32" c:type="guint32"/>
-          </parameter>
-          <parameter name="stop">
-            <type name="uint32" c:type="guint32"/>
-          </parameter>
-          <parameter name="events" direction="out">
-            <type name="GdkTimeCoord" c:type="GdkTimeCoord***"/>
-          </parameter>
-          <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="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="device">
-            <type name="Device" c:type="GdkDevice*"/>
-          </parameter>
-          <parameter name="axes">
-            <type name="gdouble" c:type="gdouble*"/>
-          </parameter>
-          <parameter name="use">
-            <type name="GdkAxisUse" c:type="GdkAxisUse"/>
-          </parameter>
-          <parameter name="value">
-            <type name="gdouble" c:type="gdouble*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </class>
-    <function name="devices_list" c:identifier="gdk_devices_list">
-      <return-value>
-        <type name="GList*" c:type="GList*"/>
-      </return-value>
-    </function>
-    <function name="device_free_history"
-              c:identifier="gdk_device_free_history">
+    <function name="pixbuf_render_threshold_alpha"
+              c:identifier="gdk_pixbuf_render_threshold_alpha">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="events">
-          <type name="GdkTimeCoord" c:type="GdkTimeCoord**"/>
+        <parameter name="pixbuf">
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </parameter>
-        <parameter name="n_events">
-          <type name="int32" c:type="gint"/>
+        <parameter name="bitmap">
+          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+        </parameter>
+        <parameter name="src_x">
+          <type name="int32" c:type="int"/>
+        </parameter>
+        <parameter name="src_y">
+          <type name="int32" c:type="int"/>
+        </parameter>
+        <parameter name="dest_x">
+          <type name="int32" c:type="int"/>
+        </parameter>
+        <parameter name="dest_y">
+          <type name="int32" c:type="int"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int32" c:type="int"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int32" c:type="int"/>
+        </parameter>
+        <parameter name="alpha_threshold">
+          <type name="int32" c:type="int"/>
         </parameter>
       </parameters>
     </function>
-    <function name="input_set_extension_events"
-              c:identifier="gdk_input_set_extension_events">
+    <function name="pixbuf_render_to_drawable"
+              c:identifier="gdk_pixbuf_render_to_drawable">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="window">
-          <type name="GdkWindow" c:type="GdkWindow*"/>
+        <parameter name="pixbuf">
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </parameter>
-        <parameter name="mask">
-          <type name="int32" c:type="gint"/>
+        <parameter name="drawable">
+          <type name="Drawable" c:type="GdkDrawable*"/>
         </parameter>
-        <parameter name="mode">
-          <type name="GdkExtensionMode" c:type="GdkExtensionMode"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GdkEventAny" c:type="GdkEventAny">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-    </record>
-    <record name="GdkEventExpose" c:type="GdkEventExpose">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="area">
-        <type name="GdkRectangle" c:type="GdkRectangle"/>
-      </field>
-      <field name="region">
-        <type name="GdkRegion*" c:type="GdkRegion*"/>
-      </field>
-      <field name="count">
-        <type name="int32" c:type="gint"/>
-      </field>
-    </record>
-    <record name="GdkEventNoExpose" c:type="GdkEventNoExpose">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-    </record>
-    <record name="GdkEventVisibility" c:type="GdkEventVisibility">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="state">
-        <type name="GdkVisibilityState" c:type="GdkVisibilityState"/>
-      </field>
-    </record>
-    <record name="GdkEventMotion" c:type="GdkEventMotion">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="time">
-        <type name="uint32" c:type="guint32"/>
-      </field>
-      <field name="x">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="y">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="axes">
-        <type name="gdouble*" c:type="gdouble*"/>
-      </field>
-      <field name="state">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="is_hint">
-        <type name="int16" c:type="gint16"/>
-      </field>
-      <field name="device">
-        <type name="GdkDevice*" c:type="GdkDevice*"/>
-      </field>
-      <field name="x_root">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="y_root">
-        <type name="double" c:type="gdouble"/>
-      </field>
-    </record>
-    <record name="GdkEventButton" c:type="GdkEventButton">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="time">
-        <type name="uint32" c:type="guint32"/>
-      </field>
-      <field name="x">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="y">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="axes">
-        <type name="gdouble*" c:type="gdouble*"/>
-      </field>
-      <field name="state">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="button">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="device">
-        <type name="GdkDevice*" c:type="GdkDevice*"/>
-      </field>
-      <field name="x_root">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="y_root">
-        <type name="double" c:type="gdouble"/>
-      </field>
-    </record>
-    <record name="GdkEventScroll" c:type="GdkEventScroll">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="time">
-        <type name="uint32" c:type="guint32"/>
-      </field>
-      <field name="x">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="y">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="state">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="direction">
-        <type name="GdkScrollDirection" c:type="GdkScrollDirection"/>
-      </field>
-      <field name="device">
-        <type name="GdkDevice*" c:type="GdkDevice*"/>
-      </field>
-      <field name="x_root">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="y_root">
-        <type name="double" c:type="gdouble"/>
-      </field>
-    </record>
-    <record name="GdkEventKey" c:type="GdkEventKey">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="time">
-        <type name="uint32" c:type="guint32"/>
-      </field>
-      <field name="state">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="keyval">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="length">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="string">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="hardware_keycode">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="group">
-        <type name="uint8" c:type="guint8"/>
-      </field>
-      <field name="is_modifier">
-        <type name="guint" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GdkEventFocus" c:type="GdkEventFocus">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="in">
-        <type name="int16" c:type="gint16"/>
-      </field>
-    </record>
-    <record name="GdkEventCrossing" c:type="GdkEventCrossing">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="subwindow">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="time">
-        <type name="uint32" c:type="guint32"/>
-      </field>
-      <field name="x">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="y">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="x_root">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="y_root">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="mode">
-        <type name="GdkCrossingMode" c:type="GdkCrossingMode"/>
-      </field>
-      <field name="detail">
-        <type name="GdkNotifyType" c:type="GdkNotifyType"/>
-      </field>
-      <field name="focus">
-        <type name="boolean" c:type="gboolean"/>
-      </field>
-      <field name="state">
-        <type name="guint" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GdkEventConfigure" c:type="GdkEventConfigure">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="x">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="y">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="width">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="height">
-        <type name="int32" c:type="gint"/>
-      </field>
-    </record>
-    <record name="GdkEventProperty" c:type="GdkEventProperty">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="atom">
-        <type name="GdkAtom" c:type="GdkAtom"/>
-      </field>
-      <field name="time">
-        <type name="uint32" c:type="guint32"/>
-      </field>
-      <field name="state">
-        <type name="guint" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GdkEventSelection" c:type="GdkEventSelection">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="selection">
-        <type name="GdkAtom" c:type="GdkAtom"/>
-      </field>
-      <field name="target">
-        <type name="GdkAtom" c:type="GdkAtom"/>
-      </field>
-      <field name="property">
-        <type name="GdkAtom" c:type="GdkAtom"/>
-      </field>
-      <field name="time">
-        <type name="uint32" c:type="guint32"/>
-      </field>
-      <field name="requestor">
-        <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
-      </field>
-    </record>
-    <record name="GdkEventOwnerChange" c:type="GdkEventOwnerChange">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="owner">
-        <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
-      </field>
-      <field name="reason">
-        <type name="GdkOwnerChange" c:type="GdkOwnerChange"/>
-      </field>
-      <field name="selection">
-        <type name="GdkAtom" c:type="GdkAtom"/>
-      </field>
-      <field name="time">
-        <type name="uint32" c:type="guint32"/>
-      </field>
-      <field name="selection_time">
-        <type name="uint32" c:type="guint32"/>
-      </field>
-    </record>
-    <record name="GdkEventProximity" c:type="GdkEventProximity">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="time">
-        <type name="uint32" c:type="guint32"/>
-      </field>
-      <field name="device">
-        <type name="GdkDevice*" c:type="GdkDevice*"/>
-      </field>
-    </record>
-    <record name="GdkEventClient" c:type="GdkEventClient">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="message_type">
-        <type name="GdkAtom" c:type="GdkAtom"/>
-      </field>
-      <field name="data_format">
-        <type name="gushort" c:type="gushort"/>
-      </field>
-      <field name="data">
-        <type name="???" c:type="???"/>
-      </field>
-    </record>
-    <record name="GdkEventDND" c:type="GdkEventDND">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="context">
-        <type name="GdkDragContext*" c:type="GdkDragContext*"/>
-      </field>
-      <field name="time">
-        <type name="uint32" c:type="guint32"/>
-      </field>
-      <field name="x_root">
-        <type name="gshort" c:type="gshort"/>
-      </field>
-      <field name="y_root">
-        <type name="gshort" c:type="gshort"/>
-      </field>
-    </record>
-    <record name="GdkEventWindowState" c:type="GdkEventWindowState">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="changed_mask">
-        <type name="GdkWindowState" c:type="GdkWindowState"/>
-      </field>
-      <field name="new_window_state">
-        <type name="GdkWindowState" c:type="GdkWindowState"/>
-      </field>
-    </record>
-    <record name="GdkEventSetting" c:type="GdkEventSetting">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="action">
-        <type name="GdkSettingAction" c:type="GdkSettingAction"/>
-      </field>
-      <field name="name">
-        <type name="string" c:type="char*"/>
-      </field>
-    </record>
-    <record name="GdkEventGrabBroken" c:type="GdkEventGrabBroken">
-      <field name="type">
-        <type name="GdkEventType" c:type="GdkEventType"/>
-      </field>
-      <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-      <field name="send_event">
-        <type name="int8" c:type="gint8"/>
-      </field>
-      <field name="keyboard">
-        <type name="boolean" c:type="gboolean"/>
-      </field>
-      <field name="implicit">
-        <type name="boolean" c:type="gboolean"/>
-      </field>
-      <field name="grab_window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </field>
-    </record>
-    <callback name="GdkEventFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="event">
-          <type name="GdkEvent*" c:type="GdkEvent*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <enumeration name="FilterReturn"
-                 c:type="GdkFilterReturn"
-                 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"/>
-      <member name="translate"
-              value="1"
-              c:identifier="GDK_FILTER_TRANSLATE"
-              glib:nick="translate"/>
-      <member name="remove"
-              value="2"
-              c:identifier="GDK_FILTER_REMOVE"
-              glib:nick="remove"/>
-    </enumeration>
-    <callback name="GdkFilterFunc">
-      <return-value>
-        <type name="GdkFilterReturn" c:type="GdkFilterReturn"/>
-      </return-value>
-      <parameters>
-        <parameter name="xevent">
-          <type name="GdkXEvent*" c:type="GdkXEvent*"/>
-        </parameter>
-        <parameter name="event">
-          <type name="GdkEvent*" c:type="GdkEvent*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <enumeration name="EventType"
-                 c:type="GdkEventType"
-                 glib:type-name="GdkEventType"
-                 glib:get-type="gdk_event_type_get_type">
-      <member name="nothing"
-              value="-1"
-              c:identifier="GDK_NOTHING"
-              glib:nick="nothing"/>
-      <member name="delete"
-              value="0"
-              c:identifier="GDK_DELETE"
-              glib:nick="delete"/>
-      <member name="destroy"
-              value="1"
-              c:identifier="GDK_DESTROY"
-              glib:nick="destroy"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="map" value="14" c:identifier="GDK_MAP" glib:nick="map"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-    </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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-    </enumeration>
-    <enumeration name="ScrollDirection"
-                 c:type="GdkScrollDirection"
-                 glib:type-name="GdkScrollDirection"
-                 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"/>
-      <member name="left"
-              value="2"
-              c:identifier="GDK_SCROLL_LEFT"
-              glib:nick="left"/>
-      <member name="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"/>
-      <member name="virtual"
-              value="1"
-              c:identifier="GDK_NOTIFY_VIRTUAL"
-              glib:nick="virtual"/>
-      <member name="inferior"
-              value="2"
-              c:identifier="GDK_NOTIFY_INFERIOR"
-              glib:nick="inferior"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="grab"
-              value="1"
-              c:identifier="GDK_CROSSING_GRAB"
-              glib:nick="grab"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-      <member name="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"/>
-    </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"/>
-      <member name="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"/>
-    </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"/>
-      <member name="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"/>
-    </enumeration>
-    <glib:boxed c:type="Event"
-                glib:name="Event"
-                glib:type-name="GdkEvent"
-                glib:get-type="gdk_event_get_type">
-      <constructor name="get" c:identifier="gdk_event_get">
-        <return-value>
-          <type name="Event" c:type="GdkEvent*"/>
-        </return-value>
-      </constructor>
-      <constructor name="peek" c:identifier="gdk_event_peek">
-        <return-value>
-          <type name="Event" c:type="GdkEvent*"/>
-        </return-value>
-      </constructor>
-      <constructor name="get_graphics_expose"
-                   c:identifier="gdk_event_get_graphics_expose">
-        <return-value>
-          <type name="Event" c:type="GdkEvent*"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="GdkWindow" c:type="GdkWindow*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="new" c:identifier="gdk_event_new">
-        <return-value>
-          <type name="Event" c:type="GdkEvent*"/>
-        </return-value>
-        <parameters>
-          <parameter name="type">
-            <type name="GdkEventType" c:type="GdkEventType"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="copy" c:identifier="gdk_event_copy">
-        <return-value>
-          <type name="Event" c:type="GdkEvent*"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="put" c:identifier="gdk_event_put">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="free" c:identifier="gdk_event_free">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_time" c:identifier="gdk_event_get_time">
-        <return-value>
-          <type name="uint32" c:type="guint32"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_state" c:identifier="gdk_event_get_state">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="state">
-            <type name="GdkModifierType" c:type="GdkModifierType*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_coords" c:identifier="gdk_event_get_coords">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="x_win">
-            <type name="gdouble" c:type="gdouble*"/>
-          </parameter>
-          <parameter name="y_win">
-            <type name="gdouble" c:type="gdouble*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_root_coords" c:identifier="gdk_event_get_root_coords">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="x_root">
-            <type name="gdouble" c:type="gdouble*"/>
-          </parameter>
-          <parameter name="y_root">
-            <type name="gdouble" c:type="gdouble*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_axis" c:identifier="gdk_event_get_axis">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="axis_use">
-            <type name="GdkAxisUse" c:type="GdkAxisUse"/>
-          </parameter>
-          <parameter name="value">
-            <type name="gdouble" c:type="gdouble*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_screen" c:identifier="gdk_event_set_screen">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="GdkScreen" c:type="GdkScreen*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_screen" c:identifier="gdk_event_get_screen">
-        <return-value>
-          <type name="GdkScreen" c:type="GdkScreen*"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="send_client_message"
-              c:identifier="gdk_event_send_client_message">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="winid">
-            <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="send_clientmessage_toall"
-              c:identifier="gdk_event_send_clientmessage_toall">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </glib:boxed>
-    <function name="events_pending" c:identifier="gdk_events_pending">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-    </function>
-    <function name="event_request_motions"
-              c:identifier="gdk_event_request_motions">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="event">
-          <type name="GdkEventMotion" c:type="GdkEventMotion*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="event_handler_set" c:identifier="gdk_event_handler_set">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="func">
-          <type name="GdkEventFunc" c:type="GdkEventFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="notify">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="set_show_events" c:identifier="gdk_set_show_events">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="show_events">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="get_show_events" c:identifier="gdk_get_show_events">
-      <return-value>
-        <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="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="message_type">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GdkFilterFunc" c:type="GdkFilterFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="setting_get" c:identifier="gdk_setting_get">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GdkDisplayPointerHooks" c:type="GdkDisplayPointerHooks">
-      <callback name="get_pointer">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="GdkDisplay*" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="GdkScreen**" c:type="GdkScreen**"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="mask">
-            <type name="GdkModifierType*" c:type="GdkModifierType*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="window_get_pointer">
-        <return-value>
-          <type name="GdkWindow*" c:type="GdkWindow*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="GdkDisplay*" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="mask">
-            <type name="GdkModifierType*" c:type="GdkModifierType*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="window_at_pointer">
-        <return-value>
-          <type name="GdkWindow*" c:type="GdkWindow*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="GdkDisplay*" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="win_x">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-          <parameter name="win_y">
-            <type name="gint*" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-    </record>
-    <class name="Display"
-           c:type="GdkDisplay"
-           parent="GLib.Object"
-           glib:type-name="GdkDisplay"
-           glib:get-type="gdk_display_get_type">
-      <constructor name="open" c:identifier="gdk_display_open">
-        <return-value>
-          <type name="Display" c:type="GdkDisplay*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="get_default" c:identifier="gdk_display_get_default">
-        <return-value>
-          <type name="Display" c:type="GdkDisplay*"/>
-        </return-value>
-      </constructor>
-      <constructor name="open_default_libgtk_only"
-                   c:identifier="gdk_display_open_default_libgtk_only">
-        <return-value>
-          <type name="Display" c:type="GdkDisplay*"/>
-        </return-value>
-      </constructor>
-      <constructor name="manager_get_default_display"
-                   c:identifier="gdk_display_manager_get_default_display">
-        <return-value>
-          <type name="Display" c:type="GdkDisplay*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display_manager">
-            <type name="DisplayManager" c:type="GdkDisplayManager*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="get_name" c:identifier="gdk_display_get_name">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_n_screens" c:identifier="gdk_display_get_n_screens">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_screen" c:identifier="gdk_display_get_screen">
-        <return-value>
-          <type name="GdkScreen" c:type="GdkScreen*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="screen_num">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_default_screen"
-              c:identifier="gdk_display_get_default_screen">
-        <return-value>
-          <type name="GdkScreen" c:type="GdkScreen*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="pointer_ungrab" c:identifier="gdk_display_pointer_ungrab">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="time_">
-            <type name="uint32" c:type="guint32"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="keyboard_ungrab"
-              c:identifier="gdk_display_keyboard_ungrab">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="time_">
-            <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="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="beep" c:identifier="gdk_display_beep">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="sync" c:identifier="gdk_display_sync">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="flush" c:identifier="gdk_display_flush">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="close" c:identifier="gdk_display_close">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="list_devices" c:identifier="gdk_display_list_devices">
-        <return-value>
-          <type name="GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_event" c:identifier="gdk_display_get_event">
-        <return-value>
-          <type name="Event" c:type="GdkEvent*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="peek_event" c:identifier="gdk_display_peek_event">
-        <return-value>
-          <type name="Event" c:type="GdkEvent*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="put_event" c:identifier="gdk_display_put_event">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_client_message_filter"
-              c:identifier="gdk_display_add_client_message_filter">
-        <return-value>
-          <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="GdkAtom" c:type="GdkAtom"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GdkFilterFunc" c:type="GdkFilterFunc"/>
-          </parameter>
-          <parameter name="data">
-            <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="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="msec">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_double_click_distance"
-              c:identifier="gdk_display_set_double_click_distance">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="distance">
-            <type name="guint" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_core_pointer"
-              c:identifier="gdk_display_get_core_pointer">
-        <return-value>
-          <type name="Device" c:type="GdkDevice*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_pointer" c:identifier="gdk_display_get_pointer">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="GdkScreen" c:type="GdkScreen**"/>
-          </parameter>
-          <parameter name="x" direction="out">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="y" direction="out">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="mask" direction="out">
-            <type name="GdkModifierType" c:type="GdkModifierType*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_window_at_pointer"
-              c:identifier="gdk_display_get_window_at_pointer">
-        <return-value>
-          <type name="GdkWindow" c:type="GdkWindow*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="win_x" direction="out">
-            <type name="gint" c:type="gint*"/>
-          </parameter>
-          <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="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="GdkScreen" c:type="GdkScreen*"/>
-          </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_pointer_hooks"
-              c:identifier="gdk_display_set_pointer_hooks">
-        <return-value>
-          <type name="GdkDisplayPointerHooks"
-                c:type="GdkDisplayPointerHooks*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="new_hooks">
-            <type name="GdkDisplayPointerHooks"
-                  c:type="GdkDisplayPointerHooks*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="supports_cursor_alpha"
-              c:identifier="gdk_display_supports_cursor_alpha">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="supports_cursor_color"
-              c:identifier="gdk_display_supports_cursor_color">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_default_cursor_size"
-              c:identifier="gdk_display_get_default_cursor_size">
-        <return-value>
-          <type name="guint" c:type="guint"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_maximal_cursor_size"
-              c:identifier="gdk_display_get_maximal_cursor_size">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="width" direction="out">
-            <type name="guint" c:type="guint*"/>
-          </parameter>
-          <parameter name="height" direction="out">
-            <type name="guint" c:type="guint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_default_group"
-              c:identifier="gdk_display_get_default_group">
-        <return-value>
-          <type name="GdkWindow" c:type="GdkWindow*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="supports_selection_notification"
-              c:identifier="gdk_display_supports_selection_notification">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="request_selection_notification"
-              c:identifier="gdk_display_request_selection_notification">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="selection">
-            <type name="GdkAtom" c:type="GdkAtom"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="supports_clipboard_persistence"
-              c:identifier="gdk_display_supports_clipboard_persistence">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="store_clipboard"
-              c:identifier="gdk_display_store_clipboard">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="clipboard_window">
-            <type name="GdkWindow" c:type="GdkWindow*"/>
-          </parameter>
-          <parameter name="time_">
-            <type name="uint32" c:type="guint32"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GdkAtom" c:type="GdkAtom*"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="supports_shapes"
-              c:identifier="gdk_display_supports_shapes">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="supports_input_shapes"
-              c:identifier="gdk_display_supports_input_shapes">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="supports_composite"
-              c:identifier="gdk_display_supports_composite">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <callback name="get_display_name">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="GdkDisplay*" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_n_screens">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="GdkDisplay*" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_screen">
-        <return-value>
-          <type name="GdkScreen*" c:type="GdkScreen*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="GdkDisplay*" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="screen_num">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_default_screen">
-        <return-value>
-          <type name="GdkScreen*" c:type="GdkScreen*"/>
-        </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="GdkDisplay*" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="closed">
-        <return-value>
-          <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="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <glib:signal name="closed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <record name="GdkAppLaunchContextPrivate"
-            c:type="GdkAppLaunchContextPrivate"/>
-    <class name="AppLaunchContext"
-           c:type="GdkAppLaunchContext"
-           parent="GAppLaunchContext"
-           glib:type-name="GdkAppLaunchContext"
-           glib:get-type="gdk_app_launch_context_get_type">
-      <constructor name="new" c:identifier="gdk_app_launch_context_new">
-        <return-value>
-          <type name="AppLaunchContext" c:type="GdkAppLaunchContext*"/>
-        </return-value>
-      </constructor>
-      <method name="set_display"
-              c:identifier="gdk_app_launch_context_set_display">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="AppLaunchContext" c:type="GdkAppLaunchContext*"/>
-          </parameter>
-          <parameter name="display">
-            <type name="Display" c:type="GdkDisplay*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_screen"
-              c:identifier="gdk_app_launch_context_set_screen">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="AppLaunchContext" c:type="GdkAppLaunchContext*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="GdkScreen" c:type="GdkScreen*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_desktop"
-              c:identifier="gdk_app_launch_context_set_desktop">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="AppLaunchContext" c:type="GdkAppLaunchContext*"/>
-          </parameter>
-          <parameter name="desktop">
-            <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="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="AppLaunchContext" c:type="GdkAppLaunchContext*"/>
-          </parameter>
-          <parameter name="timestamp">
-            <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="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="AppLaunchContext" c:type="GdkAppLaunchContext*"/>
-          </parameter>
-          <parameter name="icon">
-            <type name="GIcon" c:type="GIcon*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_icon_name"
-              c:identifier="gdk_app_launch_context_set_icon_name">
-        <return-value>
-          <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="string" c:type="char*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </class>
-    <record name="GdkRgbCmap" c:type="GdkRgbCmap">
-      <field name="colors">
-        <type name="uint32" c:type="guint32"/>
-      </field>
-      <field name="n_colors">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="info_list">
-        <type name="GSList*" c:type="GSList*"/>
-      </field>
-    </record>
-    <function name="rgb_init" c:identifier="gdk_rgb_init">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="rgb_xpixel_from_rgb"
-              c:identifier="gdk_rgb_xpixel_from_rgb">
-      <return-value>
-        <type name="ulong" c:type="gulong"/>
-      </return-value>
-      <parameters>
-        <parameter name="rgb">
-          <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="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="gc">
-          <type name="GdkGC" c:type="GdkGC*"/>
-        </parameter>
-        <parameter name="rgb">
-          <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="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="gc">
-          <type name="GdkGC" c:type="GdkGC*"/>
-        </parameter>
-        <parameter name="rgb">
-          <type name="uint32" c:type="guint32"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rgb_find_color" c:identifier="gdk_rgb_find_color">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="colormap">
-          <type name="Colormap" c:type="GdkColormap*"/>
-        </parameter>
-        <parameter name="color">
-          <type name="Color" c:type="GdkColor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <enumeration name="RgbDither"
-                 c:type="GdkRgbDither"
-                 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"/>
-      <member name="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"/>
-    </enumeration>
-    <function name="draw_rgb_image" c:identifier="gdk_draw_rgb_image">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="drawable">
-          <type name="GdkDrawable" c:type="GdkDrawable*"/>
-        </parameter>
-        <parameter name="gc">
-          <type name="GdkGC" c:type="GdkGC*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="dith">
-          <type name="GdkRgbDither" c:type="GdkRgbDither"/>
-        </parameter>
-        <parameter name="rgb_buf">
-          <type name="guchar" c:type="guchar*"/>
-        </parameter>
-        <parameter name="rowstride">
-          <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="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="drawable">
-          <type name="GdkDrawable" c:type="GdkDrawable*"/>
-        </parameter>
-        <parameter name="gc">
-          <type name="GdkGC" c:type="GdkGC*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="dith">
-          <type name="GdkRgbDither" c:type="GdkRgbDither"/>
-        </parameter>
-        <parameter name="rgb_buf">
-          <type name="guchar" c:type="guchar*"/>
-        </parameter>
-        <parameter name="rowstride">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="xdith">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="ydith">
-          <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="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="drawable">
-          <type name="GdkDrawable" c:type="GdkDrawable*"/>
-        </parameter>
-        <parameter name="gc">
-          <type name="GdkGC" c:type="GdkGC*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="dith">
-          <type name="GdkRgbDither" c:type="GdkRgbDither"/>
-        </parameter>
-        <parameter name="buf">
-          <type name="guchar" c:type="guchar*"/>
-        </parameter>
-        <parameter name="rowstride">
-          <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="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="drawable">
-          <type name="GdkDrawable" c:type="GdkDrawable*"/>
-        </parameter>
-        <parameter name="gc">
-          <type name="GdkGC" c:type="GdkGC*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="dith">
-          <type name="GdkRgbDither" c:type="GdkRgbDither"/>
-        </parameter>
-        <parameter name="buf">
-          <type name="guchar" c:type="guchar*"/>
-        </parameter>
-        <parameter name="rowstride">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="xdith">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="ydith">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="draw_gray_image" c:identifier="gdk_draw_gray_image">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="drawable">
-          <type name="GdkDrawable" c:type="GdkDrawable*"/>
-        </parameter>
-        <parameter name="gc">
-          <type name="GdkGC" c:type="GdkGC*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="dith">
-          <type name="GdkRgbDither" c:type="GdkRgbDither"/>
-        </parameter>
-        <parameter name="buf">
-          <type name="guchar" c:type="guchar*"/>
-        </parameter>
-        <parameter name="rowstride">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="draw_indexed_image" c:identifier="gdk_draw_indexed_image">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="drawable">
-          <type name="GdkDrawable" c:type="GdkDrawable*"/>
-        </parameter>
-        <parameter name="gc">
-          <type name="GdkGC" c:type="GdkGC*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="dith">
-          <type name="GdkRgbDither" c:type="GdkRgbDither"/>
-        </parameter>
-        <parameter name="buf">
-          <type name="guchar" c:type="guchar*"/>
-        </parameter>
-        <parameter name="rowstride">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="cmap">
-          <type name="GdkRgbCmap" c:type="GdkRgbCmap*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rgb_cmap_new" c:identifier="gdk_rgb_cmap_new">
-      <return-value>
-        <type name="GdkRgbCmap*" c:type="GdkRgbCmap*"/>
-      </return-value>
-      <parameters>
-        <parameter name="colors">
-          <type name="guint32" c:type="guint32*"/>
-        </parameter>
-        <parameter name="n_colors">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rgb_cmap_free" c:identifier="gdk_rgb_cmap_free">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="cmap">
-          <type name="GdkRgbCmap" c:type="GdkRgbCmap*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rgb_set_verbose" c:identifier="gdk_rgb_set_verbose">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="verbose">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rgb_set_install" c:identifier="gdk_rgb_set_install">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="install">
-          <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="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="min_colors">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rgb_get_colormap" c:identifier="gdk_rgb_get_colormap">
-      <return-value>
-        <type name="GdkColormap*" c:type="GdkColormap*"/>
-      </return-value>
-    </function>
-    <function name="rgb_get_visual" c:identifier="gdk_rgb_get_visual">
-      <return-value>
-        <type name="GdkVisual*" c:type="GdkVisual*"/>
-      </return-value>
-    </function>
-    <function name="rgb_ditherable" c:identifier="gdk_rgb_ditherable">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-    </function>
-    <function name="rgb_colormap_ditherable"
-              c:identifier="gdk_rgb_colormap_ditherable">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="cmap">
-          <type name="Colormap" c:type="GdkColormap*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="pixbuf_render_threshold_alpha"
-              c:identifier="gdk_pixbuf_render_threshold_alpha">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="pixbuf">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </parameter>
-        <parameter name="bitmap">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-        <parameter name="src_x">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="src_y">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="dest_x">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="dest_y">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="int"/>
-        </parameter>
-        <parameter name="alpha_threshold">
-          <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="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="pixbuf">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </parameter>
-        <parameter name="drawable">
-          <type name="GdkDrawable" c:type="GdkDrawable*"/>
-        </parameter>
-        <parameter name="gc">
-          <type name="GdkGC" c:type="GdkGC*"/>
+        <parameter name="gc">
+          <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="src_x">
           <type name="int32" c:type="int"/>
@@ -3510,7 +1020,7 @@
           <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="dither">
-          <type name="GdkRgbDither" c:type="GdkRgbDither"/>
+          <type name="RgbDither" c:type="GdkRgbDither"/>
         </parameter>
         <parameter name="x_dither">
           <type name="int32" c:type="int"/>
@@ -3530,7 +1040,7 @@
           <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="drawable">
-          <type name="GdkDrawable" c:type="GdkDrawable*"/>
+          <type name="Drawable" c:type="GdkDrawable*"/>
         </parameter>
         <parameter name="src_x">
           <type name="int32" c:type="int"/>
@@ -3557,7 +1067,7 @@
           <type name="int32" c:type="int"/>
         </parameter>
         <parameter name="dither">
-          <type name="GdkRgbDither" c:type="GdkRgbDither"/>
+          <type name="RgbDither" c:type="GdkRgbDither"/>
         </parameter>
         <parameter name="x_dither">
           <type name="int32" c:type="int"/>
@@ -3580,7 +1090,7 @@
           <type name="Colormap" c:type="GdkColormap*"/>
         </parameter>
         <parameter name="pixmap_return">
-          <type name="GdkPixmap" c:type="GdkPixmap**"/>
+          <type name="Pixmap" c:type="GdkPixmap**"/>
         </parameter>
         <parameter name="mask_return">
           <type name="GdkBitmap" c:type="GdkBitmap**"/>
@@ -3600,7 +1110,7 @@
           <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="pixmap_return">
-          <type name="GdkPixmap" c:type="GdkPixmap**"/>
+          <type name="Pixmap" c:type="GdkPixmap**"/>
         </parameter>
         <parameter name="mask_return">
           <type name="GdkBitmap" c:type="GdkBitmap**"/>
@@ -3613,14 +1123,14 @@
     <function name="pixbuf_get_from_drawable"
               c:identifier="gdk_pixbuf_get_from_drawable">
       <return-value>
-        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+        <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
       </return-value>
       <parameters>
         <parameter name="dest">
           <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="src">
-          <type name="GdkDrawable" c:type="GdkDrawable*"/>
+          <type name="Drawable" c:type="GdkDrawable*"/>
         </parameter>
         <parameter name="cmap">
           <type name="Colormap" c:type="GdkColormap*"/>
@@ -3648,14 +1158,14 @@
     <function name="pixbuf_get_from_image"
               c:identifier="gdk_pixbuf_get_from_image">
       <return-value>
-        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+        <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
       </return-value>
       <parameters>
         <parameter name="dest">
           <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="src">
-          <type name="GdkImage" c:type="GdkImage*"/>
+          <type name="Image" c:type="GdkImage*"/>
         </parameter>
         <parameter name="cmap">
           <type name="Colormap" c:type="GdkColormap*"/>
@@ -3682,11 +1192,11 @@
     </function>
     <function name="cairo_create" c:identifier="gdk_cairo_create">
       <return-value>
-        <type name="cairo_t*" c:type="cairo_t*"/>
+        <type name="Cairo.cairo_t" c:type="cairo_t*"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
-          <type name="GdkDrawable" c:type="GdkDrawable*"/>
+          <type name="Drawable" c:type="GdkDrawable*"/>
         </parameter>
       </parameters>
     </function>
@@ -3697,7 +1207,7 @@
       </return-value>
       <parameters>
         <parameter name="cr">
-          <type name="cairo_t" c:type="cairo_t*"/>
+          <type name="Cairo.cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="color">
           <type name="Color" c:type="GdkColor*"/>
@@ -3711,7 +1221,7 @@
       </return-value>
       <parameters>
         <parameter name="cr">
-          <type name="cairo_t" c:type="cairo_t*"/>
+          <type name="Cairo.cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="pixbuf">
           <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
@@ -3731,10 +1241,10 @@
       </return-value>
       <parameters>
         <parameter name="cr">
-          <type name="cairo_t" c:type="cairo_t*"/>
+          <type name="Cairo.cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="pixmap">
-          <type name="GdkPixmap" c:type="GdkPixmap*"/>
+          <type name="Pixmap" c:type="GdkPixmap*"/>
         </parameter>
         <parameter name="pixmap_x">
           <type name="double" c:type="double"/>
@@ -3750,10 +1260,10 @@
       </return-value>
       <parameters>
         <parameter name="cr">
-          <type name="cairo_t" c:type="cairo_t*"/>
+          <type name="Cairo.cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="rectangle">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <type name="Rectangle" c:type="GdkRectangle*"/>
         </parameter>
       </parameters>
     </function>
@@ -3763,7 +1273,7 @@
       </return-value>
       <parameters>
         <parameter name="cr">
-          <type name="cairo_t" c:type="cairo_t*"/>
+          <type name="Cairo.cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="region">
           <type name="GdkRegion" c:type="GdkRegion*"/>
@@ -4073,141 +1583,2537 @@
               glib:nick="last-cursor"/>
       <member name="cursor-is-pixmap"
               value="-1"
-              c:identifier="GDK_CURSOR_IS_PIXMAP"
-              glib:nick="cursor-is-pixmap"/>
+              c:identifier="GDK_CURSOR_IS_PIXMAP"
+              glib:nick="cursor-is-pixmap"/>
+    </enumeration>
+    <glib:boxed c:type="Cursor"
+                glib:name="Cursor"
+                glib:type-name="GdkCursor"
+                glib:get-type="gdk_cursor_get_type">
+      <constructor name="new_for_display"
+                   c:identifier="gdk_cursor_new_for_display">
+        <return-value>
+          <type name="Cursor" c:type="GdkCursor*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="cursor_type">
+            <type name="CursorType" c:type="GdkCursorType"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new" c:identifier="gdk_cursor_new">
+        <return-value>
+          <type name="Cursor" c:type="GdkCursor*"/>
+        </return-value>
+        <parameters>
+          <parameter name="cursor_type">
+            <type name="CursorType" c:type="GdkCursorType"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new_from_pixmap"
+                   c:identifier="gdk_cursor_new_from_pixmap">
+        <return-value>
+          <type name="Cursor" c:type="GdkCursor*"/>
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="Pixmap" c:type="GdkPixmap*"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="Pixmap" c:type="GdkPixmap*"/>
+          </parameter>
+          <parameter name="fg">
+            <type name="Color" c:type="GdkColor*"/>
+          </parameter>
+          <parameter name="bg">
+            <type name="Color" c:type="GdkColor*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new_from_pixbuf"
+                   c:identifier="gdk_cursor_new_from_pixbuf">
+        <return-value>
+          <type name="Cursor" c:type="GdkCursor*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="ref" c:identifier="gdk_cursor_ref">
+        <return-value>
+          <type name="Cursor" c:type="GdkCursor*"/>
+        </return-value>
+        <parameters>
+          <parameter name="cursor">
+            <type name="Cursor" c:type="GdkCursor*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new_from_name"
+                   c:identifier="gdk_cursor_new_from_name">
+        <return-value>
+          <type name="Cursor" c:type="GdkCursor*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="get_display" c:identifier="gdk_cursor_get_display">
+        <return-value>
+          <type name="Display" c:type="GdkDisplay*"/>
+        </return-value>
+        <parameters>
+          <parameter name="cursor">
+            <type name="Cursor" c:type="GdkCursor*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unref" c:identifier="gdk_cursor_unref">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="cursor">
+            <type name="Cursor" c:type="GdkCursor*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_image" c:identifier="gdk_cursor_get_image">
+        <return-value>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+        </return-value>
+        <parameters>
+          <parameter name="cursor">
+            <type name="Cursor" c:type="GdkCursor*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <bitfield name="DragAction"
+              c:type="GdkDragAction"
+              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"/>
+      <member name="copy"
+              value="2"
+              c:identifier="GDK_ACTION_COPY"
+              glib:nick="copy"/>
+      <member name="move"
+              value="4"
+              c:identifier="GDK_ACTION_MOVE"
+              glib:nick="move"/>
+      <member name="link"
+              value="8"
+              c:identifier="GDK_ACTION_LINK"
+              glib:nick="link"/>
+      <member name="private"
+              value="16"
+              c:identifier="GDK_ACTION_PRIVATE"
+              glib:nick="private"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+    </enumeration>
+    <class name="DragContext"
+           c:type="GdkDragContext"
+           parent="GObject.Object"
+           glib:type-name="GdkDragContext"
+           glib:get-type="gdk_drag_context_get_type">
+      <constructor name="new" c:identifier="gdk_drag_context_new">
+        <return-value>
+          <type name="DragContext" c:type="GdkDragContext*"/>
+        </return-value>
+      </constructor>
+      <method name="ref" c:identifier="gdk_drag_context_ref">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="DragContext" c:type="GdkDragContext*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unref" c:identifier="gdk_drag_context_unref">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="DragContext" c:type="GdkDragContext*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </class>
+    <function name="drag_status" c:identifier="gdk_drag_status">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="action">
+          <type name="DragAction" c:type="GdkDragAction"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drop_reply" c:identifier="gdk_drop_reply">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="ok">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drop_finish" c:identifier="gdk_drop_finish">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="success">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_get_selection" c:identifier="gdk_drag_get_selection">
+      <return-value>
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_begin" c:identifier="gdk_drag_begin">
+      <return-value>
+        <type name="DragContext" c:type="GdkDragContext*"/>
+      </return-value>
+      <parameters>
+        <parameter name="window">
+          <type name="Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="targets">
+          <type name="GLib.GList" c:type="GList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_get_protocol_for_display"
+              c:identifier="gdk_drag_get_protocol_for_display">
+      <return-value>
+        <type name="uint32" c:type="guint32"/>
+      </return-value>
+      <parameters>
+        <parameter name="display">
+          <type name="Display" c:type="GdkDisplay*"/>
+        </parameter>
+        <parameter name="xid">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+        <parameter name="protocol">
+          <type name="DragProtocol" c:type="GdkDragProtocol*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_find_window_for_screen"
+              c:identifier="gdk_drag_find_window_for_screen">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="drag_window">
+          <type name="Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="screen">
+          <type name="Screen" c:type="GdkScreen*"/>
+        </parameter>
+        <parameter name="x_root">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="y_root">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="dest_window" direction="out">
+          <type name="Window" c:type="GdkWindow**"/>
+        </parameter>
+        <parameter name="protocol" direction="out">
+          <type name="DragProtocol" c:type="GdkDragProtocol*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_get_protocol" c:identifier="gdk_drag_get_protocol">
+      <return-value>
+        <type name="uint32" c:type="guint32"/>
+      </return-value>
+      <parameters>
+        <parameter name="xid">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+        <parameter name="protocol">
+          <type name="DragProtocol" c:type="GdkDragProtocol*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_find_window" c:identifier="gdk_drag_find_window">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="drag_window">
+          <type name="Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="x_root">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="y_root">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="dest_window" direction="out">
+          <type name="Window" c:type="GdkWindow**"/>
+        </parameter>
+        <parameter name="protocol" direction="out">
+          <type name="DragProtocol" c:type="GdkDragProtocol*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_motion" c:identifier="gdk_drag_motion">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="dest_window">
+          <type name="Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="protocol">
+          <type name="DragProtocol" c:type="GdkDragProtocol"/>
+        </parameter>
+        <parameter name="x_root">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="y_root">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="suggested_action">
+          <type name="DragAction" c:type="GdkDragAction"/>
+        </parameter>
+        <parameter name="possible_actions">
+          <type name="DragAction" c:type="GdkDragAction"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_drop" c:identifier="gdk_drag_drop">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_abort" c:identifier="gdk_drag_abort">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_drop_succeeded"
+              c:identifier="gdk_drag_drop_succeeded">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GdkDeviceKey" c:type="GdkDeviceKey">
+      <field name="keyval">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="modifiers">
+        <type name="ModifierType" c:type="GdkModifierType"/>
+      </field>
+    </record>
+    <record name="GdkDeviceAxis" c:type="GdkDeviceAxis">
+      <field name="use">
+        <type name="AxisUse" c:type="GdkAxisUse"/>
+      </field>
+      <field name="min">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="max">
+        <type name="double" c:type="gdouble"/>
+      </field>
+    </record>
+    <record name="GdkTimeCoord" c:type="GdkTimeCoord">
+      <field name="time">
+        <type name="uint32" c:type="guint32"/>
+      </field>
+      <field name="axes">
+        <type name="double" c:type="gdouble"/>
+      </field>
+    </record>
+    <enumeration name="ExtensionMode"
+                 c:type="GdkExtensionMode"
+                 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"/>
+      <member name="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"/>
+    </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"/>
+      <member name="pen"
+              value="1"
+              c:identifier="GDK_SOURCE_PEN"
+              glib:nick="pen"/>
+      <member name="eraser"
+              value="2"
+              c:identifier="GDK_SOURCE_ERASER"
+              glib:nick="eraser"/>
+      <member name="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"/>
+      <member name="screen"
+              value="1"
+              c:identifier="GDK_MODE_SCREEN"
+              glib:nick="screen"/>
+      <member name="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"/>
+      <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"/>
+      <member name="xtilt"
+              value="4"
+              c:identifier="GDK_AXIS_XTILT"
+              glib:nick="xtilt"/>
+      <member name="ytilt"
+              value="5"
+              c:identifier="GDK_AXIS_YTILT"
+              glib:nick="ytilt"/>
+      <member name="wheel"
+              value="6"
+              c:identifier="GDK_AXIS_WHEEL"
+              glib:nick="wheel"/>
+      <member name="last"
+              value="7"
+              c:identifier="GDK_AXIS_LAST"
+              glib:nick="last"/>
+    </enumeration>
+    <class name="Device"
+           c:type="GdkDevice"
+           parent="GObject.Object"
+           glib:type-name="GdkDevice"
+           glib:get-type="gdk_device_get_type">
+      <constructor name="get_core_pointer"
+                   c:identifier="gdk_device_get_core_pointer">
+        <return-value>
+          <type name="Device" c:type="GdkDevice*"/>
+        </return-value>
+      </constructor>
+      <method name="set_source" c:identifier="gdk_device_set_source">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="device">
+            <type name="Device" c:type="GdkDevice*"/>
+          </parameter>
+          <parameter name="source">
+            <type name="InputSource" c:type="GdkInputSource"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_mode" c:identifier="gdk_device_set_mode">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="device">
+            <type name="Device" c:type="GdkDevice*"/>
+          </parameter>
+          <parameter name="mode">
+            <type name="InputMode" c:type="GdkInputMode"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_key" c:identifier="gdk_device_set_key">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="device">
+            <type name="Device" c:type="GdkDevice*"/>
+          </parameter>
+          <parameter name="index_">
+            <type name="uint32" c:type="guint"/>
+          </parameter>
+          <parameter name="keyval">
+            <type name="uint32" c:type="guint"/>
+          </parameter>
+          <parameter name="modifiers">
+            <type name="ModifierType" c:type="GdkModifierType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_axis_use" c:identifier="gdk_device_set_axis_use">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="device">
+            <type name="Device" c:type="GdkDevice*"/>
+          </parameter>
+          <parameter name="index_">
+            <type name="uint32" c:type="guint"/>
+          </parameter>
+          <parameter name="use">
+            <type name="AxisUse" c:type="GdkAxisUse"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_state" c:identifier="gdk_device_get_state">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="device">
+            <type name="Device" c:type="GdkDevice*"/>
+          </parameter>
+          <parameter name="window">
+            <type name="Window" c:type="GdkWindow*"/>
+          </parameter>
+          <parameter name="axes">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
+          </parameter>
+          <parameter name="mask" direction="out">
+            <type name="ModifierType" c:type="GdkModifierType*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_history" c:identifier="gdk_device_get_history">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="device">
+            <type name="Device" c:type="GdkDevice*"/>
+          </parameter>
+          <parameter name="window">
+            <type name="Window" c:type="GdkWindow*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="uint32" c:type="guint32"/>
+          </parameter>
+          <parameter name="stop">
+            <type name="uint32" c:type="guint32"/>
+          </parameter>
+          <parameter name="events" direction="out">
+            <type name="GdkTimeCoord" c:type="GdkTimeCoord***"/>
+          </parameter>
+          <parameter name="n_events" direction="out">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_axis" c:identifier="gdk_device_get_axis">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="device">
+            <type name="Device" c:type="GdkDevice*"/>
+          </parameter>
+          <parameter name="axes">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
+          </parameter>
+          <parameter name="use">
+            <type name="AxisUse" c:type="GdkAxisUse"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </class>
+    <function name="devices_list" c:identifier="gdk_devices_list">
+      <return-value>
+        <type name="GLib.GList" c:type="GList*"/>
+      </return-value>
+    </function>
+    <function name="device_free_history"
+              c:identifier="gdk_device_free_history">
+      <return-value>
+        <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="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="input_set_extension_events"
+              c:identifier="gdk_input_set_extension_events">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="window">
+          <type name="Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="mask">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="mode">
+          <type name="ExtensionMode" c:type="GdkExtensionMode"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GdkEventAny" c:type="GdkEventAny">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+    </record>
+    <record name="GdkEventExpose" c:type="GdkEventExpose">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="area">
+        <type name="Rectangle" c:type="GdkRectangle"/>
+      </field>
+      <field name="region">
+        <type name="GdkRegion" c:type="GdkRegion*"/>
+      </field>
+      <field name="count">
+        <type name="int32" c:type="gint"/>
+      </field>
+    </record>
+    <record name="GdkEventNoExpose" c:type="GdkEventNoExpose">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+    </record>
+    <record name="GdkEventVisibility" c:type="GdkEventVisibility">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="state">
+        <type name="VisibilityState" c:type="GdkVisibilityState"/>
+      </field>
+    </record>
+    <record name="GdkEventMotion" c:type="GdkEventMotion">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="time">
+        <type name="uint32" c:type="guint32"/>
+      </field>
+      <field name="x">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="y">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="axes">
+        <type name="GLib.gdouble" c:type="gdouble*"/>
+      </field>
+      <field name="state">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="is_hint">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="device">
+        <type name="Device" c:type="GdkDevice*"/>
+      </field>
+      <field name="x_root">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="y_root">
+        <type name="double" c:type="gdouble"/>
+      </field>
+    </record>
+    <record name="GdkEventButton" c:type="GdkEventButton">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="time">
+        <type name="uint32" c:type="guint32"/>
+      </field>
+      <field name="x">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="y">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="axes">
+        <type name="GLib.gdouble" c:type="gdouble*"/>
+      </field>
+      <field name="state">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="button">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="device">
+        <type name="Device" c:type="GdkDevice*"/>
+      </field>
+      <field name="x_root">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="y_root">
+        <type name="double" c:type="gdouble"/>
+      </field>
+    </record>
+    <record name="GdkEventScroll" c:type="GdkEventScroll">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="time">
+        <type name="uint32" c:type="guint32"/>
+      </field>
+      <field name="x">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="y">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="state">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="direction">
+        <type name="ScrollDirection" c:type="GdkScrollDirection"/>
+      </field>
+      <field name="device">
+        <type name="Device" c:type="GdkDevice*"/>
+      </field>
+      <field name="x_root">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="y_root">
+        <type name="double" c:type="gdouble"/>
+      </field>
+    </record>
+    <record name="GdkEventKey" c:type="GdkEventKey">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="time">
+        <type name="uint32" c:type="guint32"/>
+      </field>
+      <field name="state">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="keyval">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="length">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="string">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="hardware_keycode">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="group">
+        <type name="uint8" c:type="guint8"/>
+      </field>
+      <field name="is_modifier">
+        <type name="uint32" c:type="guint"/>
+      </field>
+    </record>
+    <record name="GdkEventFocus" c:type="GdkEventFocus">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="in">
+        <type name="int16" c:type="gint16"/>
+      </field>
+    </record>
+    <record name="GdkEventCrossing" c:type="GdkEventCrossing">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="subwindow">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="time">
+        <type name="uint32" c:type="guint32"/>
+      </field>
+      <field name="x">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="y">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="x_root">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="y_root">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="mode">
+        <type name="CrossingMode" c:type="GdkCrossingMode"/>
+      </field>
+      <field name="detail">
+        <type name="NotifyType" c:type="GdkNotifyType"/>
+      </field>
+      <field name="focus">
+        <type name="boolean" c:type="gboolean"/>
+      </field>
+      <field name="state">
+        <type name="uint32" c:type="guint"/>
+      </field>
+    </record>
+    <record name="GdkEventConfigure" c:type="GdkEventConfigure">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="x">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="y">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="width">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="height">
+        <type name="int32" c:type="gint"/>
+      </field>
+    </record>
+    <record name="GdkEventProperty" c:type="GdkEventProperty">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="atom">
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </field>
+      <field name="time">
+        <type name="uint32" c:type="guint32"/>
+      </field>
+      <field name="state">
+        <type name="uint32" c:type="guint"/>
+      </field>
+    </record>
+    <record name="GdkEventSelection" c:type="GdkEventSelection">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="selection">
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </field>
+      <field name="target">
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </field>
+      <field name="property">
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </field>
+      <field name="time">
+        <type name="uint32" c:type="guint32"/>
+      </field>
+      <field name="requestor">
+        <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+      </field>
+    </record>
+    <record name="GdkEventOwnerChange" c:type="GdkEventOwnerChange">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="owner">
+        <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+      </field>
+      <field name="reason">
+        <type name="OwnerChange" c:type="GdkOwnerChange"/>
+      </field>
+      <field name="selection">
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </field>
+      <field name="time">
+        <type name="uint32" c:type="guint32"/>
+      </field>
+      <field name="selection_time">
+        <type name="uint32" c:type="guint32"/>
+      </field>
+    </record>
+    <record name="GdkEventProximity" c:type="GdkEventProximity">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="time">
+        <type name="uint32" c:type="guint32"/>
+      </field>
+      <field name="device">
+        <type name="Device" c:type="GdkDevice*"/>
+      </field>
+    </record>
+    <record name="GdkEventClient" c:type="GdkEventClient">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="message_type">
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </field>
+      <field name="data_format">
+        <type name="GLib.gushort" c:type="gushort"/>
+      </field>
+      <field name="data">
+        <type name="???" c:type="???"/>
+      </field>
+    </record>
+    <record name="GdkEventDND" c:type="GdkEventDND">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="context">
+        <type name="DragContext" c:type="GdkDragContext*"/>
+      </field>
+      <field name="time">
+        <type name="uint32" c:type="guint32"/>
+      </field>
+      <field name="x_root">
+        <type name="GLib.gshort" c:type="gshort"/>
+      </field>
+      <field name="y_root">
+        <type name="GLib.gshort" c:type="gshort"/>
+      </field>
+    </record>
+    <record name="GdkEventWindowState" c:type="GdkEventWindowState">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="changed_mask">
+        <type name="WindowState" c:type="GdkWindowState"/>
+      </field>
+      <field name="new_window_state">
+        <type name="WindowState" c:type="GdkWindowState"/>
+      </field>
+    </record>
+    <record name="GdkEventSetting" c:type="GdkEventSetting">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="action">
+        <type name="SettingAction" c:type="GdkSettingAction"/>
+      </field>
+      <field name="name">
+        <type name="string" c:type="char*"/>
+      </field>
+    </record>
+    <record name="GdkEventGrabBroken" c:type="GdkEventGrabBroken">
+      <field name="type">
+        <type name="EventType" c:type="GdkEventType"/>
+      </field>
+      <field name="window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="send_event">
+        <type name="int8" c:type="gint8"/>
+      </field>
+      <field name="keyboard">
+        <type name="boolean" c:type="gboolean"/>
+      </field>
+      <field name="implicit">
+        <type name="boolean" c:type="gboolean"/>
+      </field>
+      <field name="grab_window">
+        <type name="Window" c:type="GdkWindow*"/>
+      </field>
+    </record>
+    <callback name="GdkEventFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="event">
+          <type name="Event" c:type="GdkEvent*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <enumeration name="FilterReturn"
+                 c:type="GdkFilterReturn"
+                 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"/>
+      <member name="translate"
+              value="1"
+              c:identifier="GDK_FILTER_TRANSLATE"
+              glib:nick="translate"/>
+      <member name="remove"
+              value="2"
+              c:identifier="GDK_FILTER_REMOVE"
+              glib:nick="remove"/>
+    </enumeration>
+    <callback name="GdkFilterFunc">
+      <return-value>
+        <type name="FilterReturn" c:type="GdkFilterReturn"/>
+      </return-value>
+      <parameters>
+        <parameter name="xevent">
+          <type name="GdkXEvent" c:type="GdkXEvent*"/>
+        </parameter>
+        <parameter name="event">
+          <type name="Event" c:type="GdkEvent*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <enumeration name="EventType"
+                 c:type="GdkEventType"
+                 glib:type-name="GdkEventType"
+                 glib:get-type="gdk_event_type_get_type">
+      <member name="nothing"
+              value="-1"
+              c:identifier="GDK_NOTHING"
+              glib:nick="nothing"/>
+      <member name="delete"
+              value="0"
+              c:identifier="GDK_DELETE"
+              glib:nick="delete"/>
+      <member name="destroy"
+              value="1"
+              c:identifier="GDK_DESTROY"
+              glib:nick="destroy"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="map" value="14" c:identifier="GDK_MAP" glib:nick="map"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="grab-broken"
+              value="35"
+              c:identifier="GDK_GRAB_BROKEN"
+              glib:nick="grab-broken"/>
+    </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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
     </enumeration>
-    <glib:boxed c:type="Cursor"
-                glib:name="Cursor"
-                glib:type-name="GdkCursor"
-                glib:get-type="gdk_cursor_get_type">
-      <constructor name="new_for_display"
-                   c:identifier="gdk_cursor_new_for_display">
+    <enumeration name="ScrollDirection"
+                 c:type="GdkScrollDirection"
+                 glib:type-name="GdkScrollDirection"
+                 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"/>
+      <member name="left"
+              value="2"
+              c:identifier="GDK_SCROLL_LEFT"
+              glib:nick="left"/>
+      <member name="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"/>
+      <member name="virtual"
+              value="1"
+              c:identifier="GDK_NOTIFY_VIRTUAL"
+              glib:nick="virtual"/>
+      <member name="inferior"
+              value="2"
+              c:identifier="GDK_NOTIFY_INFERIOR"
+              glib:nick="inferior"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="grab"
+              value="1"
+              c:identifier="GDK_CROSSING_GRAB"
+              glib:nick="grab"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+      <member name="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"/>
+    </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"/>
+      <member name="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"/>
+    </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"/>
+      <member name="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"/>
+    </enumeration>
+    <glib:boxed c:type="Event"
+                glib:name="Event"
+                glib:type-name="GdkEvent"
+                glib:get-type="gdk_event_get_type">
+      <constructor name="get" c:identifier="gdk_event_get">
+        <return-value>
+          <type name="Event" c:type="GdkEvent*"/>
+        </return-value>
+      </constructor>
+      <constructor name="peek" c:identifier="gdk_event_peek">
+        <return-value>
+          <type name="Event" c:type="GdkEvent*"/>
+        </return-value>
+      </constructor>
+      <constructor name="get_graphics_expose"
+                   c:identifier="gdk_event_get_graphics_expose">
+        <return-value>
+          <type name="Event" c:type="GdkEvent*"/>
+        </return-value>
+        <parameters>
+          <parameter name="window">
+            <type name="Window" c:type="GdkWindow*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new" c:identifier="gdk_event_new">
+        <return-value>
+          <type name="Event" c:type="GdkEvent*"/>
+        </return-value>
+        <parameters>
+          <parameter name="type">
+            <type name="EventType" c:type="GdkEventType"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="copy" c:identifier="gdk_event_copy">
+        <return-value>
+          <type name="Event" c:type="GdkEvent*"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="put" c:identifier="gdk_event_put">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="free" c:identifier="gdk_event_free">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_time" c:identifier="gdk_event_get_time">
+        <return-value>
+          <type name="uint32" c:type="guint32"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_state" c:identifier="gdk_event_get_state">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="state">
+            <type name="ModifierType" c:type="GdkModifierType*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_coords" c:identifier="gdk_event_get_coords">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="x_win">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
+          </parameter>
+          <parameter name="y_win">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_root_coords" c:identifier="gdk_event_get_root_coords">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="x_root">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
+          </parameter>
+          <parameter name="y_root">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_axis" c:identifier="gdk_event_get_axis">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="axis_use">
+            <type name="AxisUse" c:type="GdkAxisUse"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_screen" c:identifier="gdk_event_set_screen">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="screen">
+            <type name="Screen" c:type="GdkScreen*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_screen" c:identifier="gdk_event_get_screen">
+        <return-value>
+          <type name="Screen" c:type="GdkScreen*"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="send_client_message"
+              c:identifier="gdk_event_send_client_message">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="winid">
+            <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="send_clientmessage_toall"
+              c:identifier="gdk_event_send_clientmessage_toall">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <function name="events_pending" c:identifier="gdk_events_pending">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+    </function>
+    <function name="event_request_motions"
+              c:identifier="gdk_event_request_motions">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="event">
+          <type name="GdkEventMotion" c:type="GdkEventMotion*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="event_handler_set" c:identifier="gdk_event_handler_set">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="func">
+          <type name="GdkEventFunc" c:type="GdkEventFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="notify">
+          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="set_show_events" c:identifier="gdk_set_show_events">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="show_events">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="get_show_events" c:identifier="gdk_get_show_events">
+      <return-value>
+        <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="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="message_type">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GdkFilterFunc" c:type="GdkFilterFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="setting_get" c:identifier="gdk_setting_get">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="value">
+          <type name="GObject.GValue" c:type="GValue*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GdkDisplayPointerHooks" c:type="GdkDisplayPointerHooks">
+      <callback name="get_pointer">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="screen">
+            <type name="Screen" c:type="GdkScreen**"/>
+          </parameter>
+          <parameter name="x">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="ModifierType" c:type="GdkModifierType*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="window_get_pointer">
+        <return-value>
+          <type name="Window" c:type="GdkWindow*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="window">
+            <type name="Window" c:type="GdkWindow*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="ModifierType" c:type="GdkModifierType*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="window_at_pointer">
+        <return-value>
+          <type name="Window" c:type="GdkWindow*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="win_x">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="win_y">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
+    <class name="Display"
+           c:type="GdkDisplay"
+           parent="GObject.Object"
+           glib:type-name="GdkDisplay"
+           glib:get-type="gdk_display_get_type">
+      <constructor name="open" c:identifier="gdk_display_open">
+        <return-value>
+          <type name="Display" c:type="GdkDisplay*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="get_default" c:identifier="gdk_display_get_default">
+        <return-value>
+          <type name="Display" c:type="GdkDisplay*"/>
+        </return-value>
+      </constructor>
+      <constructor name="open_default_libgtk_only"
+                   c:identifier="gdk_display_open_default_libgtk_only">
+        <return-value>
+          <type name="Display" c:type="GdkDisplay*"/>
+        </return-value>
+      </constructor>
+      <constructor name="manager_get_default_display"
+                   c:identifier="gdk_display_manager_get_default_display">
+        <return-value>
+          <type name="Display" c:type="GdkDisplay*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display_manager">
+            <type name="DisplayManager" c:type="GdkDisplayManager*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="get_name" c:identifier="gdk_display_get_name">
         <return-value>
-          <type name="Cursor" c:type="GdkCursor*"/>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_n_screens" c:identifier="gdk_display_get_n_screens">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_screen" c:identifier="gdk_display_get_screen">
+        <return-value>
+          <type name="Screen" c:type="GdkScreen*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="screen_num">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_default_screen"
+              c:identifier="gdk_display_get_default_screen">
+        <return-value>
+          <type name="Screen" c:type="GdkScreen*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="pointer_ungrab" c:identifier="gdk_display_pointer_ungrab">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="uint32" c:type="guint32"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="keyboard_ungrab"
+              c:identifier="gdk_display_keyboard_ungrab">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="time_">
+            <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="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="beep" c:identifier="gdk_display_beep">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="sync" c:identifier="gdk_display_sync">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="flush" c:identifier="gdk_display_flush">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="close" c:identifier="gdk_display_close">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="list_devices" c:identifier="gdk_display_list_devices">
+        <return-value>
+          <type name="GLib.GList" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_event" c:identifier="gdk_display_get_event">
+        <return-value>
+          <type name="Event" c:type="GdkEvent*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="peek_event" c:identifier="gdk_display_peek_event">
+        <return-value>
+          <type name="Event" c:type="GdkEvent*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="put_event" c:identifier="gdk_display_put_event">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_client_message_filter"
+              c:identifier="gdk_display_add_client_message_filter">
+        <return-value>
+          <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="GdkAtom" c:type="GdkAtom"/>
+          </parameter>
+          <parameter name="func">
+            <type name="GdkFilterFunc" c:type="GdkFilterFunc"/>
+          </parameter>
+          <parameter name="data">
+            <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="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="msec">
+            <type name="uint32" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_double_click_distance"
+              c:identifier="gdk_display_set_double_click_distance">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="distance">
+            <type name="uint32" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_core_pointer"
+              c:identifier="gdk_display_get_core_pointer">
+        <return-value>
+          <type name="Device" c:type="GdkDevice*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_pointer" c:identifier="gdk_display_get_pointer">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="screen">
+            <type name="Screen" c:type="GdkScreen**"/>
+          </parameter>
+          <parameter name="x" direction="out">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="y" direction="out">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="mask" direction="out">
+            <type name="ModifierType" c:type="GdkModifierType*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_window_at_pointer"
+              c:identifier="gdk_display_get_window_at_pointer">
+        <return-value>
+          <type name="Window" c:type="GdkWindow*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="win_x" direction="out">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="win_y" direction="out">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="warp_pointer" c:identifier="gdk_display_warp_pointer">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
-          <parameter name="cursor_type">
-            <type name="GdkCursorType" c:type="GdkCursorType"/>
+          <parameter name="screen">
+            <type name="Screen" c:type="GdkScreen*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new" c:identifier="gdk_cursor_new">
+      </method>
+      <method name="set_pointer_hooks"
+              c:identifier="gdk_display_set_pointer_hooks">
         <return-value>
-          <type name="Cursor" c:type="GdkCursor*"/>
+          <type name="GdkDisplayPointerHooks"
+                c:type="GdkDisplayPointerHooks*"/>
         </return-value>
         <parameters>
-          <parameter name="cursor_type">
-            <type name="GdkCursorType" c:type="GdkCursorType"/>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="new_hooks">
+            <type name="GdkDisplayPointerHooks"
+                  c:type="GdkDisplayPointerHooks*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_pixmap"
-                   c:identifier="gdk_cursor_new_from_pixmap">
+      </method>
+      <method name="supports_cursor_alpha"
+              c:identifier="gdk_display_supports_cursor_alpha">
         <return-value>
-          <type name="Cursor" c:type="GdkCursor*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="GdkPixmap" c:type="GdkPixmap*"/>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
-          <parameter name="mask">
-            <type name="GdkPixmap" c:type="GdkPixmap*"/>
+        </parameters>
+      </method>
+      <method name="supports_cursor_color"
+              c:identifier="gdk_display_supports_cursor_color">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
-          <parameter name="fg">
-            <type name="Color" c:type="GdkColor*"/>
+        </parameters>
+      </method>
+      <method name="get_default_cursor_size"
+              c:identifier="gdk_display_get_default_cursor_size">
+        <return-value>
+          <type name="uint32" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
-          <parameter name="bg">
-            <type name="Color" c:type="GdkColor*"/>
+        </parameters>
+      </method>
+      <method name="get_maximal_cursor_size"
+              c:identifier="gdk_display_get_maximal_cursor_size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
+          <parameter name="width" direction="out">
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="height" direction="out">
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_pixbuf"
-                   c:identifier="gdk_cursor_new_from_pixbuf">
+      </method>
+      <method name="get_default_group"
+              c:identifier="gdk_display_get_default_group">
         <return-value>
-          <type name="Cursor" c:type="GdkCursor*"/>
+          <type name="Window" c:type="GdkWindow*"/>
         </return-value>
         <parameters>
           <parameter name="display">
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+        </parameters>
+      </method>
+      <method name="supports_selection_notification"
+              c:identifier="gdk_display_supports_selection_notification">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </method>
+      <method name="request_selection_notification"
+              c:identifier="gdk_display_request_selection_notification">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="selection">
+            <type name="GdkAtom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="ref" c:identifier="gdk_cursor_ref">
+      </method>
+      <method name="supports_clipboard_persistence"
+              c:identifier="gdk_display_supports_clipboard_persistence">
         <return-value>
-          <type name="Cursor" c:type="GdkCursor*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="cursor">
-            <type name="Cursor" c:type="GdkCursor*"/>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_name"
-                   c:identifier="gdk_cursor_new_from_name">
+      </method>
+      <method name="store_clipboard"
+              c:identifier="gdk_display_store_clipboard">
         <return-value>
-          <type name="Cursor" c:type="GdkCursor*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="display">
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="clipboard_window">
+            <type name="Window" c:type="GdkWindow*"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="uint32" c:type="guint32"/>
+          </parameter>
+          <parameter name="targets">
+            <type name="GdkAtom" c:type="GdkAtom*"/>
+          </parameter>
+          <parameter name="n_targets">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="get_display" c:identifier="gdk_cursor_get_display">
+      </method>
+      <method name="supports_shapes"
+              c:identifier="gdk_display_supports_shapes">
         <return-value>
-          <type name="Display" c:type="GdkDisplay*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="cursor">
-            <type name="Cursor" c:type="GdkCursor*"/>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unref" c:identifier="gdk_cursor_unref">
+      <method name="supports_input_shapes"
+              c:identifier="gdk_display_supports_input_shapes">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="cursor">
-            <type name="Cursor" c:type="GdkCursor*"/>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_image" c:identifier="gdk_cursor_get_image">
+      <method name="supports_composite"
+              c:identifier="gdk_display_supports_composite">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="cursor">
-            <type name="Cursor" c:type="GdkCursor*"/>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
         </parameters>
       </method>
-    </glib:boxed>
+      <callback name="get_display_name">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_n_screens">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_screen">
+        <return-value>
+          <type name="Screen" c:type="GdkScreen*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="screen_num">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_default_screen">
+        <return-value>
+          <type name="Screen" c:type="GdkScreen*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="closed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="is_error">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <glib:signal name="closed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
     <class name="DisplayManager"
            c:type="GdkDisplayManager"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GdkDisplayManager"
            glib:get-type="gdk_display_manager_get_type">
       <constructor name="get" c:identifier="gdk_display_manager_get">
@@ -4232,7 +4138,7 @@
       <method name="list_displays"
               c:identifier="gdk_display_manager_list_displays">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
           <parameter name="display_manager">
@@ -4241,7 +4147,7 @@
         </parameters>
       </method>
       <property name="default-display">
-        <type name="GdkDisplay" c:type="GdkDisplay"/>
+        <type name="Display" c:type="GdkDisplay"/>
       </property>
       <callback name="display_opened">
         <return-value>
@@ -4249,10 +4155,10 @@
         </return-value>
         <parameters>
           <parameter name="display_manager">
-            <type name="GdkDisplayManager*" c:type="GdkDisplayManager*"/>
+            <type name="DisplayManager" c:type="GdkDisplayManager*"/>
           </parameter>
           <parameter name="display">
-            <type name="GdkDisplay*" c:type="GdkDisplay*"/>
+            <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4262,38 +4168,38 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkDisplay" c:type="GdkDisplay"/>
+            <type name="Display" c:type="GdkDisplay"/>
           </parameter>
         </parameters>
       </glib:signal>
     </class>
     <record name="GdkGCValues" c:type="GdkGCValues">
       <field name="foreground">
-        <type name="GdkColor" c:type="GdkColor"/>
+        <type name="Color" c:type="GdkColor"/>
       </field>
       <field name="background">
-        <type name="GdkColor" c:type="GdkColor"/>
+        <type name="Color" c:type="GdkColor"/>
       </field>
       <field name="font">
-        <type name="GdkFont*" c:type="GdkFont*"/>
+        <type name="Font" c:type="GdkFont*"/>
       </field>
       <field name="function">
-        <type name="GdkFunction" c:type="GdkFunction"/>
+        <type name="Function" c:type="GdkFunction"/>
       </field>
       <field name="fill">
-        <type name="GdkFill" c:type="GdkFill"/>
+        <type name="Fill" c:type="GdkFill"/>
       </field>
       <field name="tile">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+        <type name="Pixmap" c:type="GdkPixmap*"/>
       </field>
       <field name="stipple">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+        <type name="Pixmap" c:type="GdkPixmap*"/>
       </field>
       <field name="clip_mask">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+        <type name="Pixmap" c:type="GdkPixmap*"/>
       </field>
       <field name="subwindow_mode">
-        <type name="GdkSubwindowMode" c:type="GdkSubwindowMode"/>
+        <type name="SubwindowMode" c:type="GdkSubwindowMode"/>
       </field>
       <field name="ts_x_origin">
         <type name="int32" c:type="gint"/>
@@ -4314,13 +4220,13 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="line_style">
-        <type name="GdkLineStyle" c:type="GdkLineStyle"/>
+        <type name="LineStyle" c:type="GdkLineStyle"/>
       </field>
       <field name="cap_style">
-        <type name="GdkCapStyle" c:type="GdkCapStyle"/>
+        <type name="CapStyle" c:type="GdkCapStyle"/>
       </field>
       <field name="join_style">
-        <type name="GdkJoinStyle" c:type="GdkJoinStyle"/>
+        <type name="JoinStyle" c:type="GdkJoinStyle"/>
       </field>
     </record>
     <enumeration name="CapStyle"
@@ -4536,7 +4442,7 @@
     </bitfield>
     <class name="GC"
            c:type="GdkGC"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GdkGC"
            glib:get-type="gdk_gc_get_type">
       <constructor name="new" c:identifier="gdk_gc_new">
@@ -4545,7 +4451,7 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -4556,13 +4462,13 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="values">
             <type name="GdkGCValues" c:type="GdkGCValues*"/>
           </parameter>
           <parameter name="values_mask">
-            <type name="GdkGCValuesMask" c:type="GdkGCValuesMask"/>
+            <type name="GCValuesMask" c:type="GdkGCValuesMask"/>
           </parameter>
         </parameters>
       </constructor>
@@ -4611,7 +4517,7 @@
             <type name="GdkGCValues" c:type="GdkGCValues*"/>
           </parameter>
           <parameter name="values_mask">
-            <type name="GdkGCValuesMask" c:type="GdkGCValuesMask"/>
+            <type name="GCValuesMask" c:type="GdkGCValuesMask"/>
           </parameter>
         </parameters>
       </method>
@@ -4650,7 +4556,7 @@
             <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="font">
-            <type name="GdkFont" c:type="GdkFont*"/>
+            <type name="Font" c:type="GdkFont*"/>
           </parameter>
         </parameters>
       </method>
@@ -4663,7 +4569,7 @@
             <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="function">
-            <type name="GdkFunction" c:type="GdkFunction"/>
+            <type name="Function" c:type="GdkFunction"/>
           </parameter>
         </parameters>
       </method>
@@ -4676,7 +4582,7 @@
             <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="fill">
-            <type name="GdkFill" c:type="GdkFill"/>
+            <type name="Fill" c:type="GdkFill"/>
           </parameter>
         </parameters>
       </method>
@@ -4689,7 +4595,7 @@
             <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="tile">
-            <type name="GdkPixmap" c:type="GdkPixmap*"/>
+            <type name="Pixmap" c:type="GdkPixmap*"/>
           </parameter>
         </parameters>
       </method>
@@ -4702,7 +4608,7 @@
             <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="stipple">
-            <type name="GdkPixmap" c:type="GdkPixmap*"/>
+            <type name="Pixmap" c:type="GdkPixmap*"/>
           </parameter>
         </parameters>
       </method>
@@ -4761,7 +4667,7 @@
             <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="rectangle">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </method>
@@ -4787,7 +4693,7 @@
             <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="mode">
-            <type name="GdkSubwindowMode" c:type="GdkSubwindowMode"/>
+            <type name="SubwindowMode" c:type="GdkSubwindowMode"/>
           </parameter>
         </parameters>
       </method>
@@ -4817,13 +4723,13 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="line_style">
-            <type name="GdkLineStyle" c:type="GdkLineStyle"/>
+            <type name="LineStyle" c:type="GdkLineStyle"/>
           </parameter>
           <parameter name="cap_style">
-            <type name="GdkCapStyle" c:type="GdkCapStyle"/>
+            <type name="CapStyle" c:type="GdkCapStyle"/>
           </parameter>
           <parameter name="join_style">
-            <type name="GdkJoinStyle" c:type="GdkJoinStyle"/>
+            <type name="JoinStyle" c:type="GdkJoinStyle"/>
           </parameter>
         </parameters>
       </method>
@@ -4926,7 +4832,7 @@
       </method>
       <method name="get_screen" c:identifier="gdk_gc_get_screen">
         <return-value>
-          <type name="GdkScreen" c:type="GdkScreen*"/>
+          <type name="Screen" c:type="GdkScreen*"/>
         </return-value>
         <parameters>
           <parameter name="gc">
@@ -4940,10 +4846,10 @@
         </return-value>
         <parameters>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="values">
-            <type name="GdkGCValues*" c:type="GdkGCValues*"/>
+            <type name="GdkGCValues" c:type="GdkGCValues*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4953,13 +4859,13 @@
         </return-value>
         <parameters>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="values">
-            <type name="GdkGCValues*" c:type="GdkGCValues*"/>
+            <type name="GdkGCValues" c:type="GdkGCValues*"/>
           </parameter>
           <parameter name="mask">
-            <type name="GdkGCValuesMask" c:type="GdkGCValuesMask"/>
+            <type name="GCValuesMask" c:type="GdkGCValuesMask"/>
           </parameter>
         </parameters>
       </callback>
@@ -4969,7 +4875,7 @@
         </return-value>
         <parameters>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="dash_offset">
             <type name="int32" c:type="gint"/>
@@ -5025,7 +4931,7 @@
     </record>
     <class name="Drawable"
            c:type="GdkDrawable"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GdkDrawable"
            glib:get-type="gdk_drawable_get_type">
       <constructor name="ref" c:identifier="gdk_drawable_ref">
@@ -5053,7 +4959,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="destroy_func">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
@@ -5079,10 +4985,10 @@
             <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="width" direction="out">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height" direction="out">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -5111,7 +5017,7 @@
       </method>
       <method name="get_visual" c:identifier="gdk_drawable_get_visual">
         <return-value>
-          <type name="GdkVisual" c:type="GdkVisual*"/>
+          <type name="Visual" c:type="GdkVisual*"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5131,7 +5037,7 @@
       </method>
       <method name="get_screen" c:identifier="gdk_drawable_get_screen">
         <return-value>
-          <type name="GdkScreen" c:type="GdkScreen*"/>
+          <type name="Screen" c:type="GdkScreen*"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5161,7 +5067,7 @@
       </method>
       <method name="get_image" c:identifier="gdk_drawable_get_image">
         <return-value>
-          <type name="GdkImage" c:type="GdkImage*"/>
+          <type name="Image" c:type="GdkImage*"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
@@ -5183,14 +5089,14 @@
       </method>
       <method name="copy_to_image" c:identifier="gdk_drawable_copy_to_image">
         <return-value>
-          <type name="GdkImage" c:type="GdkImage*"/>
+          <type name="Image" c:type="GdkImage*"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
             <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="image">
-            <type name="GdkImage" c:type="GdkImage*"/>
+            <type name="Image" c:type="GdkImage*"/>
           </parameter>
           <parameter name="src_x">
             <type name="int32" c:type="gint"/>
@@ -5236,17 +5142,17 @@
       </method>
       <callback name="create_gc">
         <return-value>
-          <type name="GdkGC*" c:type="GdkGC*"/>
+          <type name="GC" c:type="GdkGC*"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="values">
-            <type name="GdkGCValues*" c:type="GdkGCValues*"/>
+            <type name="GdkGCValues" c:type="GdkGCValues*"/>
           </parameter>
           <parameter name="mask">
-            <type name="GdkGCValuesMask" c:type="GdkGCValuesMask"/>
+            <type name="GCValuesMask" c:type="GdkGCValuesMask"/>
           </parameter>
         </parameters>
       </callback>
@@ -5256,10 +5162,10 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="filled">
             <type name="boolean" c:type="gboolean"/>
@@ -5284,10 +5190,10 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="filled">
             <type name="boolean" c:type="gboolean"/>
@@ -5318,16 +5224,16 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="filled">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="points">
-            <type name="GdkPoint*" c:type="GdkPoint*"/>
+            <type name="GdkPoint" c:type="GdkPoint*"/>
           </parameter>
           <parameter name="npoints">
             <type name="int32" c:type="gint"/>
@@ -5340,13 +5246,13 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="font">
-            <type name="GdkFont*" c:type="GdkFont*"/>
+            <type name="Font" c:type="GdkFont*"/>
           </parameter>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -5368,13 +5274,13 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="font">
-            <type name="GdkFont*" c:type="GdkFont*"/>
+            <type name="Font" c:type="GdkFont*"/>
           </parameter>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -5383,7 +5289,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="text">
-            <type name="GdkWChar*" c:type="GdkWChar*"/>
+            <type name="GdkWChar" c:type="GdkWChar*"/>
           </parameter>
           <parameter name="text_length">
             <type name="int32" c:type="gint"/>
@@ -5396,13 +5302,13 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="src">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="xsrc">
             <type name="int32" c:type="gint"/>
@@ -5430,13 +5336,13 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="points">
-            <type name="GdkPoint*" c:type="GdkPoint*"/>
+            <type name="GdkPoint" c:type="GdkPoint*"/>
           </parameter>
           <parameter name="npoints">
             <type name="int32" c:type="gint"/>
@@ -5449,13 +5355,13 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="segs">
-            <type name="GdkSegment*" c:type="GdkSegment*"/>
+            <type name="GdkSegment" c:type="GdkSegment*"/>
           </parameter>
           <parameter name="nsegs">
             <type name="int32" c:type="gint"/>
@@ -5468,13 +5374,13 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="points">
-            <type name="GdkPoint*" c:type="GdkPoint*"/>
+            <type name="GdkPoint" c:type="GdkPoint*"/>
           </parameter>
           <parameter name="npoints">
             <type name="int32" c:type="gint"/>
@@ -5487,13 +5393,13 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="font">
-            <type name="PangoFont*" c:type="PangoFont*"/>
+            <type name="Pango.Font" c:type="PangoFont*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -5502,7 +5408,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="glyphs">
-            <type name="PangoGlyphString*" c:type="PangoGlyphString*"/>
+            <type name="PangoGlyphString" c:type="PangoGlyphString*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5512,13 +5418,13 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="image">
-            <type name="GdkImage*" c:type="GdkImage*"/>
+            <type name="Image" c:type="GdkImage*"/>
           </parameter>
           <parameter name="xsrc">
             <type name="int32" c:type="gint"/>
@@ -5546,7 +5452,7 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5556,13 +5462,13 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5572,50 +5478,50 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="cmap">
-            <type name="GdkColormap*" c:type="GdkColormap*"/>
+            <type name="Colormap" c:type="GdkColormap*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_colormap">
         <return-value>
-          <type name="GdkColormap*" c:type="GdkColormap*"/>
+          <type name="Colormap" c:type="GdkColormap*"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_visual">
         <return-value>
-          <type name="GdkVisual*" c:type="GdkVisual*"/>
+          <type name="Visual" c:type="GdkVisual*"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_screen">
         <return-value>
-          <type name="GdkScreen*" c:type="GdkScreen*"/>
+          <type name="Screen" c:type="GdkScreen*"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_image">
         <return-value>
-          <type name="GdkImage*" c:type="GdkImage*"/>
+          <type name="Image" c:type="GdkImage*"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -5633,31 +5539,31 @@
       </callback>
       <callback name="get_clip_region">
         <return-value>
-          <type name="GdkRegion*" c:type="GdkRegion*"/>
+          <type name="GdkRegion" c:type="GdkRegion*"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_visible_region">
         <return-value>
-          <type name="GdkRegion*" c:type="GdkRegion*"/>
+          <type name="GdkRegion" c:type="GdkRegion*"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_composite_drawable">
         <return-value>
-          <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+          <type name="Drawable" c:type="GdkDrawable*"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -5672,10 +5578,10 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="composite_x_offset">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="composite_y_offset">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5685,13 +5591,13 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="src_x">
             <type name="int32" c:type="gint"/>
@@ -5712,7 +5618,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dither">
-            <type name="GdkRgbDither" c:type="GdkRgbDither"/>
+            <type name="RgbDither" c:type="GdkRgbDither"/>
           </parameter>
           <parameter name="x_dither">
             <type name="int32" c:type="gint"/>
@@ -5724,14 +5630,14 @@
       </callback>
       <callback name="_copy_to_image">
         <return-value>
-          <type name="GdkImage*" c:type="GdkImage*"/>
+          <type name="Image" c:type="GdkImage*"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="image">
-            <type name="GdkImage*" c:type="GdkImage*"/>
+            <type name="Image" c:type="GdkImage*"/>
           </parameter>
           <parameter name="src_x">
             <type name="int32" c:type="gint"/>
@@ -5759,16 +5665,16 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="matrix">
-            <type name="PangoMatrix*" c:type="PangoMatrix*"/>
+            <type name="PangoMatrix" c:type="PangoMatrix*"/>
           </parameter>
           <parameter name="font">
-            <type name="PangoFont*" c:type="PangoFont*"/>
+            <type name="Pango.Font" c:type="PangoFont*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -5777,7 +5683,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="glyphs">
-            <type name="PangoGlyphString*" c:type="PangoGlyphString*"/>
+            <type name="PangoGlyphString" c:type="PangoGlyphString*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5787,13 +5693,13 @@
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="gc">
-            <type name="GdkGC*" c:type="GdkGC*"/>
+            <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="trapezoids">
-            <type name="GdkTrapezoid*" c:type="GdkTrapezoid*"/>
+            <type name="GdkTrapezoid" c:type="GdkTrapezoid*"/>
           </parameter>
           <parameter name="n_trapezoids">
             <type name="int32" c:type="gint"/>
@@ -5802,11 +5708,11 @@
       </callback>
       <callback name="ref_cairo_surface">
         <return-value>
-          <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+          <type name="Cairo.cairo_surface_t" c:type="cairo_surface_t*"/>
         </return-value>
         <parameters>
           <parameter name="drawable">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5994,7 +5900,7 @@
         <parameter name="points">
           <type name="GdkPoint" c:type="GdkPoint*"/>
         </parameter>
-        <parameter name="n_points">
+        <parameter name="npoints">
           <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
@@ -6008,7 +5914,7 @@
           <type name="Drawable" c:type="GdkDrawable*"/>
         </parameter>
         <parameter name="font">
-          <type name="GdkFont" c:type="GdkFont*"/>
+          <type name="Font" c:type="GdkFont*"/>
         </parameter>
         <parameter name="gc">
           <type name="GC" c:type="GdkGC*"/>
@@ -6033,7 +5939,7 @@
           <type name="Drawable" c:type="GdkDrawable*"/>
         </parameter>
         <parameter name="font">
-          <type name="GdkFont" c:type="GdkFont*"/>
+          <type name="Font" c:type="GdkFont*"/>
         </parameter>
         <parameter name="gc">
           <type name="GC" c:type="GdkGC*"/>
@@ -6061,7 +5967,7 @@
           <type name="Drawable" c:type="GdkDrawable*"/>
         </parameter>
         <parameter name="font">
-          <type name="GdkFont" c:type="GdkFont*"/>
+          <type name="Font" c:type="GdkFont*"/>
         </parameter>
         <parameter name="gc">
           <type name="GC" c:type="GdkGC*"/>
@@ -6126,7 +6032,7 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="image">
-          <type name="GdkImage" c:type="GdkImage*"/>
+          <type name="Image" c:type="GdkImage*"/>
         </parameter>
         <parameter name="xsrc">
           <type name="int32" c:type="gint"/>
@@ -6162,7 +6068,7 @@
         <parameter name="points">
           <type name="GdkPoint" c:type="GdkPoint*"/>
         </parameter>
-        <parameter name="n_points">
+        <parameter name="npoints">
           <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
@@ -6181,7 +6087,7 @@
         <parameter name="segs">
           <type name="GdkSegment" c:type="GdkSegment*"/>
         </parameter>
-        <parameter name="n_segs">
+        <parameter name="nsegs">
           <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
@@ -6200,7 +6106,7 @@
         <parameter name="points">
           <type name="GdkPoint" c:type="GdkPoint*"/>
         </parameter>
-        <parameter name="n_points">
+        <parameter name="npoints">
           <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
@@ -6238,7 +6144,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="dither">
-          <type name="GdkRgbDither" c:type="GdkRgbDither"/>
+          <type name="RgbDither" c:type="GdkRgbDither"/>
         </parameter>
         <parameter name="x_dither">
           <type name="int32" c:type="gint"/>
@@ -6962,7 +6868,7 @@
     <function name="fontset_load_for_display"
               c:identifier="gdk_fontset_load_for_display">
       <return-value>
-        <type name="GdkFont*" c:type="GdkFont*"/>
+        <type name="Font" c:type="GdkFont*"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -6975,7 +6881,7 @@
     </function>
     <function name="fontset_load" c:identifier="gdk_fontset_load">
       <return-value>
-        <type name="GdkFont*" c:type="GdkFont*"/>
+        <type name="Font" c:type="GdkFont*"/>
       </return-value>
       <parameters>
         <parameter name="fontset_name">
@@ -7037,7 +6943,7 @@
           <type name="Font" c:type="GdkFont*"/>
         </parameter>
         <parameter name="character">
-          <type name="gchar" c:type="gchar"/>
+          <type name="GLib.gchar" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -7092,7 +6998,7 @@
           <type name="Font" c:type="GdkFont*"/>
         </parameter>
         <parameter name="character">
-          <type name="gchar" c:type="gchar"/>
+          <type name="GLib.gchar" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -7134,7 +7040,7 @@
           <type name="Font" c:type="GdkFont*"/>
         </parameter>
         <parameter name="character">
-          <type name="gchar" c:type="gchar"/>
+          <type name="GLib.gchar" c:type="gchar"/>
         </parameter>
       </parameters>
     </function>
@@ -7153,19 +7059,19 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="lbearing">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="rbearing">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="ascent">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="descent">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -7184,19 +7090,19 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="lbearing">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="rbearing">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="ascent">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="descent">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -7212,25 +7118,25 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="lbearing">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="rbearing">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="ascent">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="descent">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
     <class name="Image"
            c:type="GdkImage"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GdkImage"
            glib:get-type="gdk_image_get_type">
       <constructor name="new" c:identifier="gdk_image_new">
@@ -7242,7 +7148,7 @@
             <type name="ImageType" c:type="GdkImageType"/>
           </parameter>
           <parameter name="visual">
-            <type name="GdkVisual" c:type="GdkVisual*"/>
+            <type name="Visual" c:type="GdkVisual*"/>
           </parameter>
           <parameter name="width">
             <type name="int32" c:type="gint"/>
@@ -7355,7 +7261,7 @@
     </class>
     <record name="GdkKeymapKey" c:type="GdkKeymapKey">
       <field name="keycode">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="group">
         <type name="int32" c:type="gint"/>
@@ -7366,7 +7272,7 @@
     </record>
     <class name="Keymap"
            c:type="GdkKeymap"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GdkKeymap"
            glib:get-type="gdk_keymap_get_type">
       <constructor name="get_default" c:identifier="gdk_keymap_get_default">
@@ -7387,7 +7293,7 @@
       </constructor>
       <method name="lookup_key" c:identifier="gdk_keymap_lookup_key">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="keymap">
@@ -7408,7 +7314,7 @@
             <type name="Keymap" c:type="GdkKeymap*"/>
           </parameter>
           <parameter name="hardware_keycode">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="state">
             <type name="ModifierType" c:type="GdkModifierType"/>
@@ -7417,13 +7323,13 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="keyval" direction="out">
-            <type name="guint" c:type="guint*"/>
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
           <parameter name="effective_group" direction="out">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="level" direction="out">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="consumed_modifiers">
             <type name="ModifierType" c:type="GdkModifierType*"/>
@@ -7440,13 +7346,13 @@
             <type name="Keymap" c:type="GdkKeymap*"/>
           </parameter>
           <parameter name="keyval">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="keys" direction="out">
             <type name="GdkKeymapKey" c:type="GdkKeymapKey**"/>
           </parameter>
           <parameter name="n_keys" direction="out">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -7460,16 +7366,16 @@
             <type name="Keymap" c:type="GdkKeymap*"/>
           </parameter>
           <parameter name="hardware_keycode">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="keys" direction="out">
             <type name="GdkKeymapKey" c:type="GdkKeymapKey**"/>
           </parameter>
           <parameter name="keyvals">
-            <type name="guint" c:type="guint**"/>
+            <type name="GLib.guint" c:type="guint**"/>
           </parameter>
           <parameter name="n_entries">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -7500,7 +7406,7 @@
         </return-value>
         <parameters>
           <parameter name="keymap">
-            <type name="GdkKeymap*" c:type="GdkKeymap*"/>
+            <type name="Keymap" c:type="GdkKeymap*"/>
           </parameter>
         </parameters>
       </callback>
@@ -7510,7 +7416,7 @@
         </return-value>
         <parameters>
           <parameter name="keymap">
-            <type name="GdkKeymap*" c:type="GdkKeymap*"/>
+            <type name="Keymap" c:type="GdkKeymap*"/>
           </parameter>
         </parameters>
       </callback>
@@ -7531,13 +7437,13 @@
       </return-value>
       <parameters>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="keyval_from_name" c:identifier="gdk_keyval_from_name">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="keyval_name">
@@ -7552,33 +7458,33 @@
       </return-value>
       <parameters>
         <parameter name="symbol">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="lower" direction="out">
-          <type name="guint" c:type="guint*"/>
+          <type name="GLib.guint" c:type="guint*"/>
         </parameter>
         <parameter name="upper" direction="out">
-          <type name="guint" c:type="guint*"/>
+          <type name="GLib.guint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
     <function name="keyval_to_upper" c:identifier="gdk_keyval_to_upper">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="keyval_to_lower" c:identifier="gdk_keyval_to_lower">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -7588,7 +7494,7 @@
       </return-value>
       <parameters>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -7598,7 +7504,7 @@
       </return-value>
       <parameters>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -7608,13 +7514,13 @@
       </return-value>
       <parameters>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="unicode_to_keyval" c:identifier="gdk_unicode_to_keyval">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="wc">
@@ -7689,44 +7595,44 @@
         </parameters>
       </method>
       <property name="screen">
-        <type name="GdkScreen" c:type="GdkScreen"/>
+        <type name="Screen" c:type="GdkScreen"/>
       </property>
     </class>
     <function name="pango_renderer_new" c:identifier="gdk_pango_renderer_new">
       <return-value>
-        <type name="PangoRenderer*" c:type="PangoRenderer*"/>
+        <type name="Pango.Renderer" c:type="PangoRenderer*"/>
       </return-value>
       <parameters>
         <parameter name="screen">
-          <type name="GdkScreen" c:type="GdkScreen*"/>
+          <type name="Screen" c:type="GdkScreen*"/>
         </parameter>
       </parameters>
     </function>
     <function name="pango_renderer_get_default"
               c:identifier="gdk_pango_renderer_get_default">
       <return-value>
-        <type name="PangoRenderer*" c:type="PangoRenderer*"/>
+        <type name="Pango.Renderer" c:type="PangoRenderer*"/>
       </return-value>
       <parameters>
         <parameter name="screen">
-          <type name="GdkScreen" c:type="GdkScreen*"/>
+          <type name="Screen" c:type="GdkScreen*"/>
         </parameter>
       </parameters>
     </function>
     <function name="pango_context_get_for_screen"
               c:identifier="gdk_pango_context_get_for_screen">
       <return-value>
-        <type name="PangoContext*" c:type="PangoContext*"/>
+        <type name="Pango.Context" c:type="PangoContext*"/>
       </return-value>
       <parameters>
         <parameter name="screen">
-          <type name="GdkScreen" c:type="GdkScreen*"/>
+          <type name="Screen" c:type="GdkScreen*"/>
         </parameter>
       </parameters>
     </function>
     <function name="pango_context_get" c:identifier="gdk_pango_context_get">
       <return-value>
-        <type name="PangoContext*" c:type="PangoContext*"/>
+        <type name="Pango.Context" c:type="PangoContext*"/>
       </return-value>
     </function>
     <function name="pango_context_set_colormap"
@@ -7746,7 +7652,7 @@
     <function name="pango_layout_line_get_clip_region"
               c:identifier="gdk_pango_layout_line_get_clip_region">
       <return-value>
-        <type name="GdkRegion*" c:type="GdkRegion*"/>
+        <type name="GdkRegion" c:type="GdkRegion*"/>
       </return-value>
       <parameters>
         <parameter name="line">
@@ -7759,7 +7665,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="index_ranges">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="n_ranges">
           <type name="int32" c:type="gint"/>
@@ -7769,7 +7675,7 @@
     <function name="pango_layout_get_clip_region"
               c:identifier="gdk_pango_layout_get_clip_region">
       <return-value>
-        <type name="GdkRegion*" c:type="GdkRegion*"/>
+        <type name="GdkRegion" c:type="GdkRegion*"/>
       </return-value>
       <parameters>
         <parameter name="layout">
@@ -7782,7 +7688,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="index_ranges">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="n_ranges">
           <type name="int32" c:type="gint"/>
@@ -7791,15 +7697,15 @@
     </function>
     <record name="GdkPangoAttrStipple" c:type="GdkPangoAttrStipple">
       <field name="attr">
-        <type name="PangoAttribute" c:type="PangoAttribute"/>
+        <type name="Pango.PangoAttribute" c:type="PangoAttribute"/>
       </field>
       <field name="stipple">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+        <type name="GdkBitmap" c:type="GdkBitmap*"/>
       </field>
     </record>
     <record name="GdkPangoAttrEmbossed" c:type="GdkPangoAttrEmbossed">
       <field name="attr">
-        <type name="PangoAttribute" c:type="PangoAttribute"/>
+        <type name="Pango.PangoAttribute" c:type="PangoAttribute"/>
       </field>
       <field name="embossed">
         <type name="boolean" c:type="gboolean"/>
@@ -7807,7 +7713,7 @@
     </record>
     <record name="GdkPangoAttrEmbossColor" c:type="GdkPangoAttrEmbossColor">
       <field name="attr">
-        <type name="PangoAttribute" c:type="PangoAttribute"/>
+        <type name="Pango.PangoAttribute" c:type="PangoAttribute"/>
       </field>
       <field name="color">
         <type name="PangoColor" c:type="PangoColor"/>
@@ -7816,7 +7722,7 @@
     <function name="pango_attr_stipple_new"
               c:identifier="gdk_pango_attr_stipple_new">
       <return-value>
-        <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+        <type name="Pango.PangoAttribute" c:type="PangoAttribute*"/>
       </return-value>
       <parameters>
         <parameter name="stipple">
@@ -7827,7 +7733,7 @@
     <function name="pango_attr_embossed_new"
               c:identifier="gdk_pango_attr_embossed_new">
       <return-value>
-        <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+        <type name="Pango.PangoAttribute" c:type="PangoAttribute*"/>
       </return-value>
       <parameters>
         <parameter name="embossed">
@@ -7838,7 +7744,7 @@
     <function name="pango_attr_emboss_color_new"
               c:identifier="gdk_pango_attr_emboss_color_new">
       <return-value>
-        <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+        <type name="Pango.PangoAttribute" c:type="PangoAttribute*"/>
       </return-value>
       <parameters>
         <parameter name="color">
@@ -7848,10 +7754,10 @@
     </function>
     <record name="GdkPixmapObject" c:type="GdkPixmapObject">
       <field name="parent_instance">
-        <type name="GdkDrawable" c:type="GdkDrawable"/>
+        <type name="Drawable" c:type="GdkDrawable"/>
       </field>
       <field name="impl">
-        <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+        <type name="Drawable" c:type="GdkDrawable*"/>
       </field>
       <field name="depth">
         <type name="int32" c:type="gint"/>
@@ -7969,7 +7875,7 @@
             <type name="Color" c:type="GdkColor*"/>
           </parameter>
           <parameter name="data">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
         </parameters>
       </constructor>
@@ -7992,7 +7898,7 @@
             <type name="Color" c:type="GdkColor*"/>
           </parameter>
           <parameter name="data">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
         </parameters>
       </constructor>
@@ -8051,7 +7957,7 @@
         </return-value>
         <parameters>
           <parameter name="screen">
-            <type name="GdkScreen" c:type="GdkScreen*"/>
+            <type name="Screen" c:type="GdkScreen*"/>
           </parameter>
           <parameter name="anid">
             <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
@@ -8071,7 +7977,7 @@
     <function name="bitmap_create_from_data"
               c:identifier="gdk_bitmap_create_from_data">
       <return-value>
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+        <type name="GdkBitmap" c:type="GdkBitmap*"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -8128,7 +8034,7 @@
       </return-value>
       <parameters>
         <parameter name="window">
-          <type name="GdkWindow" c:type="GdkWindow*"/>
+          <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="property">
           <type name="GdkAtom" c:type="GdkAtom"/>
@@ -8149,13 +8055,13 @@
           <type name="GdkAtom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="actual_format">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="actual_length">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="data">
-          <type name="guchar" c:type="guchar**"/>
+          <type name="GLib.guchar" c:type="guchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -8165,7 +8071,7 @@
       </return-value>
       <parameters>
         <parameter name="window">
-          <type name="GdkWindow" c:type="GdkWindow*"/>
+          <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="property">
           <type name="GdkAtom" c:type="GdkAtom"/>
@@ -8180,7 +8086,7 @@
           <type name="PropMode" c:type="GdkPropMode"/>
         </parameter>
         <parameter name="data">
-          <type name="guchar" c:type="guchar*"/>
+          <type name="GLib.guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="nelements">
           <type name="int32" c:type="gint"/>
@@ -8193,7 +8099,7 @@
       </return-value>
       <parameters>
         <parameter name="window">
-          <type name="GdkWindow" c:type="GdkWindow*"/>
+          <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="property">
           <type name="GdkAtom" c:type="GdkAtom"/>
@@ -8213,13 +8119,13 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="text">
-          <type name="guchar" c:type="guchar*"/>
+          <type name="GLib.guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="length">
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="list">
-          <type name="gchar" c:type="gchar***"/>
+          <type name="GLib.gchar" c:type="gchar***"/>
         </parameter>
       </parameters>
     </function>
@@ -8236,13 +8142,13 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="text">
-          <type name="guchar" c:type="guchar*"/>
+          <type name="GLib.guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="length">
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="list">
-          <type name="gchar" c:type="gchar***"/>
+          <type name="GLib.gchar" c:type="gchar***"/>
         </parameter>
       </parameters>
     </function>
@@ -8259,13 +8165,13 @@
           <type name="GdkAtom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="format">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="ctext">
-          <type name="guchar" c:type="guchar**"/>
+          <type name="GLib.guchar" c:type="guchar**"/>
         </parameter>
         <parameter name="length">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -8282,13 +8188,13 @@
           <type name="GdkAtom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="format">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="ctext">
-          <type name="guchar" c:type="guchar**"/>
+          <type name="GLib.guchar" c:type="guchar**"/>
         </parameter>
         <parameter name="length">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -8308,13 +8214,13 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="text">
-          <type name="guchar" c:type="guchar*"/>
+          <type name="GLib.guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="length">
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="list">
-          <type name="gchar" c:type="gchar***"/>
+          <type name="GLib.gchar" c:type="gchar***"/>
         </parameter>
       </parameters>
     </function>
@@ -8334,13 +8240,13 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="text">
-          <type name="guchar" c:type="guchar*"/>
+          <type name="GLib.guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="length">
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="list">
-          <type name="gchar" c:type="gchar***"/>
+          <type name="GLib.gchar" c:type="gchar***"/>
         </parameter>
       </parameters>
     </function>
@@ -8371,13 +8277,13 @@
           <type name="GdkAtom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="format">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="ctext">
-          <type name="guchar" c:type="guchar**"/>
+          <type name="GLib.guchar" c:type="guchar**"/>
         </parameter>
         <parameter name="length">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -8397,13 +8303,13 @@
           <type name="GdkAtom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="format">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="ctext">
-          <type name="guchar" c:type="guchar**"/>
+          <type name="GLib.guchar" c:type="guchar**"/>
         </parameter>
         <parameter name="length">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -8413,7 +8319,7 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -8423,7 +8329,7 @@
       </return-value>
       <parameters>
         <parameter name="ctext">
-          <type name="guchar" c:type="guchar*"/>
+          <type name="GLib.guchar" c:type="guchar*"/>
         </parameter>
       </parameters>
     </function>
@@ -8433,7 +8339,7 @@
       </return-value>
       <parameters>
         <parameter name="span">
-          <type name="GdkSpan*" c:type="GdkSpan*"/>
+          <type name="GdkSpan" c:type="GdkSpan*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -8442,18 +8348,18 @@
     </callback>
     <function name="region_new" c:identifier="gdk_region_new">
       <return-value>
-        <type name="GdkRegion*" c:type="GdkRegion*"/>
+        <type name="GdkRegion" c:type="GdkRegion*"/>
       </return-value>
     </function>
     <function name="region_polygon" c:identifier="gdk_region_polygon">
       <return-value>
-        <type name="GdkRegion*" c:type="GdkRegion*"/>
+        <type name="GdkRegion" c:type="GdkRegion*"/>
       </return-value>
       <parameters>
         <parameter name="points">
           <type name="GdkPoint" c:type="GdkPoint*"/>
         </parameter>
-        <parameter name="n_points">
+        <parameter name="npoints">
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="fill_rule">
@@ -8463,7 +8369,7 @@
     </function>
     <function name="region_copy" c:identifier="gdk_region_copy">
       <return-value>
-        <type name="GdkRegion*" c:type="GdkRegion*"/>
+        <type name="GdkRegion" c:type="GdkRegion*"/>
       </return-value>
       <parameters>
         <parameter name="region">
@@ -8473,11 +8379,11 @@
     </function>
     <function name="region_rectangle" c:identifier="gdk_region_rectangle">
       <return-value>
-        <type name="GdkRegion*" c:type="GdkRegion*"/>
+        <type name="GdkRegion" c:type="GdkRegion*"/>
       </return-value>
       <parameters>
         <parameter name="rectangle">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <type name="Rectangle" c:type="GdkRectangle*"/>
         </parameter>
       </parameters>
     </function>
@@ -8500,7 +8406,7 @@
           <type name="GdkRegion" c:type="GdkRegion*"/>
         </parameter>
         <parameter name="rectangle">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <type name="Rectangle" c:type="GdkRectangle*"/>
         </parameter>
       </parameters>
     </function>
@@ -8514,10 +8420,10 @@
           <type name="GdkRegion" c:type="GdkRegion*"/>
         </parameter>
         <parameter name="rectangles">
-          <type name="GdkRectangle" c:type="GdkRectangle**"/>
+          <type name="Rectangle" c:type="GdkRectangle**"/>
         </parameter>
         <parameter name="n_rectangles">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -8562,14 +8468,14 @@
     </function>
     <function name="region_rect_in" c:identifier="gdk_region_rect_in">
       <return-value>
-        <type name="GdkOverlapType" c:type="GdkOverlapType"/>
+        <type name="OverlapType" c:type="GdkOverlapType"/>
       </return-value>
       <parameters>
         <parameter name="region">
           <type name="GdkRegion" c:type="GdkRegion*"/>
         </parameter>
         <parameter name="rectangle">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <type name="Rectangle" c:type="GdkRectangle*"/>
         </parameter>
       </parameters>
     </function>
@@ -8615,7 +8521,7 @@
           <type name="GdkRegion" c:type="GdkRegion*"/>
         </parameter>
         <parameter name="rect">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <type name="Rectangle" c:type="GdkRectangle*"/>
         </parameter>
       </parameters>
     </function>
@@ -8699,7 +8605,7 @@
     </function>
     <class name="Screen"
            c:type="GdkScreen"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GdkScreen"
            glib:get-type="gdk_screen_get_type">
       <constructor name="get_default" c:identifier="gdk_screen_get_default">
@@ -8746,7 +8652,7 @@
       <method name="get_system_visual"
               c:identifier="gdk_screen_get_system_visual">
         <return-value>
-          <type name="GdkVisual" c:type="GdkVisual*"/>
+          <type name="Visual" c:type="GdkVisual*"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8767,7 +8673,7 @@
       </method>
       <method name="get_rgb_visual" c:identifier="gdk_screen_get_rgb_visual">
         <return-value>
-          <type name="GdkVisual" c:type="GdkVisual*"/>
+          <type name="Visual" c:type="GdkVisual*"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8788,7 +8694,7 @@
       </method>
       <method name="get_rgba_visual" c:identifier="gdk_screen_get_rgba_visual">
         <return-value>
-          <type name="GdkVisual" c:type="GdkVisual*"/>
+          <type name="Visual" c:type="GdkVisual*"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8808,7 +8714,7 @@
       </method>
       <method name="get_root_window" c:identifier="gdk_screen_get_root_window">
         <return-value>
-          <type name="GdkWindow" c:type="GdkWindow*"/>
+          <type name="Window" c:type="GdkWindow*"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8878,7 +8784,7 @@
       </method>
       <method name="list_visuals" c:identifier="gdk_screen_list_visuals">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8889,7 +8795,7 @@
       <method name="get_toplevel_windows"
               c:identifier="gdk_screen_get_toplevel_windows">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -8931,7 +8837,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dest">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </method>
@@ -8962,49 +8868,7 @@
             <type name="Screen" c:type="GdkScreen*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow" c:type="GdkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_monitor_width_mm"
-              c:identifier="gdk_screen_get_monitor_width_mm">
-        <return-value>
-          <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="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="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="screen">
-            <type name="Screen" c:type="GdkScreen*"/>
-          </parameter>
-          <parameter name="monitor_num">
-            <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="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="screen">
-            <type name="Screen" c:type="GdkScreen*"/>
-          </parameter>
-          <parameter name="monitor_num">
-            <type name="int32" c:type="gint"/>
+            <type name="Window" c:type="GdkWindow*"/>
           </parameter>
         </parameters>
       </method>
@@ -9034,7 +8898,7 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </method>
@@ -9048,14 +8912,16 @@
             <type name="Screen" c:type="GdkScreen*"/>
           </parameter>
           <parameter name="options">
-            <type name="cairo_font_options_t" c:type="cairo_font_options_t*"/>
+            <type name="Cairo.cairo_font_options_t"
+                  c:type="cairo_font_options_t*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_font_options"
               c:identifier="gdk_screen_get_font_options">
         <return-value>
-          <type name="cairo_font_options_t" c:type="cairo_font_options_t*"/>
+          <type name="Cairo.cairo_font_options_t"
+                c:type="cairo_font_options_t*"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -9089,7 +8955,7 @@
       <method name="get_active_window"
               c:identifier="gdk_screen_get_active_window">
         <return-value>
-          <type name="GdkWindow" c:type="GdkWindow*"/>
+          <type name="Window" c:type="GdkWindow*"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -9100,7 +8966,7 @@
       <method name="get_window_stack"
               c:identifier="gdk_screen_get_window_stack">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="screen">
@@ -9120,7 +8986,7 @@
         </return-value>
         <parameters>
           <parameter name="screen">
-            <type name="GdkScreen*" c:type="GdkScreen*"/>
+            <type name="Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9130,17 +8996,7 @@
         </return-value>
         <parameters>
           <parameter name="screen">
-            <type name="GdkScreen*" c:type="GdkScreen*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="monitors_changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="screen">
-            <type name="GdkScreen*" c:type="GdkScreen*"/>
+            <type name="Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9154,11 +9010,6 @@
           <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="monitors-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
     </class>
     <function name="selection_owner_set"
               c:identifier="gdk_selection_owner_set">
@@ -9167,7 +9018,7 @@
       </return-value>
       <parameters>
         <parameter name="owner">
-          <type name="GdkWindow" c:type="GdkWindow*"/>
+          <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="selection">
           <type name="GdkAtom" c:type="GdkAtom"/>
@@ -9183,7 +9034,7 @@
     <function name="selection_owner_get"
               c:identifier="gdk_selection_owner_get">
       <return-value>
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
+        <type name="Window" c:type="GdkWindow*"/>
       </return-value>
       <parameters>
         <parameter name="selection">
@@ -9201,7 +9052,7 @@
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="owner">
-          <type name="GdkWindow" c:type="GdkWindow*"/>
+          <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="selection">
           <type name="GdkAtom" c:type="GdkAtom"/>
@@ -9217,7 +9068,7 @@
     <function name="selection_owner_get_for_display"
               c:identifier="gdk_selection_owner_get_for_display">
       <return-value>
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
+        <type name="Window" c:type="GdkWindow*"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -9234,7 +9085,7 @@
       </return-value>
       <parameters>
         <parameter name="requestor">
-          <type name="GdkWindow" c:type="GdkWindow*"/>
+          <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="selection">
           <type name="GdkAtom" c:type="GdkAtom"/>
@@ -9254,16 +9105,16 @@
       </return-value>
       <parameters>
         <parameter name="requestor">
-          <type name="GdkWindow" c:type="GdkWindow*"/>
+          <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="data">
-          <type name="guchar" c:type="guchar**"/>
+          <type name="GLib.guchar" c:type="guchar**"/>
         </parameter>
         <parameter name="prop_type">
           <type name="GdkAtom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="prop_format">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -9328,89 +9179,196 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="argv">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
+        </parameter>
+        <parameter name="envp">
+          <type name="GLib.gchar" c:type="gchar**"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="GSpawnFlags" c:type="GSpawnFlags"/>
+        </parameter>
+        <parameter name="child_setup">
+          <type name="GLib.GSpawnChildSetupFunc"
+                c:type="GSpawnChildSetupFunc"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="child_pid">
+          <type name="GLib.gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="spawn_on_screen_with_pipes"
+              c:identifier="gdk_spawn_on_screen_with_pipes">
+      <return-value>
+        <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="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="argv">
+          <type name="GLib.gchar" c:type="gchar**"/>
         </parameter>
         <parameter name="envp">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </parameter>
         <parameter name="flags">
           <type name="GSpawnFlags" c:type="GSpawnFlags"/>
         </parameter>
         <parameter name="child_setup">
-          <type name="GSpawnChildSetupFunc" c:type="GSpawnChildSetupFunc"/>
+          <type name="GLib.GSpawnChildSetupFunc"
+                c:type="GSpawnChildSetupFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="child_pid">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="standard_input">
+          <type name="GLib.gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="standard_output">
+          <type name="GLib.gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="standard_error">
+          <type name="GLib.gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="spawn_command_line_on_screen"
+              c:identifier="gdk_spawn_command_line_on_screen">
+      <return-value>
+        <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="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="spawn_on_screen_with_pipes"
-              c:identifier="gdk_spawn_on_screen_with_pipes">
+    <class name="Visual"
+           c:type="GdkVisual"
+           parent="GObject.Object"
+           glib:type-name="GdkVisual"
+           glib:get-type="gdk_visual_get_type">
+      <constructor name="get_system" c:identifier="gdk_visual_get_system">
+        <return-value>
+          <type name="Visual" c:type="GdkVisual*"/>
+        </return-value>
+      </constructor>
+      <constructor name="get_best" c:identifier="gdk_visual_get_best">
+        <return-value>
+          <type name="Visual" c:type="GdkVisual*"/>
+        </return-value>
+      </constructor>
+      <constructor name="get_best_with_depth"
+                   c:identifier="gdk_visual_get_best_with_depth">
+        <return-value>
+          <type name="Visual" c:type="GdkVisual*"/>
+        </return-value>
+        <parameters>
+          <parameter name="depth">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="get_best_with_type"
+                   c:identifier="gdk_visual_get_best_with_type">
+        <return-value>
+          <type name="Visual" c:type="GdkVisual*"/>
+        </return-value>
+        <parameters>
+          <parameter name="visual_type">
+            <type name="VisualType" c:type="GdkVisualType"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="get_best_with_both"
+                   c:identifier="gdk_visual_get_best_with_both">
+        <return-value>
+          <type name="Visual" c:type="GdkVisual*"/>
+        </return-value>
+        <parameters>
+          <parameter name="depth">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="visual_type">
+            <type name="VisualType" c:type="GdkVisualType"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="get_screen" c:identifier="gdk_visual_get_screen">
+        <return-value>
+          <type name="Screen" c:type="GdkScreen*"/>
+        </return-value>
+        <parameters>
+          <parameter name="visual">
+            <type name="Visual" c:type="GdkVisual*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </class>
+    <function name="visual_get_best_depth"
+              c:identifier="gdk_visual_get_best_depth">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+    </function>
+    <function name="visual_get_best_type"
+              c:identifier="gdk_visual_get_best_type">
+      <return-value>
+        <type name="VisualType" c:type="GdkVisualType"/>
+      </return-value>
+    </function>
+    <function name="query_depths" c:identifier="gdk_query_depths">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="screen">
-          <type name="Screen" c:type="GdkScreen*"/>
-        </parameter>
-        <parameter name="working_directory">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="argv">
-          <type name="gchar" c:type="gchar**"/>
-        </parameter>
-        <parameter name="envp">
-          <type name="gchar" c:type="gchar**"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GSpawnFlags" c:type="GSpawnFlags"/>
-        </parameter>
-        <parameter name="child_setup">
-          <type name="GSpawnChildSetupFunc" c:type="GSpawnChildSetupFunc"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="child_pid">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="standard_input">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="standard_output">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="standard_error">
-          <type name="gint" c:type="gint*"/>
+        <parameter name="depths" direction="out">
+          <type name="GLib.gint" c:type="gint**"/>
         </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+        <parameter name="count" direction="out">
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="spawn_command_line_on_screen"
-              c:identifier="gdk_spawn_command_line_on_screen">
+    <function name="query_visual_types" c:identifier="gdk_query_visual_types">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="screen">
-          <type name="Screen" c:type="GdkScreen*"/>
-        </parameter>
-        <parameter name="command_line">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="visual_types">
+          <type name="VisualType" c:type="GdkVisualType**"/>
         </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+        <parameter name="count">
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
+    <function name="list_visuals" c:identifier="gdk_list_visuals">
+      <return-value>
+        <type name="GLib.GList" c:type="GList*"/>
+      </return-value>
+    </function>
     <record name="GdkGeometry" c:type="GdkGeometry">
       <field name="min_width">
         <type name="int32" c:type="gint"/>
@@ -9443,7 +9401,7 @@
         <type name="double" c:type="gdouble"/>
       </field>
       <field name="win_gravity">
-        <type name="GdkGravity" c:type="GdkGravity"/>
+        <type name="Gravity" c:type="GdkGravity"/>
       </field>
     </record>
     <record name="GdkWindowAttr" c:type="GdkWindowAttr">
@@ -9466,19 +9424,19 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="wclass">
-        <type name="GdkWindowClass" c:type="GdkWindowClass"/>
+        <type name="WindowClass" c:type="GdkWindowClass"/>
       </field>
       <field name="visual">
-        <type name="GdkVisual*" c:type="GdkVisual*"/>
+        <type name="Visual" c:type="GdkVisual*"/>
       </field>
       <field name="colormap">
-        <type name="GdkColormap*" c:type="GdkColormap*"/>
+        <type name="Colormap" c:type="GdkColormap*"/>
       </field>
       <field name="window_type">
-        <type name="GdkWindowType" c:type="GdkWindowType"/>
+        <type name="WindowType" c:type="GdkWindowType"/>
       </field>
       <field name="cursor">
-        <type name="GdkCursor*" c:type="GdkCursor*"/>
+        <type name="Cursor" c:type="GdkCursor*"/>
       </field>
       <field name="wmclass_name">
         <type name="string" c:type="gchar*"/>
@@ -9490,56 +9448,55 @@
         <type name="boolean" c:type="gboolean"/>
       </field>
       <field name="type_hint">
-        <type name="GdkWindowTypeHint" c:type="GdkWindowTypeHint"/>
+        <type name="WindowTypeHint" c:type="GdkWindowTypeHint"/>
       </field>
     </record>
     <record name="GdkPointerHooks" c:type="GdkPointerHooks">
       <callback name="get_pointer">
         <return-value>
-          <type name="GdkWindow*" c:type="GdkWindow*"/>
+          <type name="Window" c:type="GdkWindow*"/>
         </return-value>
         <parameters>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="mask">
-            <type name="GdkModifierType*" c:type="GdkModifierType*"/>
+            <type name="ModifierType" c:type="GdkModifierType*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="window_at_pointer">
         <return-value>
-          <type name="GdkWindow*" c:type="GdkWindow*"/>
+          <type name="Window" c:type="GdkWindow*"/>
         </return-value>
         <parameters>
           <parameter name="screen">
-            <type name="GdkScreen*" c:type="GdkScreen*"/>
+            <type name="Screen" c:type="GdkScreen*"/>
           </parameter>
           <parameter name="win_x">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="win_y">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
     </record>
-    <record name="GdkWindowRedirect" c:type="GdkWindowRedirect"/>
     <record name="GdkWindowObject" c:type="GdkWindowObject">
       <field name="parent_instance">
-        <type name="GdkDrawable" c:type="GdkDrawable"/>
+        <type name="Drawable" c:type="GdkDrawable"/>
       </field>
       <field name="impl">
-        <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+        <type name="Drawable" c:type="GdkDrawable*"/>
       </field>
       <field name="parent">
-        <type name="GdkWindowObject*" c:type="GdkWindowObject*"/>
+        <type name="GdkWindowObject" c:type="GdkWindowObject*"/>
       </field>
       <field name="user_data">
         <type name="any" c:type="gpointer"/>
@@ -9554,25 +9511,25 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="filters">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </field>
       <field name="children">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </field>
       <field name="bg_color">
-        <type name="GdkColor" c:type="GdkColor"/>
+        <type name="Color" c:type="GdkColor"/>
       </field>
       <field name="bg_pixmap">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+        <type name="Pixmap" c:type="GdkPixmap*"/>
       </field>
       <field name="paint_stack">
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </field>
       <field name="update_area">
-        <type name="GdkRegion*" c:type="GdkRegion*"/>
+        <type name="GdkRegion" c:type="GdkRegion*"/>
       </field>
       <field name="update_freeze_count">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="window_type">
         <type name="uint8" c:type="guint8"/>
@@ -9584,40 +9541,37 @@
         <type name="uint8" c:type="guint8"/>
       </field>
       <field name="state">
-        <type name="GdkWindowState" c:type="GdkWindowState"/>
+        <type name="WindowState" c:type="GdkWindowState"/>
       </field>
       <field name="guffaw_gravity">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="input_only">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="modal_hint">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="composited">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="destroyed">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="accept_focus">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="focus_on_map">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="shaped">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="event_mask">
-        <type name="GdkEventMask" c:type="GdkEventMask"/>
+        <type name="EventMask" c:type="GdkEventMask"/>
       </field>
       <field name="update_and_descendants_freeze_count">
-        <type name="guint" c:type="guint"/>
-      </field>
-      <field name="redirect">
-        <type name="GdkWindowRedirect*" c:type="GdkWindowRedirect*"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <class name="Window"
@@ -9647,10 +9601,10 @@
         </return-value>
         <parameters>
           <parameter name="win_x" direction="out">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="win_y" direction="out">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -9711,10 +9665,10 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="mask">
             <type name="ModifierType" c:type="GdkModifierType*"/>
@@ -10410,7 +10364,7 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="rectangle">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </method>
@@ -10555,19 +10509,19 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="depth">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -10580,10 +10534,10 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -10596,10 +10550,10 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -10613,10 +10567,10 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -10629,10 +10583,10 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -10646,13 +10600,13 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_children" c:identifier="gdk_window_get_children">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10662,7 +10616,7 @@
       </method>
       <method name="peek_children" c:identifier="gdk_window_peek_children">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -10702,7 +10656,7 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="pixbufs">
-            <type name="GList" c:type="GList*"/>
+            <type name="GLib.GList" c:type="GList*"/>
           </parameter>
         </parameters>
       </method>
@@ -10986,7 +10940,7 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="invalidate_children">
             <type name="boolean" c:type="gboolean"/>
@@ -11108,10 +11062,10 @@
             <type name="Drawable" c:type="GdkDrawable**"/>
           </parameter>
           <parameter name="x_offset">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y_offset">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -11137,49 +11091,6 @@
           </parameter>
         </parameters>
       </method>
-      <method name="redirect_to_drawable"
-              c:identifier="gdk_window_redirect_to_drawable">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GdkWindow*"/>
-          </parameter>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="src_x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="src_y">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="dest_x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="dest_y">
-            <type name="int32" c:type="gint"/>
-          </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="remove_redirection"
-              c:identifier="gdk_window_remove_redirection">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GdkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
       <method name="destroy_notify" c:identifier="gdk_window_destroy_notify">
         <return-value>
           <type name="none" c:type="void"/>
@@ -11204,7 +11115,7 @@
     <function name="window_get_toplevels"
               c:identifier="gdk_window_get_toplevels">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </return-value>
     </function>
     <function name="window_process_all_updates"
@@ -11234,7 +11145,7 @@
           <type name="GdkGeometry" c:type="GdkGeometry*"/>
         </parameter>
         <parameter name="flags">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="width">
           <type name="int32" c:type="gint"/>
@@ -11243,16 +11154,16 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="new_width">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="new_height">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
     <function name="set_pointer_hooks" c:identifier="gdk_set_pointer_hooks">
       <return-value>
-        <type name="GdkPointerHooks*" c:type="GdkPointerHooks*"/>
+        <type name="GdkPointerHooks" c:type="GdkPointerHooks*"/>
       </return-value>
       <parameters>
         <parameter name="new_hooks">
@@ -11263,173 +11174,7 @@
     <function name="get_default_root_window"
               c:identifier="gdk_get_default_root_window">
       <return-value>
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
-      </return-value>
-    </function>
-    <function name="test_render_sync" c:identifier="gdk_test_render_sync">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="window">
-          <type name="Window" c:type="GdkWindow*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="test_simulate_key" c:identifier="gdk_test_simulate_key">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="window">
-          <type name="Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="modifiers">
-          <type name="ModifierType" c:type="GdkModifierType"/>
-        </parameter>
-        <parameter name="key_pressrelease">
-          <type name="EventType" c:type="GdkEventType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="test_simulate_button"
-              c:identifier="gdk_test_simulate_button">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="window">
-          <type name="Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="button">
-          <type name="guint" c:type="guint"/>
-        </parameter>
-        <parameter name="modifiers">
-          <type name="ModifierType" c:type="GdkModifierType"/>
-        </parameter>
-        <parameter name="button_pressrelease">
-          <type name="EventType" c:type="GdkEventType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Visual"
-           c:type="GdkVisual"
-           parent="GLib.Object"
-           glib:type-name="GdkVisual"
-           glib:get-type="gdk_visual_get_type">
-      <constructor name="get_system" c:identifier="gdk_visual_get_system">
-        <return-value>
-          <type name="Visual" c:type="GdkVisual*"/>
-        </return-value>
-      </constructor>
-      <constructor name="get_best" c:identifier="gdk_visual_get_best">
-        <return-value>
-          <type name="Visual" c:type="GdkVisual*"/>
-        </return-value>
-      </constructor>
-      <constructor name="get_best_with_depth"
-                   c:identifier="gdk_visual_get_best_with_depth">
-        <return-value>
-          <type name="Visual" c:type="GdkVisual*"/>
-        </return-value>
-        <parameters>
-          <parameter name="depth">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="get_best_with_type"
-                   c:identifier="gdk_visual_get_best_with_type">
-        <return-value>
-          <type name="Visual" c:type="GdkVisual*"/>
-        </return-value>
-        <parameters>
-          <parameter name="visual_type">
-            <type name="VisualType" c:type="GdkVisualType"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="get_best_with_both"
-                   c:identifier="gdk_visual_get_best_with_both">
-        <return-value>
-          <type name="Visual" c:type="GdkVisual*"/>
-        </return-value>
-        <parameters>
-          <parameter name="depth">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="visual_type">
-            <type name="VisualType" c:type="GdkVisualType"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="get_screen" c:identifier="gdk_visual_get_screen">
-        <return-value>
-          <type name="Screen" c:type="GdkScreen*"/>
-        </return-value>
-        <parameters>
-          <parameter name="visual">
-            <type name="Visual" c:type="GdkVisual*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </class>
-    <function name="visual_get_best_depth"
-              c:identifier="gdk_visual_get_best_depth">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-    </function>
-    <function name="visual_get_best_type"
-              c:identifier="gdk_visual_get_best_type">
-      <return-value>
-        <type name="GdkVisualType" c:type="GdkVisualType"/>
-      </return-value>
-    </function>
-    <function name="query_depths" c:identifier="gdk_query_depths">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="depths" direction="out">
-          <type name="gint" c:type="gint**"/>
-        </parameter>
-        <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="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="visual_types">
-          <type name="VisualType" c:type="GdkVisualType**"/>
-        </parameter>
-        <parameter name="count">
-          <type name="gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_visuals" c:identifier="gdk_list_visuals">
-      <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="Window" c:type="GdkWindow*"/>
       </return-value>
     </function>
     <function name="parse_args" c:identifier="gdk_parse_args">
@@ -11438,10 +11183,10 @@
       </return-value>
       <parameters>
         <parameter name="argc">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="argv">
-          <type name="gchar" c:type="gchar***"/>
+          <type name="GLib.gchar" c:type="gchar***"/>
         </parameter>
       </parameters>
     </function>
@@ -11451,10 +11196,10 @@
       </return-value>
       <parameters>
         <parameter name="argc">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="argv">
-          <type name="gchar" c:type="gchar***"/>
+          <type name="GLib.gchar" c:type="gchar***"/>
         </parameter>
       </parameters>
     </function>
@@ -11464,10 +11209,10 @@
       </return-value>
       <parameters>
         <parameter name="argc">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="argv">
-          <type name="gchar" c:type="gchar***"/>
+          <type name="GLib.gchar" c:type="gchar***"/>
         </parameter>
       </parameters>
     </function>
@@ -11572,7 +11317,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GdkDestroyNotify" c:type="GdkDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -11607,7 +11352,7 @@
     </function>
     <function name="pointer_grab" c:identifier="gdk_pointer_grab">
       <return-value>
-        <type name="GdkGrabStatus" c:type="GdkGrabStatus"/>
+        <type name="GrabStatus" c:type="GdkGrabStatus"/>
       </return-value>
       <parameters>
         <parameter name="window">
@@ -11632,7 +11377,7 @@
     </function>
     <function name="keyboard_grab" c:identifier="gdk_keyboard_grab">
       <return-value>
-        <type name="GdkGrabStatus" c:type="GdkGrabStatus"/>
+        <type name="GrabStatus" c:type="GdkGrabStatus"/>
       </return-value>
       <parameters>
         <parameter name="window">
@@ -11659,7 +11404,7 @@
           <type name="Window" c:type="GdkWindow**"/>
         </parameter>
         <parameter name="owner_events">
-          <type name="gboolean" c:type="gboolean*"/>
+          <type name="GLib.gboolean" c:type="gboolean*"/>
         </parameter>
       </parameters>
     </function>
@@ -11676,7 +11421,7 @@
           <type name="Window" c:type="GdkWindow**"/>
         </parameter>
         <parameter name="owner_events">
-          <type name="gboolean" c:type="gboolean*"/>
+          <type name="GLib.gboolean" c:type="gboolean*"/>
         </parameter>
       </parameters>
     </function>
@@ -11742,7 +11487,7 @@
       </return-value>
       <parameters>
         <parameter name="msec">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -11753,13 +11498,13 @@
       </return-value>
       <parameters>
         <parameter name="src1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <type name="Rectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="src2">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <type name="Rectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="dest">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <type name="Rectangle" c:type="GdkRectangle*"/>
         </parameter>
       </parameters>
     </function>
@@ -11769,13 +11514,13 @@
       </return-value>
       <parameters>
         <parameter name="src1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <type name="Rectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="src2">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <type name="Rectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="dest">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <type name="Rectangle" c:type="GdkRectangle*"/>
         </parameter>
       </parameters>
     </function>
@@ -11866,40 +11611,40 @@
       </return-value>
       <parameters>
         <parameter name="enter_fn">
-          <type name="GCallback" c:type="GCallback"/>
+          <type name="GObject.GCallback" c:type="GCallback"/>
         </parameter>
         <parameter name="leave_fn">
-          <type name="GCallback" c:type="GCallback"/>
+          <type name="GObject.GCallback" c:type="GCallback"/>
         </parameter>
       </parameters>
     </function>
     <function name="threads_add_idle_full"
               c:identifier="gdk_threads_add_idle_full">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="priority">
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="function">
-          <type name="GSourceFunc" c:type="GSourceFunc"/>
+          <type name="GLib.GSourceFunc" c:type="GSourceFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="notify">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
     <function name="threads_add_idle" c:identifier="gdk_threads_add_idle">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="function">
-          <type name="GSourceFunc" c:type="GSourceFunc"/>
+          <type name="GLib.GSourceFunc" c:type="GSourceFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -11909,37 +11654,37 @@
     <function name="threads_add_timeout_full"
               c:identifier="gdk_threads_add_timeout_full">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="priority">
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="interval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="function">
-          <type name="GSourceFunc" c:type="GSourceFunc"/>
+          <type name="GLib.GSourceFunc" c:type="GSourceFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="notify">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
     <function name="threads_add_timeout"
               c:identifier="gdk_threads_add_timeout">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="interval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="function">
-          <type name="GSourceFunc" c:type="GSourceFunc"/>
+          <type name="GLib.GSourceFunc" c:type="GSourceFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -11966,7 +11711,7 @@
     <function name="x11_drawable_get_xdisplay"
               c:identifier="gdk_x11_drawable_get_xdisplay">
       <return-value>
-        <type name="Display*" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -11988,7 +11733,7 @@
     <function name="x11_image_get_xdisplay"
               c:identifier="gdk_x11_image_get_xdisplay">
       <return-value>
-        <type name="Display*" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
       <parameters>
         <parameter name="image">
@@ -11999,7 +11744,7 @@
     <function name="x11_image_get_ximage"
               c:identifier="gdk_x11_image_get_ximage">
       <return-value>
-        <type name="XImage*" c:type="XImage*"/>
+        <type name="XImage" c:type="XImage*"/>
       </return-value>
       <parameters>
         <parameter name="image">
@@ -12010,7 +11755,7 @@
     <function name="x11_colormap_get_xdisplay"
               c:identifier="gdk_x11_colormap_get_xdisplay">
       <return-value>
-        <type name="Display*" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
       <parameters>
         <parameter name="colormap">
@@ -12032,7 +11777,7 @@
     <function name="x11_cursor_get_xdisplay"
               c:identifier="gdk_x11_cursor_get_xdisplay">
       <return-value>
-        <type name="Display*" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
       <parameters>
         <parameter name="cursor">
@@ -12054,7 +11799,7 @@
     <function name="x11_display_get_xdisplay"
               c:identifier="gdk_x11_display_get_xdisplay">
       <return-value>
-        <type name="Display*" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -12065,7 +11810,7 @@
     <function name="x11_visual_get_xvisual"
               c:identifier="gdk_x11_visual_get_xvisual">
       <return-value>
-        <type name="Visual*" c:type="Visual*"/>
+        <type name="Visual" c:type="Visual*"/>
       </return-value>
       <parameters>
         <parameter name="visual">
@@ -12076,7 +11821,7 @@
     <function name="x11_gc_get_xdisplay"
               c:identifier="gdk_x11_gc_get_xdisplay">
       <return-value>
-        <type name="Display*" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
       <parameters>
         <parameter name="gc">
@@ -12097,7 +11842,7 @@
     <function name="x11_screen_get_xscreen"
               c:identifier="gdk_x11_screen_get_xscreen">
       <return-value>
-        <type name="Screen*" c:type="Screen*"/>
+        <type name="Screen" c:type="Screen*"/>
       </return-value>
       <parameters>
         <parameter name="screen">
@@ -12161,7 +11906,7 @@
     <function name="x11_get_default_xdisplay"
               c:identifier="gdk_x11_get_default_xdisplay">
       <return-value>
-        <type name="Display*" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
     </function>
     <function name="x11_get_default_screen"
@@ -12173,7 +11918,7 @@
     <function name="x11_screen_lookup_visual"
               c:identifier="gdk_x11_screen_lookup_visual">
       <return-value>
-        <type name="GdkVisual*" c:type="GdkVisual*"/>
+        <type name="Visual" c:type="GdkVisual*"/>
       </return-value>
       <parameters>
         <parameter name="screen">
@@ -12186,7 +11931,7 @@
     </function>
     <function name="gdkx_visual_get" c:identifier="gdkx_visual_get">
       <return-value>
-        <type name="GdkVisual*" c:type="GdkVisual*"/>
+        <type name="Visual" c:type="GdkVisual*"/>
       </return-value>
       <parameters>
         <parameter name="xvisualid">
@@ -12197,7 +11942,7 @@
     <function name="x11_colormap_foreign_new"
               c:identifier="gdk_x11_colormap_foreign_new">
       <return-value>
-        <type name="GdkColormap*" c:type="GdkColormap*"/>
+        <type name="Colormap" c:type="GdkColormap*"/>
       </return-value>
       <parameters>
         <parameter name="visual">
@@ -12300,20 +12045,6 @@
         </parameter>
       </parameters>
     </function>
-    <function name="x11_screen_get_monitor_output"
-              c:identifier="gdk_x11_screen_get_monitor_output">
-      <return-value>
-        <type name="XID" c:type="XID"/>
-      </return-value>
-      <parameters>
-        <parameter name="screen">
-          <type name="Screen" c:type="GdkScreen*"/>
-        </parameter>
-        <parameter name="monitor_num">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
     <function name="xid_table_lookup" c:identifier="gdk_xid_table_lookup">
       <return-value>
         <type name="any" c:type="gpointer"/>
@@ -12347,7 +12078,7 @@
     <function name="x11_lookup_xdisplay"
               c:identifier="gdk_x11_lookup_xdisplay">
       <return-value>
-        <type name="GdkDisplay*" c:type="GdkDisplay*"/>
+        <type name="Display" c:type="GdkDisplay*"/>
       </return-value>
       <parameters>
         <parameter name="xdisplay">
@@ -12502,7 +12233,7 @@
     <function name="x11_font_get_xdisplay"
               c:identifier="gdk_x11_font_get_xdisplay">
       <return-value>
-        <type name="Display*" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
       <parameters>
         <parameter name="font">

Modified: trunk/gir/gtk-x11-2.0.gir
==============================================================================
--- trunk/gir/gtk-x11-2.0.gir	(original)
+++ trunk/gir/gtk-x11-2.0.gir	Thu Aug 14 16:13:47 2008
@@ -3,6 +3,18 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="Gtk">
+    <alias name="GtkFundamentalType" target="GType"/>
+    <alias name="GtkType" target="GType"/>
+    <alias name="GtkTypeObject" target="GTypeInstance"/>
+    <alias name="GtkTypeClass" target="GTypeClass"/>
+    <alias name="GtkClassInitFunc" target="GBaseInitFunc"/>
+    <alias name="GtkObjectInitFunc" target="GInstanceInitFunc"/>
+    <alias name="GtkSignalMarshaller" target="GSignalCMarshaller"/>
+    <alias name="GtkEnumValue" target="GEnumValue"/>
+    <alias name="GtkFlagValue" target="GFlagsValue"/>
+    <alias name="GtkAllocation" target="GdkRectangle"/>
+    <alias name="GtkFileTime" target="gint64"/>
+    <alias name="GtkDitherInfo" target="_GtkDitherInfo"/>
     <enumeration name="AnchorType"
                  c:type="GtkAnchorType"
                  glib:type-name="GtkAnchorType"
@@ -1201,13 +1213,13 @@
     </bitfield>
     <record name="GtkAccelKey" c:type="GtkAccelKey">
       <field name="accel_key">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="accel_mods">
         <type name="GdkModifierType" c:type="GdkModifierType"/>
       </field>
       <field name="accel_flags">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <record name="GtkAccelGroupEntry" c:type="GtkAccelGroupEntry">
@@ -1215,10 +1227,10 @@
         <type name="GtkAccelKey" c:type="GtkAccelKey"/>
       </field>
       <field name="closure">
-        <type name="GClosure*" c:type="GClosure*"/>
+        <type name="GObject.GClosure" c:type="GClosure*"/>
       </field>
       <field name="accel_path_quark">
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="GLib.GQuark" c:type="GQuark"/>
       </field>
     </record>
     <callback name="GtkAccelGroupActivate">
@@ -1227,13 +1239,13 @@
       </return-value>
       <parameters>
         <parameter name="accel_group">
-          <type name="GtkAccelGroup*" c:type="GtkAccelGroup*"/>
+          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
         </parameter>
         <parameter name="acceleratable">
-          <type name="GObject*" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="modifier">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -1246,10 +1258,10 @@
       </return-value>
       <parameters>
         <parameter name="key">
-          <type name="GtkAccelKey*" c:type="GtkAccelKey*"/>
+          <type name="GtkAccelKey" c:type="GtkAccelKey*"/>
         </parameter>
         <parameter name="closure">
-          <type name="GClosure*" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -1258,7 +1270,7 @@
     </callback>
     <class name="AccelGroup"
            c:type="GtkAccelGroup"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkAccelGroup"
            glib:get-type="gtk_accel_group_get_type">
       <constructor name="new" c:identifier="gtk_accel_group_new">
@@ -1273,7 +1285,7 @@
         </return-value>
         <parameters>
           <parameter name="closure">
-            <type name="GClosure" c:type="GClosure*"/>
+            <type name="GObject.GClosure" c:type="GClosure*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -1306,16 +1318,16 @@
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="accel_key">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="accel_mods">
             <type name="GdkModifierType" c:type="GdkModifierType"/>
           </parameter>
           <parameter name="accel_flags">
-            <type name="GtkAccelFlags" c:type="GtkAccelFlags"/>
+            <type name="AccelFlags" c:type="GtkAccelFlags"/>
           </parameter>
           <parameter name="closure">
-            <type name="GClosure" c:type="GClosure*"/>
+            <type name="GObject.GClosure" c:type="GClosure*"/>
           </parameter>
         </parameters>
       </method>
@@ -1332,7 +1344,7 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="closure">
-            <type name="GClosure" c:type="GClosure*"/>
+            <type name="GObject.GClosure" c:type="GClosure*"/>
           </parameter>
         </parameters>
       </method>
@@ -1345,7 +1357,7 @@
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="closure">
-            <type name="GClosure" c:type="GClosure*"/>
+            <type name="GObject.GClosure" c:type="GClosure*"/>
           </parameter>
         </parameters>
       </method>
@@ -1359,7 +1371,7 @@
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="accel_key">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="accel_mods">
             <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -1375,13 +1387,13 @@
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="accel_quark">
-            <type name="GQuark" c:type="GQuark"/>
+            <type name="GLib.GQuark" c:type="GQuark"/>
           </parameter>
           <parameter name="acceleratable">
-            <type name="GLib.Object" c:type="GObject*"/>
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
           <parameter name="accel_key">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="accel_mods">
             <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -1413,13 +1425,13 @@
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="accel_key">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="accel_mods">
             <type name="GdkModifierType" c:type="GdkModifierType"/>
           </parameter>
           <parameter name="n_entries">
-            <type name="guint" c:type="guint*"/>
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
         </parameters>
       </method>
@@ -1429,16 +1441,16 @@
         </return-value>
         <parameters>
           <parameter name="accel_group">
-            <type name="GtkAccelGroup*" c:type="GtkAccelGroup*"/>
+            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="keyval">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="modifier">
             <type name="GdkModifierType" c:type="GdkModifierType"/>
           </parameter>
           <parameter name="accel_closure">
-            <type name="GClosure*" c:type="GClosure*"/>
+            <type name="GObject.GClosure" c:type="GClosure*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1468,10 +1480,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GObject" c:type="GObject"/>
+            <type name="GObject.Object" c:type="GObject"/>
           </parameter>
           <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="p1">
             <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -1484,13 +1496,13 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="p0">
             <type name="GdkModifierType" c:type="GdkModifierType"/>
           </parameter>
           <parameter name="p1">
-            <type name="GClosure" c:type="GClosure"/>
+            <type name="GObject.GClosure" c:type="GClosure"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -1504,7 +1516,7 @@
           <type name="AccelGroup" c:type="GtkAccelGroup*"/>
         </parameter>
         <parameter name="object">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
       </parameters>
     </function>
@@ -1517,7 +1529,7 @@
           <type name="AccelGroup" c:type="GtkAccelGroup*"/>
         </parameter>
         <parameter name="object">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
       </parameters>
     </function>
@@ -1528,10 +1540,10 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="accel_key">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="accel_mods">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -1541,11 +1553,11 @@
     <function name="accel_groups_from_object"
               c:identifier="gtk_accel_groups_from_object">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
       </parameters>
     </function>
@@ -1555,7 +1567,7 @@
       </return-value>
       <parameters>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="modifiers">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -1571,7 +1583,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="accelerator_key">
-          <type name="guint" c:type="guint*"/>
+          <type name="GLib.guint" c:type="guint*"/>
         </parameter>
         <parameter name="accelerator_mods">
           <type name="GdkModifierType" c:type="GdkModifierType*"/>
@@ -1584,7 +1596,7 @@
       </return-value>
       <parameters>
         <parameter name="accelerator_key">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="accelerator_mods">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -1598,7 +1610,7 @@
       </return-value>
       <parameters>
         <parameter name="accelerator_key">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="accelerator_mods">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -1619,7 +1631,7 @@
     <function name="accelerator_get_default_mod_mask"
               c:identifier="gtk_accelerator_get_default_mod_mask">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
     </function>
     <function name="accel_group_reconnect"
@@ -1632,7 +1644,7 @@
           <type name="AccelGroup" c:type="GtkAccelGroup*"/>
         </parameter>
         <parameter name="accel_path_quark">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="GLib.GQuark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -3230,7 +3242,7 @@
     </record>
     <record name="GtkObject" c:type="GtkObject">
       <field name="parent_instance">
-        <type name="GInitiallyUnowned" c:type="GInitiallyUnowned"/>
+        <type name="GObject.InitiallyUnowned" c:type="GInitiallyUnowned"/>
       </field>
       <field name="flags">
         <type name="uint32" c:type="guint32"/>
@@ -3241,13 +3253,13 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkObject*" c:type="GtkObject*"/>
+            <type name="GtkObject" c:type="GtkObject*"/>
           </parameter>
           <parameter name="arg">
-            <type name="GtkArg*" c:type="GtkArg*"/>
+            <type name="GtkArg" c:type="GtkArg*"/>
           </parameter>
           <parameter name="arg_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
@@ -3257,13 +3269,13 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkObject*" c:type="GtkObject*"/>
+            <type name="GtkObject" c:type="GtkObject*"/>
           </parameter>
           <parameter name="arg">
-            <type name="GtkArg*" c:type="GtkArg*"/>
+            <type name="GtkArg" c:type="GtkArg*"/>
           </parameter>
           <parameter name="arg_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
@@ -3273,7 +3285,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkObject*" c:type="GtkObject*"/>
+            <type name="GtkObject" c:type="GtkObject*"/>
           </parameter>
         </parameters>
       </callback>
@@ -3304,16 +3316,16 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GtkObject*" c:type="GtkObject*"/>
+          <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="n_args">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="args">
-          <type name="GtkArg*" c:type="GtkArg*"/>
+          <type name="GtkArg" c:type="GtkArg*"/>
         </parameter>
       </parameters>
     </callback>
@@ -3327,10 +3339,10 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="object_size">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="class_size">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="class_init_func">
         <type name="GtkClassInitFunc" c:type="GtkClassInitFunc"/>
@@ -3384,7 +3396,7 @@
     <function name="type_enum_get_values"
               c:identifier="gtk_type_enum_get_values">
       <return-value>
-        <type name="GtkEnumValue*" c:type="GtkEnumValue*"/>
+        <type name="GtkEnumValue" c:type="GtkEnumValue*"/>
       </return-value>
       <parameters>
         <parameter name="enum_type">
@@ -3395,7 +3407,7 @@
     <function name="type_flags_get_values"
               c:identifier="gtk_type_flags_get_values">
       <return-value>
-        <type name="GtkFlagValue*" c:type="GtkFlagValue*"/>
+        <type name="GtkFlagValue" c:type="GtkFlagValue*"/>
       </return-value>
       <parameters>
         <parameter name="flags_type">
@@ -3406,7 +3418,7 @@
     <function name="type_enum_find_value"
               c:identifier="gtk_type_enum_find_value">
       <return-value>
-        <type name="GtkEnumValue*" c:type="GtkEnumValue*"/>
+        <type name="GtkEnumValue" c:type="GtkEnumValue*"/>
       </return-value>
       <parameters>
         <parameter name="enum_type">
@@ -3420,7 +3432,7 @@
     <function name="type_flags_find_value"
               c:identifier="gtk_type_flags_find_value">
       <return-value>
-        <type name="GtkFlagValue*" c:type="GtkFlagValue*"/>
+        <type name="GtkFlagValue" c:type="GtkFlagValue*"/>
       </return-value>
       <parameters>
         <parameter name="flags_type">
@@ -3468,7 +3480,7 @@
     </function>
     <function name="object_new" c:identifier="gtk_object_new">
       <return-value>
-        <type name="GtkObject*" c:type="GtkObject*"/>
+        <type name="GtkObject" c:type="GtkObject*"/>
       </return-value>
       <parameters>
         <parameter name="type">
@@ -3481,7 +3493,7 @@
     </function>
     <function name="object_ref" c:identifier="gtk_object_ref">
       <return-value>
-        <type name="GtkObject*" c:type="GtkObject*"/>
+        <type name="GtkObject" c:type="GtkObject*"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -3642,7 +3654,7 @@
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="data_id">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="GLib.GQuark" c:type="GQuark"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -3659,7 +3671,7 @@
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="data_id">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="GLib.GQuark" c:type="GQuark"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -3679,7 +3691,7 @@
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="data_id">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="GLib.GQuark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -3693,7 +3705,7 @@
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="data_id">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="GLib.GQuark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -3707,7 +3719,7 @@
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="key_id">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="GLib.GQuark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -3750,10 +3762,10 @@
           <type name="GtkType" c:type="GtkType"/>
         </parameter>
         <parameter name="arg_flags">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="arg_id">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -3845,7 +3857,7 @@
         </return-value>
         <parameters>
           <parameter name="adjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </callback>
@@ -3855,7 +3867,7 @@
         </return-value>
         <parameters>
           <parameter name="adjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </callback>
@@ -3892,7 +3904,7 @@
     </class>
     <function name="adjustment_new" c:identifier="gtk_adjustment_new">
       <return-value>
-        <type name="GtkObject*" c:type="GtkObject*"/>
+        <type name="GtkObject" c:type="GtkObject*"/>
       </return-value>
       <parameters>
         <parameter name="value">
@@ -3918,16 +3930,16 @@
     <record name="GtkThemeEngine" c:type="GtkThemeEngine"/>
     <record name="GtkRcProperty" c:type="GtkRcProperty">
       <field name="type_name">
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="GLib.GQuark" c:type="GQuark"/>
       </field>
       <field name="property_name">
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="GLib.GQuark" c:type="GQuark"/>
       </field>
       <field name="origin">
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="value">
-        <type name="GValue" c:type="GValue"/>
+        <type name="GObject.GValue" c:type="GValue"/>
       </field>
     </record>
     <callback name="GtkRcPropertyParser">
@@ -3936,19 +3948,19 @@
       </return-value>
       <parameters>
         <parameter name="pspec">
-          <type name="GParamSpec*" c:type="GParamSpec*"/>
+          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
         </parameter>
         <parameter name="rc_string">
-          <type name="GString*" c:type="GString*"/>
+          <type name="GLib.GString" c:type="GString*"/>
         </parameter>
         <parameter name="property_value">
-          <type name="GValue*" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </callback>
     <class name="Style"
            c:type="GtkStyle"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkStyle"
            glib:get-type="gtk_style_get_type">
       <constructor name="new" c:identifier="gtk_style_new">
@@ -4085,7 +4097,7 @@
       </method>
       <method name="lookup_icon_set" c:identifier="gtk_style_lookup_icon_set">
         <return-value>
-          <type name="GtkIconSet" c:type="GtkIconSet*"/>
+          <type name="IconSet" c:type="GtkIconSet*"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4121,7 +4133,7 @@
             <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="source">
-            <type name="GtkIconSource" c:type="GtkIconSource*"/>
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
           <parameter name="direction">
             <type name="TextDirection" c:type="GtkTextDirection"/>
@@ -4133,7 +4145,7 @@
             <type name="IconSize" c:type="GtkIconSize"/>
           </parameter>
           <parameter name="widget" allow-none="1">
-            <type name="GtkWidget" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail" allow-none="1">
             <type name="string" c:type="gchar*"/>
@@ -4146,7 +4158,7 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4156,7 +4168,7 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4166,20 +4178,20 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="src">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="clone">
         <return-value>
-          <type name="GtkStyle*" c:type="GtkStyle*"/>
+          <type name="Style" c:type="GtkStyle*"/>
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4189,10 +4201,10 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="rc_style">
-            <type name="GtkRcStyle*" c:type="GtkRcStyle*"/>
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4202,38 +4214,38 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="render_icon">
         <return-value>
-          <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="source">
-            <type name="GtkIconSource*" c:type="GtkIconSource*"/>
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
           <parameter name="direction">
-            <type name="GtkTextDirection" c:type="GtkTextDirection"/>
+            <type name="TextDirection" c:type="GtkTextDirection"/>
           </parameter>
           <parameter name="state">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="size">
-            <type name="GtkIconSize" c:type="GtkIconSize"/>
+            <type name="IconSize" c:type="GtkIconSize"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4246,19 +4258,19 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4280,19 +4292,19 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4314,22 +4326,22 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="shadow_type">
-            <type name="GtkShadowType" c:type="GtkShadowType"/>
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4354,28 +4366,28 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="shadow_type">
-            <type name="GtkShadowType" c:type="GtkShadowType"/>
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="point">
-            <type name="GdkPoint*" c:type="GdkPoint*"/>
+            <type name="Gdk.GdkPoint" c:type="GdkPoint*"/>
           </parameter>
           <parameter name="npoints">
             <type name="int32" c:type="gint"/>
@@ -4391,28 +4403,28 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="shadow_type">
-            <type name="GtkShadowType" c:type="GtkShadowType"/>
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="arrow_type">
-            <type name="GtkArrowType" c:type="GtkArrowType"/>
+            <type name="ArrowType" c:type="GtkArrowType"/>
           </parameter>
           <parameter name="fill">
             <type name="boolean" c:type="gboolean"/>
@@ -4437,22 +4449,22 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="shadow_type">
-            <type name="GtkShadowType" c:type="GtkShadowType"/>
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4477,19 +4489,19 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4511,22 +4523,22 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="shadow_type">
-            <type name="GtkShadowType" c:type="GtkShadowType"/>
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4551,22 +4563,22 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="shadow_type">
-            <type name="GtkShadowType" c:type="GtkShadowType"/>
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4591,22 +4603,22 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="shadow_type">
-            <type name="GtkShadowType" c:type="GtkShadowType"/>
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4631,22 +4643,22 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="shadow_type">
-            <type name="GtkShadowType" c:type="GtkShadowType"/>
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4671,22 +4683,22 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="shadow_type">
-            <type name="GtkShadowType" c:type="GtkShadowType"/>
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4711,22 +4723,22 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="shadow_type">
-            <type name="GtkShadowType" c:type="GtkShadowType"/>
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4744,7 +4756,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="gap_side">
-            <type name="GtkPositionType" c:type="GtkPositionType"/>
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
           <parameter name="gap_x">
             <type name="int32" c:type="gint"/>
@@ -4760,22 +4772,22 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="shadow_type">
-            <type name="GtkShadowType" c:type="GtkShadowType"/>
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4793,7 +4805,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="gap_side">
-            <type name="GtkPositionType" c:type="GtkPositionType"/>
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
           <parameter name="gap_x">
             <type name="int32" c:type="gint"/>
@@ -4809,22 +4821,22 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="shadow_type">
-            <type name="GtkShadowType" c:type="GtkShadowType"/>
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4842,7 +4854,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="gap_side">
-            <type name="GtkPositionType" c:type="GtkPositionType"/>
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
         </parameters>
       </callback>
@@ -4852,19 +4864,19 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4889,22 +4901,22 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="shadow_type">
-            <type name="GtkShadowType" c:type="GtkShadowType"/>
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4922,7 +4934,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="orientation">
-            <type name="GtkOrientation" c:type="GtkOrientation"/>
+            <type name="Orientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
       </callback>
@@ -4932,22 +4944,22 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="shadow_type">
-            <type name="GtkShadowType" c:type="GtkShadowType"/>
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4965,7 +4977,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="orientation">
-            <type name="GtkOrientation" c:type="GtkOrientation"/>
+            <type name="Orientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
       </callback>
@@ -4975,19 +4987,19 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -4999,7 +5011,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="expander_style">
-            <type name="GtkExpanderStyle" c:type="GtkExpanderStyle"/>
+            <type name="ExpanderStyle" c:type="GtkExpanderStyle"/>
           </parameter>
         </parameters>
       </callback>
@@ -5009,22 +5021,22 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="use_text">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -5036,7 +5048,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="layout">
-            <type name="PangoLayout*" c:type="PangoLayout*"/>
+            <type name="Pango.Layout" c:type="PangoLayout*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5046,19 +5058,19 @@
         </return-value>
         <parameters>
           <parameter name="style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="state_type">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="detail">
             <type name="string" c:type="gchar*"/>
@@ -5250,7 +5262,7 @@
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
         <parameter name="points">
-          <type name="GdkPoint" c:type="GdkPoint*"/>
+          <type name="Gdk.GdkPoint" c:type="GdkPoint*"/>
         </parameter>
         <parameter name="npoints">
           <type name="int32" c:type="gint"/>
@@ -5792,7 +5804,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -5826,7 +5838,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -5863,7 +5875,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -5903,13 +5915,13 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="points">
-          <type name="GdkPoint" c:type="GdkPoint*"/>
+          <type name="Gdk.GdkPoint" c:type="GdkPoint*"/>
         </parameter>
         <parameter name="npoints">
           <type name="int32" c:type="gint"/>
@@ -5940,7 +5952,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -5986,7 +5998,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6026,7 +6038,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6066,7 +6078,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6106,7 +6118,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6146,7 +6158,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6186,7 +6198,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6226,7 +6238,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6275,7 +6287,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6324,7 +6336,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6364,7 +6376,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6404,7 +6416,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6447,7 +6459,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6487,7 +6499,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6524,7 +6536,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6558,7 +6570,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6608,17 +6620,17 @@
     <function name="style_peek_property_value"
               c:identifier="_gtk_style_peek_property_value">
       <return-value>
-        <type name="GValue*" c:type="GValue*"/>
+        <type name="GObject.GValue" c:type="GValue*"/>
       </return-value>
       <parameters>
         <parameter name="style">
           <type name="Style" c:type="GtkStyle*"/>
         </parameter>
         <parameter name="widget_type">
-          <type name="GType" c:type="GType"/>
+          <type name="GObject.GType" c:type="GType"/>
         </parameter>
         <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
         </parameter>
         <parameter name="parser">
           <type name="GtkRcPropertyParser" c:type="GtkRcPropertyParser"/>
@@ -6635,7 +6647,7 @@
           <type name="Style" c:type="GtkStyle*"/>
         </parameter>
         <parameter name="settings">
-          <type name="GtkSettings" c:type="GtkSettings*"/>
+          <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
       </parameters>
     </function>
@@ -6698,7 +6710,7 @@
           <type name="GdkRectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="widget" allow-none="1">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
@@ -6721,7 +6733,7 @@
       </return-value>
       <parameters>
         <parameter name="widget">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="drawable">
           <type name="Gdk.Drawable" c:type="GdkDrawable*"/>
@@ -6746,11 +6758,11 @@
     <function name="widget_get_cursor_gc"
               c:identifier="_gtk_widget_get_cursor_gc">
       <return-value>
-        <type name="GdkGC*" c:type="GdkGC*"/>
+        <type name="Gdk.GC" c:type="GdkGC*"/>
       </return-value>
       <parameters>
         <parameter name="widget">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
@@ -6761,7 +6773,7 @@
       </return-value>
       <parameters>
         <parameter name="widget">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="color">
           <type name="GdkColor" c:type="GdkColor*"/>
@@ -6777,7 +6789,7 @@
     <function name="rc_parse_widget_class_path"
               c:identifier="_gtk_rc_parse_widget_class_path">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
@@ -6792,7 +6804,7 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
@@ -6803,7 +6815,7 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </parameter>
         <parameter name="length">
           <type name="int32" c:type="gint"/>
@@ -6834,34 +6846,34 @@
       </return-value>
       <parameters>
         <parameter name="filenames">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
     <function name="rc_get_default_files"
               c:identifier="gtk_rc_get_default_files">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="GLib.gchar" c:type="gchar**"/>
       </return-value>
     </function>
     <function name="rc_get_style" c:identifier="gtk_rc_get_style">
       <return-value>
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="Style" c:type="GtkStyle*"/>
       </return-value>
       <parameters>
         <parameter name="widget">
-          <type name="GtkWidget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
     <function name="rc_get_style_by_paths"
               c:identifier="gtk_rc_get_style_by_paths">
       <return-value>
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="Style" c:type="GtkStyle*"/>
       </return-value>
       <parameters>
         <parameter name="settings">
-          <type name="GtkSettings" c:type="GtkSettings*"/>
+          <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
         <parameter name="widget_path" allow-none="1">
           <type name="string" c:type="char*"/>
@@ -6870,7 +6882,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="type">
-          <type name="GType" c:type="GType"/>
+          <type name="GObject.GType" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
@@ -6881,7 +6893,7 @@
       </return-value>
       <parameters>
         <parameter name="settings">
-          <type name="GtkSettings" c:type="GtkSettings*"/>
+          <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
         <parameter name="force_load">
           <type name="boolean" c:type="gboolean"/>
@@ -6894,7 +6906,7 @@
       </return-value>
       <parameters>
         <parameter name="settings">
-          <type name="GtkSettings" c:type="GtkSettings*"/>
+          <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
       </parameters>
     </function>
@@ -6905,10 +6917,10 @@
       </return-value>
       <parameters>
         <parameter name="settings">
-          <type name="GtkSettings" c:type="GtkSettings*"/>
+          <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="GLib.GScanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="pixmap_file">
           <type name="string" c:type="gchar*"/>
@@ -6947,7 +6959,7 @@
       </return-value>
       <parameters>
         <parameter name="rc_style">
-          <type name="GtkRcStyle" c:type="GtkRcStyle*"/>
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
         </parameter>
         <parameter name="pattern">
           <type name="string" c:type="gchar*"/>
@@ -6961,7 +6973,7 @@
       </return-value>
       <parameters>
         <parameter name="rc_style">
-          <type name="GtkRcStyle" c:type="GtkRcStyle*"/>
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
         </parameter>
         <parameter name="pattern">
           <type name="string" c:type="gchar*"/>
@@ -6974,7 +6986,7 @@
       </return-value>
       <parameters>
         <parameter name="rc_style">
-          <type name="GtkRcStyle" c:type="GtkRcStyle*"/>
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
         </parameter>
         <parameter name="pattern">
           <type name="string" c:type="gchar*"/>
@@ -6983,7 +6995,7 @@
     </function>
     <class name="RcStyle"
            c:type="GtkRcStyle"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkRcStyle"
            glib:get-type="gtk_rc_style_get_type">
       <constructor name="new" c:identifier="gtk_rc_style_new">
@@ -7023,27 +7035,27 @@
       </method>
       <callback name="create_rc_style">
         <return-value>
-          <type name="GtkRcStyle*" c:type="GtkRcStyle*"/>
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
         </return-value>
         <parameters>
           <parameter name="rc_style">
-            <type name="GtkRcStyle*" c:type="GtkRcStyle*"/>
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="parse">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="rc_style">
-            <type name="GtkRcStyle*" c:type="GtkRcStyle*"/>
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
           <parameter name="settings">
-            <type name="GtkSettings*" c:type="GtkSettings*"/>
+            <type name="Settings" c:type="GtkSettings*"/>
           </parameter>
           <parameter name="scanner">
-            <type name="GScanner*" c:type="GScanner*"/>
+            <type name="GLib.GScanner" c:type="GScanner*"/>
           </parameter>
         </parameters>
       </callback>
@@ -7053,20 +7065,20 @@
         </return-value>
         <parameters>
           <parameter name="dest">
-            <type name="GtkRcStyle*" c:type="GtkRcStyle*"/>
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
           <parameter name="src">
-            <type name="GtkRcStyle*" c:type="GtkRcStyle*"/>
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="create_style">
         <return-value>
-          <type name="GtkStyle*" c:type="GtkStyle*"/>
+          <type name="Style" c:type="GtkStyle*"/>
         </return-value>
         <parameters>
           <parameter name="rc_style">
-            <type name="GtkRcStyle*" c:type="GtkRcStyle*"/>
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
         </parameters>
       </callback>
@@ -7126,16 +7138,16 @@
     </function>
     <function name="rc_scanner_new" c:identifier="gtk_rc_scanner_new">
       <return-value>
-        <type name="GScanner*" c:type="GScanner*"/>
+        <type name="GLib.GScanner" c:type="GScanner*"/>
       </return-value>
     </function>
     <function name="rc_parse_color" c:identifier="gtk_rc_parse_color">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="GLib.GScanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="color">
           <type name="GdkColor" c:type="GdkColor*"/>
@@ -7145,11 +7157,11 @@
     <function name="rc_parse_color_full"
               c:identifier="gtk_rc_parse_color_full">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="GLib.GScanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="style">
           <type name="RcStyle" c:type="GtkRcStyle*"/>
@@ -7161,11 +7173,11 @@
     </function>
     <function name="rc_parse_state" c:identifier="gtk_rc_parse_state">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="GLib.GScanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="state">
           <type name="StateType" c:type="GtkStateType*"/>
@@ -7174,11 +7186,11 @@
     </function>
     <function name="rc_parse_priority" c:identifier="gtk_rc_parse_priority">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="GLib.GScanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="priority">
           <type name="PathPriorityType" c:type="GtkPathPriorityType*"/>
@@ -7188,17 +7200,17 @@
     <function name="rc_style_lookup_rc_property"
               c:identifier="_gtk_rc_style_lookup_rc_property">
       <return-value>
-        <type name="GtkRcProperty*" c:type="GtkRcProperty*"/>
+        <type name="GtkRcProperty" c:type="GtkRcProperty*"/>
       </return-value>
       <parameters>
         <parameter name="rc_style">
           <type name="RcStyle" c:type="GtkRcStyle*"/>
         </parameter>
         <parameter name="type_name">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="GLib.GQuark" c:type="GQuark"/>
         </parameter>
         <parameter name="property_name">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="GLib.GQuark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -7226,17 +7238,17 @@
           <type name="RcStyle" c:type="GtkRcStyle*"/>
         </parameter>
         <parameter name="type_name">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="GLib.GQuark" c:type="GQuark"/>
         </parameter>
         <parameter name="property_name">
-          <type name="GQuark" c:type="GQuark"/>
+          <type name="GLib.GQuark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
     <function name="rc_style_get_color_hashes"
               c:identifier="_gtk_rc_style_get_color_hashes">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="rc_style">
@@ -7251,7 +7263,7 @@
       </return-value>
       <parameters>
         <parameter name="settings">
-          <type name="GtkSettings" c:type="GtkSettings*"/>
+          <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
       </parameters>
     </function>
@@ -7261,7 +7273,7 @@
       </return-value>
       <parameters>
         <parameter name="settings">
-          <type name="GtkSettings" c:type="GtkSettings*"/>
+          <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
       </parameters>
     </function>
@@ -7270,13 +7282,13 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="value">
-        <type name="GValue" c:type="GValue"/>
+        <type name="GObject.GValue" c:type="GValue"/>
       </field>
     </record>
     <record name="GtkSettingsPropertyValue" c:type="GtkSettingsPropertyValue"/>
     <class name="Settings"
            c:type="GtkSettings"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkSettings"
            glib:get-type="gtk_settings_get_type">
       <constructor name="get_default" c:identifier="gtk_settings_get_default">
@@ -7518,7 +7530,7 @@
       </return-value>
       <parameters>
         <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
@@ -7529,7 +7541,7 @@
       </return-value>
       <parameters>
         <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
         </parameter>
         <parameter name="parser">
           <type name="GtkRcPropertyParser" c:type="GtkRcPropertyParser"/>
@@ -7543,13 +7555,13 @@
       </return-value>
       <parameters>
         <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
         </parameter>
         <parameter name="gstring">
-          <type name="GString" c:type="GString*"/>
+          <type name="GLib.GString" c:type="GString*"/>
         </parameter>
         <parameter name="property_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -7560,13 +7572,13 @@
       </return-value>
       <parameters>
         <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
         </parameter>
         <parameter name="gstring">
-          <type name="GString" c:type="GString*"/>
+          <type name="GLib.GString" c:type="GString*"/>
         </parameter>
         <parameter name="property_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -7577,13 +7589,13 @@
       </return-value>
       <parameters>
         <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
         </parameter>
         <parameter name="gstring">
-          <type name="GString" c:type="GString*"/>
+          <type name="GLib.GString" c:type="GString*"/>
         </parameter>
         <parameter name="property_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -7594,13 +7606,13 @@
       </return-value>
       <parameters>
         <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
         </parameter>
         <parameter name="gstring">
-          <type name="GString" c:type="GString*"/>
+          <type name="GLib.GString" c:type="GString*"/>
         </parameter>
         <parameter name="property_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -7611,13 +7623,13 @@
       </return-value>
       <parameters>
         <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
         </parameter>
         <parameter name="gstring">
-          <type name="GString" c:type="GString*"/>
+          <type name="GLib.GString" c:type="GString*"/>
         </parameter>
         <parameter name="property_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -7656,7 +7668,7 @@
       </return-value>
       <parameters>
         <parameter name="event">
-          <type name="GdkEventSetting" c:type="GdkEventSetting*"/>
+          <type name="Gdk.GdkEventSetting" c:type="GdkEventSetting*"/>
         </parameter>
       </parameters>
     </function>
@@ -7667,7 +7679,7 @@
       </return-value>
       <parameters>
         <parameter name="type">
-          <type name="GType" c:type="GType"/>
+          <type name="GObject.GType" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
@@ -7681,13 +7693,13 @@
           <type name="GtkRcPropertyParser" c:type="GtkRcPropertyParser"/>
         </parameter>
         <parameter name="src_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
         </parameter>
         <parameter name="dest_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -7705,10 +7717,10 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="x_set">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="y_set">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <record name="GtkWidgetShapeInfo" c:type="GtkWidgetShapeInfo">
@@ -7719,7 +7731,7 @@
         <type name="int16" c:type="gint16"/>
       </field>
       <field name="shape_mask">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+        <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
       </field>
     </record>
     <callback name="GtkCallback">
@@ -7728,7 +7740,7 @@
       </return-value>
       <parameters>
         <parameter name="widget">
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -7746,7 +7758,7 @@
         </return-value>
         <parameters>
           <parameter name="type">
-            <type name="GType" c:type="GType"/>
+            <type name="GObject.GType" c:type="GType"/>
           </parameter>
           <parameter name="first_property_name">
             <type name="string" c:type="gchar*"/>
@@ -7792,7 +7804,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="widget_type">
-            <type name="GType" c:type="GType"/>
+            <type name="GObject.GType" c:type="GType"/>
           </parameter>
         </parameters>
       </constructor>
@@ -8073,7 +8085,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="requisition">
-            <type name="GtkRequisition" c:type="GtkRequisition*"/>
+            <type name="Requisition" c:type="GtkRequisition*"/>
           </parameter>
         </parameters>
       </method>
@@ -8100,7 +8112,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="requisition">
-            <type name="GtkRequisition" c:type="GtkRequisition*"/>
+            <type name="Requisition" c:type="GtkRequisition*"/>
           </parameter>
         </parameters>
       </method>
@@ -8119,7 +8131,7 @@
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="accel_key">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="accel_mods">
             <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -8142,7 +8154,7 @@
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="accel_key">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="accel_mods">
             <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -8168,7 +8180,7 @@
       <method name="list_accel_closures"
               c:identifier="gtk_widget_list_accel_closures">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8186,7 +8198,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="signal_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -8213,7 +8225,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEvent" c:type="GdkEvent*"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
       </method>
@@ -8226,7 +8238,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEvent" c:type="GdkEvent*"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
       </method>
@@ -8289,14 +8301,14 @@
       <method name="region_intersect"
               c:identifier="gtk_widget_region_intersect">
         <return-value>
-          <type name="GdkRegion" c:type="GdkRegion*"/>
+          <type name="Gdk.GdkRegion" c:type="GdkRegion*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="region">
-            <type name="GdkRegion" c:type="GdkRegion*"/>
+            <type name="Gdk.GdkRegion" c:type="GdkRegion*"/>
           </parameter>
         </parameters>
       </method>
@@ -8582,10 +8594,10 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="width" direction="out">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height" direction="out">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -8744,7 +8756,7 @@
       </method>
       <method name="get_clipboard" c:identifier="gtk_widget_get_clipboard">
         <return-value>
-          <type name="GtkClipboard" c:type="GtkClipboard*"/>
+          <type name="Clipboard" c:type="GtkClipboard*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8797,10 +8809,10 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -8836,10 +8848,10 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="dest_x" direction="out">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="dest_y" direction="out">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -9106,7 +9118,7 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </method>
@@ -9183,7 +9195,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="shape_mask">
-            <type name="GdkBitmap" c:type="GdkBitmap*"/>
+            <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
           </parameter>
           <parameter name="offset_x">
             <type name="int32" c:type="gint"/>
@@ -9203,7 +9215,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="shape_mask" allow-none="1">
-            <type name="GdkBitmap" c:type="GdkBitmap*"/>
+            <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
           </parameter>
           <parameter name="offset_x">
             <type name="int32" c:type="gint"/>
@@ -9232,13 +9244,13 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="path_length" direction="out">
-            <type name="guint" c:type="guint*"/>
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
           <parameter name="path" direction="out">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
           <parameter name="path_reversed" direction="out">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
         </parameters>
       </method>
@@ -9251,20 +9263,20 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="path_length" direction="out">
-            <type name="guint" c:type="guint*"/>
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
           <parameter name="path" direction="out">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
           <parameter name="path_reversed" direction="out">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
         </parameters>
       </method>
       <method name="list_mnemonic_labels"
               c:identifier="gtk_widget_list_mnemonic_labels">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9310,14 +9322,14 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="custom_window">
-            <type name="GtkWindow" c:type="GtkWindow*"/>
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_tooltip_window"
               c:identifier="gtk_widget_get_tooltip_window">
         <return-value>
-          <type name="GtkWindow" c:type="GtkWindow*"/>
+          <type name="Window" c:type="GtkWindow*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9423,7 +9435,7 @@
         <type name="string" c:type="gchararray"/>
       </property>
       <property name="parent">
-        <type name="GtkContainer" c:type="GtkContainer"/>
+        <type name="Container" c:type="GtkContainer"/>
       </property>
       <property name="width-request">
         <type name="int32" c:type="gint"/>
@@ -9462,7 +9474,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="style">
-        <type name="GtkStyle" c:type="GtkStyle"/>
+        <type name="Style" c:type="GtkStyle"/>
       </property>
       <property name="events">
         <type name="GdkEventMask" c:type="GdkEventMask"/>
@@ -9483,10 +9495,10 @@
         <type name="string" c:type="gchararray"/>
       </property>
       <field name="activate_signal">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="set_scroll_adjustments_signal">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <callback name="dispatch_child_properties_changed">
         <return-value>
@@ -9494,13 +9506,13 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="n_pspecs">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="pspecs">
-            <type name="GParamSpec**" c:type="GParamSpec**"/>
+            <type name="GObject.GParamSpec" c:type="GParamSpec**"/>
           </parameter>
         </parameters>
       </callback>
@@ -9510,7 +9522,7 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9520,7 +9532,7 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9530,7 +9542,7 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9540,7 +9552,7 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9550,7 +9562,7 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9560,7 +9572,7 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9570,7 +9582,7 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9580,7 +9592,7 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9590,10 +9602,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="requisition">
-            <type name="GtkRequisition*" c:type="GtkRequisition*"/>
+            <type name="Requisition" c:type="GtkRequisition*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9603,10 +9615,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="allocation">
-            <type name="GtkAllocation*" c:type="GtkAllocation*"/>
+            <type name="GtkAllocation" c:type="GtkAllocation*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9616,10 +9628,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="previous_state">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
         </parameters>
       </callback>
@@ -9629,10 +9641,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="previous_parent">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9642,10 +9654,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="previous_toplevel">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9655,10 +9667,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="previous_style">
-            <type name="GtkStyle*" c:type="GtkStyle*"/>
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9668,10 +9680,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="previous_direction">
-            <type name="GtkTextDirection" c:type="GtkTextDirection"/>
+            <type name="TextDirection" c:type="GtkTextDirection"/>
           </parameter>
         </parameters>
       </callback>
@@ -9681,7 +9693,7 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="was_grabbed">
             <type name="boolean" c:type="gboolean"/>
@@ -9694,10 +9706,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="pspec">
-            <type name="GParamSpec*" c:type="GParamSpec*"/>
+            <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9707,7 +9719,7 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="group_cycling">
             <type name="boolean" c:type="gboolean"/>
@@ -9720,7 +9732,7 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9730,10 +9742,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="direction">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </callback>
@@ -9743,10 +9755,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9756,10 +9768,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventButton*" c:type="GdkEventButton*"/>
+            <type name="Gdk.GdkEventButton" c:type="GdkEventButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9769,10 +9781,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventButton*" c:type="GdkEventButton*"/>
+            <type name="Gdk.GdkEventButton" c:type="GdkEventButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9782,10 +9794,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventScroll*" c:type="GdkEventScroll*"/>
+            <type name="Gdk.GdkEventScroll" c:type="GdkEventScroll*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9795,10 +9807,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventMotion*" c:type="GdkEventMotion*"/>
+            <type name="Gdk.GdkEventMotion" c:type="GdkEventMotion*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9808,10 +9820,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventAny*" c:type="GdkEventAny*"/>
+            <type name="Gdk.GdkEventAny" c:type="GdkEventAny*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9821,10 +9833,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventAny*" c:type="GdkEventAny*"/>
+            <type name="Gdk.GdkEventAny" c:type="GdkEventAny*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9834,10 +9846,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventExpose*" c:type="GdkEventExpose*"/>
+            <type name="Gdk.GdkEventExpose" c:type="GdkEventExpose*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9847,10 +9859,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventKey*" c:type="GdkEventKey*"/>
+            <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9860,10 +9872,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventKey*" c:type="GdkEventKey*"/>
+            <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9873,10 +9885,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventCrossing*" c:type="GdkEventCrossing*"/>
+            <type name="Gdk.GdkEventCrossing" c:type="GdkEventCrossing*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9886,10 +9898,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventCrossing*" c:type="GdkEventCrossing*"/>
+            <type name="Gdk.GdkEventCrossing" c:type="GdkEventCrossing*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9899,10 +9911,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventConfigure*" c:type="GdkEventConfigure*"/>
+            <type name="Gdk.GdkEventConfigure" c:type="GdkEventConfigure*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9912,10 +9924,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventFocus*" c:type="GdkEventFocus*"/>
+            <type name="Gdk.GdkEventFocus" c:type="GdkEventFocus*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9925,10 +9937,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventFocus*" c:type="GdkEventFocus*"/>
+            <type name="Gdk.GdkEventFocus" c:type="GdkEventFocus*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9938,10 +9950,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventAny*" c:type="GdkEventAny*"/>
+            <type name="Gdk.GdkEventAny" c:type="GdkEventAny*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9951,10 +9963,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventAny*" c:type="GdkEventAny*"/>
+            <type name="Gdk.GdkEventAny" c:type="GdkEventAny*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9964,10 +9976,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventProperty*" c:type="GdkEventProperty*"/>
+            <type name="Gdk.GdkEventProperty" c:type="GdkEventProperty*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9977,10 +9989,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventSelection*" c:type="GdkEventSelection*"/>
+            <type name="Gdk.GdkEventSelection" c:type="GdkEventSelection*"/>
           </parameter>
         </parameters>
       </callback>
@@ -9990,10 +10002,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventSelection*" c:type="GdkEventSelection*"/>
+            <type name="Gdk.GdkEventSelection" c:type="GdkEventSelection*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10003,10 +10015,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventSelection*" c:type="GdkEventSelection*"/>
+            <type name="Gdk.GdkEventSelection" c:type="GdkEventSelection*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10016,10 +10028,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventProximity*" c:type="GdkEventProximity*"/>
+            <type name="Gdk.GdkEventProximity" c:type="GdkEventProximity*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10029,10 +10041,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventProximity*" c:type="GdkEventProximity*"/>
+            <type name="Gdk.GdkEventProximity" c:type="GdkEventProximity*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10042,10 +10054,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventVisibility*" c:type="GdkEventVisibility*"/>
+            <type name="Gdk.GdkEventVisibility" c:type="GdkEventVisibility*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10055,10 +10067,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventClient*" c:type="GdkEventClient*"/>
+            <type name="Gdk.GdkEventClient" c:type="GdkEventClient*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10068,10 +10080,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventAny*" c:type="GdkEventAny*"/>
+            <type name="Gdk.GdkEventAny" c:type="GdkEventAny*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10081,10 +10093,11 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventWindowState*" c:type="GdkEventWindowState*"/>
+            <type name="Gdk.GdkEventWindowState"
+                  c:type="GdkEventWindowState*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10094,16 +10107,16 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="selection_data">
-            <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
           </parameter>
           <parameter name="info">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="time_">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
@@ -10113,13 +10126,13 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="selection_data">
-            <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
           </parameter>
           <parameter name="time_">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
@@ -10129,10 +10142,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="context">
-            <type name="GdkDragContext*" c:type="GdkDragContext*"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10142,10 +10155,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="context">
-            <type name="GdkDragContext*" c:type="GdkDragContext*"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10155,19 +10168,19 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="context">
-            <type name="GdkDragContext*" c:type="GdkDragContext*"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
           <parameter name="selection_data">
-            <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
           </parameter>
           <parameter name="info">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="time_">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
@@ -10177,10 +10190,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="context">
-            <type name="GdkDragContext*" c:type="GdkDragContext*"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10190,13 +10203,13 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="context">
-            <type name="GdkDragContext*" c:type="GdkDragContext*"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
           <parameter name="time_">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
@@ -10206,10 +10219,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="context">
-            <type name="GdkDragContext*" c:type="GdkDragContext*"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -10218,7 +10231,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="time_">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
@@ -10228,10 +10241,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="context">
-            <type name="GdkDragContext*" c:type="GdkDragContext*"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -10240,7 +10253,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="time_">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
@@ -10250,10 +10263,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="context">
-            <type name="GdkDragContext*" c:type="GdkDragContext*"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -10262,13 +10275,13 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="selection_data">
-            <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
           </parameter>
           <parameter name="info">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="time_">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
@@ -10278,7 +10291,7 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10288,20 +10301,20 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="help_type">
-            <type name="GtkWidgetHelpType" c:type="GtkWidgetHelpType"/>
+            <type name="WidgetHelpType" c:type="GtkWidgetHelpType"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_accessible">
         <return-value>
-          <type name="AtkObject*" c:type="AtkObject*"/>
+          <type name="Atk.Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10311,10 +10324,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="previous_screen">
-            <type name="GdkScreen*" c:type="GdkScreen*"/>
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10324,10 +10337,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="signal_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
@@ -10337,10 +10350,10 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventGrabBroken*" c:type="GdkEventGrabBroken*"/>
+            <type name="Gdk.GdkEventGrabBroken" c:type="GdkEventGrabBroken*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10350,7 +10363,7 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10360,7 +10373,7 @@
         </return-value>
         <parameters>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -10372,7 +10385,7 @@
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="tooltip">
-            <type name="GtkTooltip*" c:type="GtkTooltip*"/>
+            <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10427,7 +10440,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkRequisition" c:type="GtkRequisition"/>
+            <type name="Requisition" c:type="GtkRequisition"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10447,7 +10460,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkStateType" c:type="GtkStateType"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10457,7 +10470,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10467,7 +10480,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10477,7 +10490,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkStyle" c:type="GtkStyle"/>
+            <type name="Style" c:type="GtkStyle"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10487,7 +10500,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTextDirection" c:type="GtkTextDirection"/>
+            <type name="TextDirection" c:type="GtkTextDirection"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10532,7 +10545,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10542,7 +10555,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10552,7 +10565,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10562,7 +10575,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10572,7 +10585,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10582,7 +10595,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10592,7 +10605,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10602,7 +10615,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10617,7 +10630,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10627,7 +10640,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10637,7 +10650,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10647,7 +10660,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10657,7 +10670,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10667,7 +10680,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10677,7 +10690,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10687,7 +10700,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10697,7 +10710,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10707,7 +10720,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10717,7 +10730,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10727,7 +10740,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10737,7 +10750,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10747,7 +10760,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10757,7 +10770,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10767,7 +10780,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10777,7 +10790,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10787,10 +10800,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkSelectionData" c:type="GtkSelectionData"/>
+            <type name="SelectionData" c:type="GtkSelectionData"/>
           </parameter>
           <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10800,13 +10813,13 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkSelectionData" c:type="GtkSelectionData"/>
+            <type name="SelectionData" c:type="GtkSelectionData"/>
           </parameter>
           <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="p1">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10816,7 +10829,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10826,7 +10839,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10836,10 +10849,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkDragContext" c:type="GdkDragContext"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
           <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10849,7 +10862,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkDragContext" c:type="GdkDragContext"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10859,7 +10872,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkDragContext" c:type="GdkDragContext"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10869,7 +10882,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkDragContext" c:type="GdkDragContext"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10879,10 +10892,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkDragContext" c:type="GdkDragContext"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkDragResult" c:type="GtkDragResult"/>
+            <type name="DragResult" c:type="GtkDragResult"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10892,7 +10905,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkDragContext" c:type="GdkDragContext"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
           <parameter name="p0">
             <type name="int32" c:type="gint"/>
@@ -10901,7 +10914,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="p2">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10911,7 +10924,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkDragContext" c:type="GdkDragContext"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
           <parameter name="p0">
             <type name="int32" c:type="gint"/>
@@ -10920,7 +10933,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="p2">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10930,16 +10943,16 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkDragContext" c:type="GdkDragContext"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkSelectionData" c:type="GtkSelectionData"/>
+            <type name="SelectionData" c:type="GtkSelectionData"/>
           </parameter>
           <parameter name="p1">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="p2">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10949,7 +10962,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkDragContext" c:type="GdkDragContext"/>
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
           <parameter name="p0">
             <type name="int32" c:type="gint"/>
@@ -10958,13 +10971,13 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="p2">
-            <type name="GtkSelectionData" c:type="GtkSelectionData"/>
+            <type name="SelectionData" c:type="GtkSelectionData"/>
           </parameter>
           <parameter name="p3">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="p4">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10974,7 +10987,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10984,7 +10997,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -10994,7 +11007,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -11004,7 +11017,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -11014,7 +11027,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -11033,7 +11046,7 @@
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="p2">
-            <type name="GtkTooltip" c:type="GtkTooltip"/>
+            <type name="Tooltip" c:type="GtkTooltip"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -11048,7 +11061,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkWidgetHelpType" c:type="GtkWidgetHelpType"/>
+            <type name="WidgetHelpType" c:type="GtkWidgetHelpType"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -11063,7 +11076,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkScreen" c:type="GdkScreen"/>
+            <type name="Gdk.Screen" c:type="GdkScreen"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -11073,7 +11086,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -11088,7 +11101,7 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="locked">
-          <type name="gboolean" c:type="gboolean*"/>
+          <type name="GLib.gboolean" c:type="gboolean*"/>
         </parameter>
       </parameters>
     </function>
@@ -11131,7 +11144,7 @@
           <type name="GtkWidgetClass" c:type="GtkWidgetClass*"/>
         </parameter>
         <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
@@ -11145,7 +11158,7 @@
           <type name="GtkWidgetClass" c:type="GtkWidgetClass*"/>
         </parameter>
         <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
         </parameter>
         <parameter name="parser">
           <type name="GtkRcPropertyParser" c:type="GtkRcPropertyParser"/>
@@ -11155,7 +11168,7 @@
     <function name="widget_class_find_style_property"
               c:identifier="gtk_widget_class_find_style_property">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="klass">
@@ -11169,14 +11182,14 @@
     <function name="widget_class_list_style_properties"
               c:identifier="gtk_widget_class_list_style_properties">
       <return-value>
-        <type name="GParamSpec**" c:type="GParamSpec**"/>
+        <type name="GObject.GParamSpec" c:type="GParamSpec**"/>
       </return-value>
       <parameters>
         <parameter name="klass">
           <type name="GtkWidgetClass" c:type="GtkWidgetClass*"/>
         </parameter>
         <parameter name="n_properties">
-          <type name="guint" c:type="guint*"/>
+          <type name="GLib.guint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
@@ -11194,19 +11207,19 @@
     <function name="widget_get_default_style"
               c:identifier="gtk_widget_get_default_style">
       <return-value>
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="Style" c:type="GtkStyle*"/>
       </return-value>
     </function>
     <function name="widget_get_default_colormap"
               c:identifier="gtk_widget_get_default_colormap">
       <return-value>
-        <type name="GdkColormap*" c:type="GdkColormap*"/>
+        <type name="Gdk.Colormap" c:type="GdkColormap*"/>
       </return-value>
     </function>
     <function name="widget_get_default_visual"
               c:identifier="gtk_widget_get_default_visual">
       <return-value>
-        <type name="GdkVisual*" c:type="GdkVisual*"/>
+        <type name="Gdk.Visual" c:type="GdkVisual*"/>
       </return-value>
     </function>
     <function name="widget_set_default_direction"
@@ -11223,7 +11236,7 @@
     <function name="widget_get_default_direction"
               c:identifier="gtk_widget_get_default_direction">
       <return-value>
-        <type name="GtkTextDirection" c:type="GtkTextDirection"/>
+        <type name="TextDirection" c:type="GtkTextDirection"/>
       </return-value>
     </function>
     <glib:boxed c:type="Requisition"
@@ -11267,7 +11280,7 @@
     <function name="widget_get_aux_info"
               c:identifier="_gtk_widget_get_aux_info">
       <return-value>
-        <type name="GtkWidgetAuxInfo*" c:type="GtkWidgetAuxInfo*"/>
+        <type name="GtkWidgetAuxInfo" c:type="GtkWidgetAuxInfo*"/>
       </return-value>
       <parameters>
         <parameter name="widget">
@@ -11320,7 +11333,7 @@
     <function name="widget_peek_colormap"
               c:identifier="_gtk_widget_peek_colormap">
       <return-value>
-        <type name="GdkColormap*" c:type="GdkColormap*"/>
+        <type name="Gdk.Colormap" c:type="GdkColormap*"/>
       </return-value>
     </function>
     <class name="Container"
@@ -11338,14 +11351,14 @@
             <type name="Container" c:type="GtkContainer*"/>
           </parameter>
           <parameter name="border_width">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_border_width"
               c:identifier="gtk_container_get_border_width">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11454,7 +11467,7 @@
       </method>
       <method name="get_children" c:identifier="gtk_container_get_children">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11475,7 +11488,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventExpose" c:type="GdkEventExpose*"/>
+            <type name="Gdk.GdkEventExpose" c:type="GdkEventExpose*"/>
           </parameter>
         </parameters>
       </method>
@@ -11489,7 +11502,7 @@
             <type name="Container" c:type="GtkContainer*"/>
           </parameter>
           <parameter name="focusable_widgets">
-            <type name="GList" c:type="GList*"/>
+            <type name="GLib.GList" c:type="GList*"/>
           </parameter>
         </parameters>
       </method>
@@ -11503,7 +11516,7 @@
             <type name="Container" c:type="GtkContainer*"/>
           </parameter>
           <parameter name="focusable_widgets">
-            <type name="GList" c:type="GList**"/>
+            <type name="GLib.GList" c:type="GList**"/>
           </parameter>
         </parameters>
       </method>
@@ -11609,7 +11622,7 @@
       </method>
       <method name="child_type" c:identifier="gtk_container_child_type">
         <return-value>
-          <type name="GType" c:type="GType"/>
+          <type name="GObject.GType" c:type="GType"/>
         </return-value>
         <parameters>
           <parameter name="container">
@@ -11722,7 +11735,7 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </method>
@@ -11742,7 +11755,7 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </method>
@@ -11763,13 +11776,13 @@
         </parameters>
       </method>
       <property name="border-width">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="resize-mode">
-        <type name="GtkResizeMode" c:type="GtkResizeMode"/>
+        <type name="ResizeMode" c:type="GtkResizeMode"/>
       </property>
       <property name="child">
-        <type name="GtkWidget" c:type="GtkWidget"/>
+        <type name="Widget" c:type="GtkWidget"/>
       </property>
       <callback name="add">
         <return-value>
@@ -11777,10 +11790,10 @@
         </return-value>
         <parameters>
           <parameter name="container">
-            <type name="GtkContainer*" c:type="GtkContainer*"/>
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -11790,10 +11803,10 @@
         </return-value>
         <parameters>
           <parameter name="container">
-            <type name="GtkContainer*" c:type="GtkContainer*"/>
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -11803,7 +11816,7 @@
         </return-value>
         <parameters>
           <parameter name="container">
-            <type name="GtkContainer*" c:type="GtkContainer*"/>
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
         </parameters>
       </callback>
@@ -11813,7 +11826,7 @@
         </return-value>
         <parameters>
           <parameter name="container">
-            <type name="GtkContainer*" c:type="GtkContainer*"/>
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
           <parameter name="include_internals">
             <type name="boolean" c:type="gboolean"/>
@@ -11832,20 +11845,20 @@
         </return-value>
         <parameters>
           <parameter name="container">
-            <type name="GtkContainer*" c:type="GtkContainer*"/>
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="child_type">
         <return-value>
-          <type name="GType" c:type="GType"/>
+          <type name="GObject.GType" c:type="GType"/>
         </return-value>
         <parameters>
           <parameter name="container">
-            <type name="GtkContainer*" c:type="GtkContainer*"/>
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
         </parameters>
       </callback>
@@ -11855,10 +11868,10 @@
         </return-value>
         <parameters>
           <parameter name="container">
-            <type name="GtkContainer*" c:type="GtkContainer*"/>
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
           <parameter name="child">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -11868,19 +11881,19 @@
         </return-value>
         <parameters>
           <parameter name="container">
-            <type name="GtkContainer*" c:type="GtkContainer*"/>
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
           <parameter name="child">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="property_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
           <parameter name="pspec">
-            <type name="GParamSpec*" c:type="GParamSpec*"/>
+            <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
           </parameter>
         </parameters>
       </callback>
@@ -11890,19 +11903,19 @@
         </return-value>
         <parameters>
           <parameter name="container">
-            <type name="GtkContainer*" c:type="GtkContainer*"/>
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
           <parameter name="child">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="property_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
           <parameter name="pspec">
-            <type name="GParamSpec*" c:type="GParamSpec*"/>
+            <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
           </parameter>
         </parameters>
       </callback>
@@ -11932,7 +11945,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -11942,7 +11955,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -11957,7 +11970,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -11972,17 +11985,17 @@
           <type name="GtkContainerClass" c:type="GtkContainerClass*"/>
         </parameter>
         <parameter name="property_id">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="pspec">
-          <type name="GParamSpec" c:type="GParamSpec*"/>
+          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
     <function name="container_class_find_child_property"
               c:identifier="gtk_container_class_find_child_property">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="cclass">
@@ -11996,14 +12009,14 @@
     <function name="container_class_list_child_properties"
               c:identifier="gtk_container_class_list_child_properties">
       <return-value>
-        <type name="GParamSpec**" c:type="GParamSpec**"/>
+        <type name="GObject.GParamSpec" c:type="GParamSpec**"/>
       </return-value>
       <parameters>
         <parameter name="cclass">
           <type name="GObjectClass" c:type="GObjectClass*"/>
         </parameter>
         <parameter name="n_properties">
-          <type name="guint" c:type="guint*"/>
+          <type name="GLib.guint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
@@ -12057,14 +12070,14 @@
     <function name="container_focus_sort"
               c:identifier="_gtk_container_focus_sort">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="container">
           <type name="Container" c:type="GtkContainer*"/>
         </parameter>
         <parameter name="children">
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </parameter>
         <parameter name="direction">
           <type name="DirectionType" c:type="GtkDirectionType"/>
@@ -12548,7 +12561,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="geometry">
-            <type name="GdkGeometry" c:type="GdkGeometry*"/>
+            <type name="Gdk.GdkGeometry" c:type="GdkGeometry*"/>
           </parameter>
           <parameter name="geom_mask">
             <type name="GdkWindowHints" c:type="GdkWindowHints"/>
@@ -12655,16 +12668,16 @@
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="left">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="top">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="right">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="bottom">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -12723,13 +12736,13 @@
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="list">
-            <type name="GList" c:type="GList*"/>
+            <type name="GLib.GList" c:type="GList*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_icon_list" c:identifier="gtk_window_get_icon_list">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -12776,7 +12789,7 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="err">
-            <type name="GError" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
@@ -12832,7 +12845,7 @@
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="keyval">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="target">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -12848,7 +12861,7 @@
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="keyval">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="target">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -12865,7 +12878,7 @@
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="keyval">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="modifier">
             <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -12906,7 +12919,7 @@
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventKey" c:type="GdkEventKey*"/>
+            <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
           </parameter>
         </parameters>
       </method>
@@ -12920,7 +12933,7 @@
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventKey" c:type="GdkEventKey*"/>
+            <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
           </parameter>
         </parameters>
       </method>
@@ -13148,10 +13161,10 @@
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -13180,10 +13193,10 @@
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="width" direction="out">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height" direction="out">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -13212,10 +13225,10 @@
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="root_x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="root_y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -13234,7 +13247,7 @@
       </method>
       <method name="get_group" c:identifier="gtk_window_get_group">
         <return-value>
-          <type name="GtkWindowGroup" c:type="GtkWindowGroup*"/>
+          <type name="WindowGroup" c:type="GtkWindowGroup*"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13263,7 +13276,7 @@
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="xid">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -13277,12 +13290,12 @@
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="xid">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
       <property name="type">
-        <type name="GtkWindowType" c:type="GtkWindowType"/>
+        <type name="WindowType" c:type="GtkWindowType"/>
       </property>
       <property name="title">
         <type name="string" c:type="gchararray"/>
@@ -13306,7 +13319,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="window-position">
-        <type name="GtkWindowPosition" c:type="GtkWindowPosition"/>
+        <type name="WindowPosition" c:type="GtkWindowPosition"/>
       </property>
       <property name="default-width">
         <type name="int32" c:type="gint"/>
@@ -13324,7 +13337,7 @@
         <type name="string" c:type="gchararray"/>
       </property>
       <property name="screen">
-        <type name="GdkScreen" c:type="GdkScreen"/>
+        <type name="Gdk.Screen" c:type="GdkScreen"/>
       </property>
       <property name="type-hint">
         <type name="GdkWindowTypeHint" c:type="GdkWindowTypeHint"/>
@@ -13354,7 +13367,7 @@
         <type name="GdkGravity" c:type="GdkGravity"/>
       </property>
       <property name="transient-for">
-        <type name="GtkWindow" c:type="GtkWindow"/>
+        <type name="Window" c:type="GtkWindow"/>
       </property>
       <property name="opacity">
         <type name="double" c:type="gdouble"/>
@@ -13371,10 +13384,10 @@
         </return-value>
         <parameters>
           <parameter name="window">
-            <type name="GtkWindow*" c:type="GtkWindow*"/>
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="focus">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -13384,10 +13397,10 @@
         </return-value>
         <parameters>
           <parameter name="window">
-            <type name="GtkWindow*" c:type="GtkWindow*"/>
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
       </callback>
@@ -13397,7 +13410,7 @@
         </return-value>
         <parameters>
           <parameter name="window">
-            <type name="GtkWindow*" c:type="GtkWindow*"/>
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </callback>
@@ -13407,7 +13420,7 @@
         </return-value>
         <parameters>
           <parameter name="window">
-            <type name="GtkWindow*" c:type="GtkWindow*"/>
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </callback>
@@ -13417,10 +13430,10 @@
         </return-value>
         <parameters>
           <parameter name="window">
-            <type name="GtkWindow*" c:type="GtkWindow*"/>
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="direction">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </callback>
@@ -13430,7 +13443,7 @@
         </return-value>
         <parameters>
           <parameter name="window">
-            <type name="GtkWindow*" c:type="GtkWindow*"/>
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </callback>
@@ -13460,7 +13473,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -13470,7 +13483,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -13492,7 +13505,7 @@
     </class>
     <function name="window_new" c:identifier="gtk_window_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="type">
@@ -13507,14 +13520,14 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="window_get_default_icon_list"
               c:identifier="gtk_window_get_default_icon_list">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </return-value>
     </function>
     <function name="window_set_default_icon"
@@ -13549,7 +13562,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="err">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -13567,12 +13580,12 @@
     <function name="window_list_toplevels"
               c:identifier="gtk_window_list_toplevels">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </return-value>
     </function>
     <class name="WindowGroup"
            c:type="GtkWindowGroup"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkWindowGroup"
            glib:get-type="gtk_window_group_get_type">
       <constructor name="new" c:identifier="gtk_window_group_new">
@@ -13674,17 +13687,17 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="new_width">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="new_height">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
     <function name="window_group_get_current_grab"
               c:identifier="_gtk_window_group_get_current_grab">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="window_group">
@@ -13740,10 +13753,10 @@
       </return-value>
       <parameters>
         <parameter name="window">
-          <type name="GtkWindow*" c:type="GtkWindow*"/>
+          <type name="Window" c:type="GtkWindow*"/>
         </parameter>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="modifiers">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -13784,7 +13797,7 @@
           <type name="Window" c:type="GtkWindow*"/>
         </parameter>
         <parameter name="accel_key">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="accel_mods">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -13939,7 +13952,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="new_order">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -13975,7 +13988,7 @@
         </return-value>
         <parameters>
           <parameter name="dialog">
-            <type name="GtkDialog*" c:type="GtkDialog*"/>
+            <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
           <parameter name="response_id">
             <type name="int32" c:type="gint"/>
@@ -13988,7 +14001,7 @@
         </return-value>
         <parameters>
           <parameter name="dialog">
-            <type name="GtkDialog*" c:type="GtkDialog*"/>
+            <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
         </parameters>
       </callback>
@@ -14030,13 +14043,13 @@
     </class>
     <function name="dialog_new" c:identifier="gtk_dialog_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="dialog_new_with_buttons"
               c:identifier="gtk_dialog_new_with_buttons">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="title" allow-none="1">
@@ -14300,7 +14313,7 @@
       </method>
       <method name="get_authors" c:identifier="gtk_about_dialog_get_authors">
         <return-value>
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14317,14 +14330,14 @@
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
           <parameter name="authors">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_documenters"
               c:identifier="gtk_about_dialog_get_documenters">
         <return-value>
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14342,13 +14355,13 @@
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
           <parameter name="documenters">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_artists" c:identifier="gtk_about_dialog_get_artists">
         <return-value>
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -14365,7 +14378,7 @@
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
           <parameter name="artists">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
         </parameters>
       </method>
@@ -14507,7 +14520,7 @@
     </class>
     <function name="about_dialog_new" c:identifier="gtk_about_dialog_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="show_about_dialog" c:identifier="gtk_show_about_dialog">
@@ -14529,7 +14542,7 @@
       </return-value>
       <parameters>
         <parameter name="about">
-          <type name="GtkAboutDialog*" c:type="GtkAboutDialog*"/>
+          <type name="AboutDialog" c:type="GtkAboutDialog*"/>
         </parameter>
         <parameter name="link_">
           <type name="string" c:type="gchar*"/>
@@ -14554,7 +14567,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -14573,7 +14586,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -14607,10 +14620,10 @@
             <type name="Misc" c:type="GtkMisc*"/>
           </parameter>
           <parameter name="xalign">
-            <type name="gfloat" c:type="gfloat*"/>
+            <type name="GLib.gfloat" c:type="gfloat*"/>
           </parameter>
           <parameter name="yalign">
-            <type name="gfloat" c:type="gfloat*"/>
+            <type name="GLib.gfloat" c:type="gfloat*"/>
           </parameter>
         </parameters>
       </method>
@@ -14639,10 +14652,10 @@
             <type name="Misc" c:type="GtkMisc*"/>
           </parameter>
           <parameter name="xpad">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="ypad">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -14807,7 +14820,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <field name="submenu_placement">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <callback name="deactivate">
         <return-value>
@@ -14815,7 +14828,7 @@
         </return-value>
         <parameters>
           <parameter name="menu_shell">
-            <type name="GtkMenuShell*" c:type="GtkMenuShell*"/>
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
         </parameters>
       </callback>
@@ -14825,7 +14838,7 @@
         </return-value>
         <parameters>
           <parameter name="menu_shell">
-            <type name="GtkMenuShell*" c:type="GtkMenuShell*"/>
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
         </parameters>
       </callback>
@@ -14835,10 +14848,10 @@
         </return-value>
         <parameters>
           <parameter name="menu_shell">
-            <type name="GtkMenuShell*" c:type="GtkMenuShell*"/>
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
           <parameter name="direction">
-            <type name="GtkMenuDirectionType" c:type="GtkMenuDirectionType"/>
+            <type name="MenuDirectionType" c:type="GtkMenuDirectionType"/>
           </parameter>
         </parameters>
       </callback>
@@ -14848,7 +14861,7 @@
         </return-value>
         <parameters>
           <parameter name="menu_shell">
-            <type name="GtkMenuShell*" c:type="GtkMenuShell*"/>
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
           <parameter name="force_hide">
             <type name="boolean" c:type="gboolean"/>
@@ -14861,7 +14874,7 @@
         </return-value>
         <parameters>
           <parameter name="menu_shell">
-            <type name="GtkMenuShell*" c:type="GtkMenuShell*"/>
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
         </parameters>
       </callback>
@@ -14871,10 +14884,10 @@
         </return-value>
         <parameters>
           <parameter name="menu_shell">
-            <type name="GtkMenuShell*" c:type="GtkMenuShell*"/>
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
           <parameter name="menu_item">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -14884,10 +14897,10 @@
         </return-value>
         <parameters>
           <parameter name="menu_shell">
-            <type name="GtkMenuShell*" c:type="GtkMenuShell*"/>
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
           <parameter name="child">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="position">
             <type name="int32" c:type="gint"/>
@@ -14900,7 +14913,7 @@
         </return-value>
         <parameters>
           <parameter name="menu_shell">
-            <type name="GtkMenuShell*" c:type="GtkMenuShell*"/>
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
         </parameters>
       </callback>
@@ -14910,7 +14923,7 @@
         </return-value>
         <parameters>
           <parameter name="menu_shell">
-            <type name="GtkMenuShell*" c:type="GtkMenuShell*"/>
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
           <parameter name="distance">
             <type name="int32" c:type="gint"/>
@@ -14943,7 +14956,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkMenuDirectionType" c:type="GtkMenuDirectionType"/>
+            <type name="MenuDirectionType" c:type="GtkMenuDirectionType"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -14968,7 +14981,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -15029,7 +15042,7 @@
           <type name="MenuShell" c:type="GtkMenuShell*"/>
         </parameter>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="target">
           <type name="Widget" c:type="GtkWidget*"/>
@@ -15046,7 +15059,7 @@
           <type name="MenuShell" c:type="GtkMenuShell*"/>
         </parameter>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="target">
           <type name="Widget" c:type="GtkWidget*"/>
@@ -15059,16 +15072,16 @@
       </return-value>
       <parameters>
         <parameter name="menu">
-          <type name="GtkMenu*" c:type="GtkMenu*"/>
+          <type name="Menu" c:type="GtkMenu*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint*" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="y">
-          <type name="gint*" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="push_in">
-          <type name="gboolean*" c:type="gboolean*"/>
+          <type name="GLib.gboolean" c:type="gboolean*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -15081,10 +15094,10 @@
       </return-value>
       <parameters>
         <parameter name="attach_widget">
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="menu">
-          <type name="GtkMenu*" c:type="GtkMenu*"/>
+          <type name="Menu" c:type="GtkMenu*"/>
         </parameter>
       </parameters>
     </callback>
@@ -15114,7 +15127,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="button">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="activate_time">
             <type name="uint32" c:type="guint32"/>
@@ -15160,7 +15173,7 @@
             <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
           <parameter name="index_">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -15326,16 +15339,16 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="left_attach">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="right_attach">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="top_attach">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="bottom_attach">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -15384,20 +15397,20 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
       </glib:signal>
     </class>
     <function name="menu_new" c:identifier="gtk_menu_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="menu_get_for_attach_widget"
               c:identifier="gtk_menu_get_for_attach_widget">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="widget">
@@ -15558,7 +15571,7 @@
       <method name="get_mnemonic_keyval"
               c:identifier="gtk_label_get_mnemonic_keyval">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15832,10 +15845,10 @@
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="start">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="end">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -15859,10 +15872,10 @@
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -15900,13 +15913,13 @@
             <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="str">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
         </parameters>
       </method>
       <method name="parse_uline" c:identifier="gtk_label_parse_uline">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="label">
@@ -15930,7 +15943,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="justify">
-        <type name="GtkJustification" c:type="GtkJustification"/>
+        <type name="Justification" c:type="GtkJustification"/>
       </property>
       <property name="pattern">
         <type name="string" c:type="gchararray"/>
@@ -15945,10 +15958,10 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="mnemonic-keyval">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="mnemonic-widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
+        <type name="Widget" c:type="GtkWidget"/>
       </property>
       <property name="cursor-position">
         <type name="int32" c:type="gint"/>
@@ -15977,10 +15990,10 @@
         </return-value>
         <parameters>
           <parameter name="label">
-            <type name="GtkLabel*" c:type="GtkLabel*"/>
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="step">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="count">
             <type name="int32" c:type="gint"/>
@@ -15996,7 +16009,7 @@
         </return-value>
         <parameters>
           <parameter name="label">
-            <type name="GtkLabel*" c:type="GtkLabel*"/>
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </callback>
@@ -16006,10 +16019,10 @@
         </return-value>
         <parameters>
           <parameter name="label">
-            <type name="GtkLabel*" c:type="GtkLabel*"/>
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
           <parameter name="menu">
-            <type name="GtkMenu*" c:type="GtkMenu*"/>
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
         </parameters>
       </callback>
@@ -16039,7 +16052,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="p0">
             <type name="int32" c:type="gint"/>
@@ -16060,14 +16073,14 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkMenu" c:type="GtkMenu"/>
+            <type name="Menu" c:type="GtkMenu"/>
           </parameter>
         </parameters>
       </glib:signal>
     </class>
     <function name="label_new" c:identifier="gtk_label_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="str">
@@ -16078,7 +16091,7 @@
     <function name="label_new_with_mnemonic"
               c:identifier="gtk_label_new_with_mnemonic">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="str">
@@ -16105,7 +16118,7 @@
       <method name="get_accel_width"
               c:identifier="gtk_accel_label_get_accel_width">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="accel_label">
@@ -16137,7 +16150,7 @@
             <type name="AccelLabel" c:type="GtkAccelLabel*"/>
           </parameter>
           <parameter name="accel_closure">
-            <type name="GClosure" c:type="GClosure*"/>
+            <type name="GObject.GClosure" c:type="GClosure*"/>
           </parameter>
         </parameters>
       </method>
@@ -16152,10 +16165,10 @@
         </parameters>
       </method>
       <property name="accel-closure">
-        <type name="GClosure" c:type="GClosure"/>
+        <type name="GObject.GClosure" c:type="GClosure"/>
       </property>
       <property name="accel-widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
+        <type name="Widget" c:type="GtkWidget"/>
       </property>
       <field name="signal_quote1">
         <type name="string" c:type="gchar*"/>
@@ -16179,7 +16192,7 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="latin1_to_char">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <callback name="_gtk_reserved1">
         <return-value>
@@ -16204,7 +16217,7 @@
     </class>
     <function name="accel_label_new" c:identifier="gtk_accel_label_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -16222,7 +16235,7 @@
           <type name="GtkAccelLabelClass" c:type="GtkAccelLabelClass*"/>
         </parameter>
         <parameter name="accelerator_key">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="accelerator_mods">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -16241,7 +16254,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="accel_key">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="accel_mods">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -16261,7 +16274,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="accel_key">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="accel_mods">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -16292,7 +16305,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="accel_key">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="accel_mods">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -16352,7 +16365,7 @@
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="GLib.GScanner" c:type="GScanner*"/>
         </parameter>
       </parameters>
     </function>
@@ -16415,7 +16428,7 @@
     </function>
     <class name="AccelMap"
            c:type="GtkAccelMap"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkAccelMap"
            glib:get-type="gtk_accel_map_get_type">
       <constructor name="get" c:identifier="gtk_accel_map_get">
@@ -16432,7 +16445,7 @@
             <type name="string" c:type="gchararray"/>
           </parameter>
           <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="p1">
             <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -16506,7 +16519,7 @@
         </return-value>
         <parameters>
           <parameter name="accessible">
-            <type name="GtkAccessible*" c:type="GtkAccessible*"/>
+            <type name="Accessible" c:type="GtkAccessible*"/>
           </parameter>
         </parameters>
       </callback>
@@ -16534,7 +16547,7 @@
     <record name="GtkActionPrivate" c:type="GtkActionPrivate"/>
     <class name="Action"
            c:type="GtkAction"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkAction"
            glib:get-type="gtk_action_get_type">
       <constructor name="new" c:identifier="gtk_action_new">
@@ -16730,7 +16743,7 @@
       </method>
       <method name="get_proxies" c:identifier="gtk_action_get_proxies">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16773,7 +16786,7 @@
       <method name="get_accel_closure"
               c:identifier="gtk_action_get_accel_closure">
         <return-value>
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -16875,7 +16888,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="action-group">
-        <type name="GtkActionGroup" c:type="GtkActionGroup"/>
+        <type name="ActionGroup" c:type="GtkActionGroup"/>
       </property>
       <callback name="activate">
         <return-value>
@@ -16883,33 +16896,33 @@
         </return-value>
         <parameters>
           <parameter name="action">
-            <type name="GtkAction*" c:type="GtkAction*"/>
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </callback>
       <field name="menu_item_type">
-        <type name="GType" c:type="GType"/>
+        <type name="GObject.GType" c:type="GType"/>
       </field>
       <field name="toolbar_item_type">
-        <type name="GType" c:type="GType"/>
+        <type name="GObject.GType" c:type="GType"/>
       </field>
       <callback name="create_menu_item">
         <return-value>
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
           <parameter name="action">
-            <type name="GtkAction*" c:type="GtkAction*"/>
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="create_tool_item">
         <return-value>
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
           <parameter name="action">
-            <type name="GtkAction*" c:type="GtkAction*"/>
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </callback>
@@ -16919,10 +16932,10 @@
         </return-value>
         <parameters>
           <parameter name="action">
-            <type name="GtkAction*" c:type="GtkAction*"/>
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
           <parameter name="proxy">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -16932,20 +16945,20 @@
         </return-value>
         <parameters>
           <parameter name="action">
-            <type name="GtkAction*" c:type="GtkAction*"/>
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
           <parameter name="proxy">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="create_menu">
         <return-value>
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
           <parameter name="action">
-            <type name="GtkAction*" c:type="GtkAction*"/>
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </callback>
@@ -17060,10 +17073,10 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="callback_action">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="widget">
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </callback>
@@ -17078,7 +17091,7 @@
         <type name="GtkItemFactoryCallback" c:type="GtkItemFactoryCallback"/>
       </field>
       <field name="callback_action">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="item_type">
         <type name="string" c:type="gchar*"/>
@@ -17092,7 +17105,7 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="widgets">
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </field>
     </record>
     <class name="ItemFactory"
@@ -17106,7 +17119,7 @@
         </return-value>
         <parameters>
           <parameter name="container_type">
-            <type name="GType" c:type="GType"/>
+            <type name="GObject.GType" c:type="GType"/>
           </parameter>
           <parameter name="path">
             <type name="string" c:type="gchar*"/>
@@ -17146,7 +17159,7 @@
             <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
           <parameter name="container_type">
-            <type name="GType" c:type="GType"/>
+            <type name="GObject.GType" c:type="GType"/>
           </parameter>
           <parameter name="path">
             <type name="string" c:type="gchar*"/>
@@ -17192,7 +17205,7 @@
             <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
           <parameter name="action">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -17206,7 +17219,7 @@
             <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
           <parameter name="action">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -17225,7 +17238,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="callback_type">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -17238,7 +17251,7 @@
             <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
           <parameter name="n_entries">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="entries">
             <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
@@ -17284,7 +17297,7 @@
             <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
           <parameter name="n_entries">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="entries">
             <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
@@ -17300,13 +17313,13 @@
             <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
           <parameter name="x">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="y">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="mouse_button">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="time_">
             <type name="uint32" c:type="guint32"/>
@@ -17329,13 +17342,13 @@
             <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
           <parameter name="x">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="y">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="mouse_button">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="time_">
             <type name="uint32" c:type="guint32"/>
@@ -17382,7 +17395,7 @@
             <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
           <parameter name="n_entries">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="entries">
             <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
@@ -17391,12 +17404,12 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="callback_type">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
       <field name="item_ht">
-        <type name="GHashTable*" c:type="GHashTable*"/>
+        <type name="GHashTable" c:type="GHashTable*"/>
       </field>
       <callback name="_gtk_reserved1">
         <return-value>
@@ -17435,7 +17448,7 @@
           <type name="AccelGroup" c:type="GtkAccelGroup*"/>
         </parameter>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="modifiers">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -17470,7 +17483,7 @@
       </return-value>
       <parameters>
         <parameter name="widget">
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -17484,13 +17497,13 @@
       </return-value>
       <parameters>
         <parameter name="widget">
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <type name="Widget" 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"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </callback>
@@ -17501,7 +17514,7 @@
       </return-value>
       <parameters>
         <parameter name="n_entries">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="entries">
           <type name="GtkMenuEntry" c:type="GtkMenuEntry*"/>
@@ -17540,7 +17553,7 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="callback">
-        <type name="GCallback" c:type="GCallback"/>
+        <type name="GObject.GCallback" c:type="GCallback"/>
       </field>
     </record>
     <record name="GtkToggleActionEntry" c:type="GtkToggleActionEntry">
@@ -17560,7 +17573,7 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="callback">
-        <type name="GCallback" c:type="GCallback"/>
+        <type name="GObject.GCallback" c:type="GCallback"/>
       </field>
       <field name="is_active">
         <type name="boolean" c:type="gboolean"/>
@@ -17588,7 +17601,7 @@
     </record>
     <class name="ActionGroup"
            c:type="GtkActionGroup"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkActionGroup"
            glib:get-type="gtk_action_group_get_type">
       <constructor name="new" c:identifier="gtk_action_group_new">
@@ -17661,7 +17674,7 @@
       </method>
       <method name="list_actions" c:identifier="gtk_action_group_list_actions">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
@@ -17725,7 +17738,7 @@
             <type name="GtkActionEntry" c:type="GtkActionEntry*"/>
           </parameter>
           <parameter name="n_entries">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
@@ -17745,7 +17758,7 @@
             <type name="GtkToggleActionEntry" c:type="GtkToggleActionEntry*"/>
           </parameter>
           <parameter name="n_entries">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
@@ -17765,13 +17778,13 @@
             <type name="GtkRadioActionEntry" c:type="GtkRadioActionEntry*"/>
           </parameter>
           <parameter name="n_entries">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="value">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="on_change">
-            <type name="GCallback" c:type="GCallback"/>
+            <type name="GObject.GCallback" c:type="GCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
@@ -17791,13 +17804,13 @@
             <type name="GtkActionEntry" c:type="GtkActionEntry*"/>
           </parameter>
           <parameter name="n_entries">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
@@ -17814,13 +17827,13 @@
             <type name="GtkToggleActionEntry" c:type="GtkToggleActionEntry*"/>
           </parameter>
           <parameter name="n_entries">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
@@ -17837,19 +17850,19 @@
             <type name="GtkRadioActionEntry" c:type="GtkRadioActionEntry*"/>
           </parameter>
           <parameter name="n_entries">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="value">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="on_change">
-            <type name="GCallback" c:type="GCallback"/>
+            <type name="GObject.GCallback" c:type="GCallback"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
@@ -17912,11 +17925,11 @@
       </property>
       <callback name="get_action">
         <return-value>
-          <type name="GtkAction*" c:type="GtkAction*"/>
+          <type name="Action" c:type="GtkAction*"/>
         </return-value>
         <parameters>
           <parameter name="action_group">
-            <type name="GtkActionGroup*" c:type="GtkActionGroup*"/>
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
           <parameter name="action_name">
             <type name="string" c:type="gchar*"/>
@@ -17949,10 +17962,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkAction" c:type="GtkAction"/>
+            <type name="Action" c:type="GtkAction"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -17962,10 +17975,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkAction" c:type="GtkAction"/>
+            <type name="Action" c:type="GtkAction"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -17975,7 +17988,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkAction" c:type="GtkAction"/>
+            <type name="Action" c:type="GtkAction"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -17985,7 +17998,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkAction" c:type="GtkAction"/>
+            <type name="Action" c:type="GtkAction"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -18089,16 +18102,16 @@
             <type name="Alignment" c:type="GtkAlignment*"/>
           </parameter>
           <parameter name="padding_top">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="padding_bottom">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="padding_left">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="padding_right">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -18111,16 +18124,16 @@
             <type name="Alignment" c:type="GtkAlignment*"/>
           </parameter>
           <parameter name="padding_top">
-            <type name="guint" c:type="guint*"/>
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
           <parameter name="padding_bottom">
-            <type name="guint" c:type="guint*"/>
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
           <parameter name="padding_left">
-            <type name="guint" c:type="guint*"/>
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
           <parameter name="padding_right">
-            <type name="guint" c:type="guint*"/>
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
         </parameters>
       </method>
@@ -18137,21 +18150,21 @@
         <type name="float" c:type="gfloat"/>
       </property>
       <property name="top-padding">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="bottom-padding">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="left-padding">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="right-padding">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
     </class>
     <function name="alignment_new" c:identifier="gtk_alignment_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="xalign">
@@ -18190,15 +18203,15 @@
         </parameters>
       </method>
       <property name="arrow-type">
-        <type name="GtkArrowType" c:type="GtkArrowType"/>
+        <type name="ArrowType" c:type="GtkArrowType"/>
       </property>
       <property name="shadow-type">
-        <type name="GtkShadowType" c:type="GtkShadowType"/>
+        <type name="ShadowType" c:type="GtkShadowType"/>
       </property>
     </class>
     <function name="arrow_new" c:identifier="gtk_arrow_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="arrow_type">
@@ -18287,10 +18300,10 @@
             <type name="Frame" c:type="GtkFrame*"/>
           </parameter>
           <parameter name="xalign">
-            <type name="gfloat" c:type="gfloat*"/>
+            <type name="GLib.gfloat" c:type="gfloat*"/>
           </parameter>
           <parameter name="yalign">
-            <type name="gfloat" c:type="gfloat*"/>
+            <type name="GLib.gfloat" c:type="gfloat*"/>
           </parameter>
         </parameters>
       </method>
@@ -18327,13 +18340,13 @@
         <type name="float" c:type="gfloat"/>
       </property>
       <property name="shadow">
-        <type name="GtkShadowType" c:type="GtkShadowType"/>
+        <type name="ShadowType" c:type="GtkShadowType"/>
       </property>
       <property name="shadow-type">
-        <type name="GtkShadowType" c:type="GtkShadowType"/>
+        <type name="ShadowType" c:type="GtkShadowType"/>
       </property>
       <property name="label-widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
+        <type name="Widget" c:type="GtkWidget"/>
       </property>
       <callback name="compute_child_allocation">
         <return-value>
@@ -18341,17 +18354,17 @@
         </return-value>
         <parameters>
           <parameter name="frame">
-            <type name="GtkFrame*" c:type="GtkFrame*"/>
+            <type name="Frame" c:type="GtkFrame*"/>
           </parameter>
           <parameter name="allocation">
-            <type name="GtkAllocation*" c:type="GtkAllocation*"/>
+            <type name="GtkAllocation" c:type="GtkAllocation*"/>
           </parameter>
         </parameters>
       </callback>
     </class>
     <function name="frame_new" c:identifier="gtk_frame_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -18401,7 +18414,7 @@
     </class>
     <function name="aspect_frame_new" c:identifier="gtk_aspect_frame_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -18546,7 +18559,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
@@ -18748,10 +18761,10 @@
         </return-value>
         <parameters>
           <parameter name="assistant">
-            <type name="GtkAssistant*" c:type="GtkAssistant*"/>
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
           <parameter name="page">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -18761,7 +18774,7 @@
         </return-value>
         <parameters>
           <parameter name="assistant">
-            <type name="GtkAssistant*" c:type="GtkAssistant*"/>
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
         </parameters>
       </callback>
@@ -18771,7 +18784,7 @@
         </return-value>
         <parameters>
           <parameter name="assistant">
-            <type name="GtkAssistant*" c:type="GtkAssistant*"/>
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
         </parameters>
       </callback>
@@ -18781,7 +18794,7 @@
         </return-value>
         <parameters>
           <parameter name="assistant">
-            <type name="GtkAssistant*" c:type="GtkAssistant*"/>
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
         </parameters>
       </callback>
@@ -18826,7 +18839,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -18838,27 +18851,27 @@
     </class>
     <function name="assistant_new" c:identifier="gtk_assistant_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <record name="GtkBoxChild" c:type="GtkBoxChild">
       <field name="widget">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </field>
       <field name="padding">
         <type name="uint16" c:type="guint16"/>
       </field>
       <field name="expand">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="fill">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="pack">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="is_secondary">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <class name="Box"
@@ -18884,7 +18897,7 @@
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="padding">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -18906,7 +18919,7 @@
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="padding">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -19013,13 +19026,13 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="expand">
-            <type name="gboolean" c:type="gboolean*"/>
+            <type name="GLib.gboolean" c:type="gboolean*"/>
           </parameter>
           <parameter name="fill">
-            <type name="gboolean" c:type="gboolean*"/>
+            <type name="GLib.gboolean" c:type="gboolean*"/>
           </parameter>
           <parameter name="padding">
-            <type name="guint" c:type="guint*"/>
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
           <parameter name="pack_type">
             <type name="PackType" c:type="GtkPackType*"/>
@@ -19045,7 +19058,7 @@
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="padding">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="pack_type">
             <type name="PackType" c:type="GtkPackType"/>
@@ -19162,10 +19175,10 @@
             <type name="ButtonBox" c:type="GtkButtonBox*"/>
           </parameter>
           <parameter name="min_width">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="min_height">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -19179,15 +19192,15 @@
             <type name="ButtonBox" c:type="GtkButtonBox*"/>
           </parameter>
           <parameter name="ipad_x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="ipad_y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
       <property name="layout-style">
-        <type name="GtkButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
+        <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
       </property>
     </class>
     <function name="button_box_child_requisition"
@@ -19221,70 +19234,70 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="widget_path_pspecs">
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </field>
       <field name="widget_class_pspecs">
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </field>
       <field name="class_branch_pspecs">
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </field>
       <field name="entries">
-        <type name="GtkBindingEntry*" c:type="GtkBindingEntry*"/>
+        <type name="GtkBindingEntry" c:type="GtkBindingEntry*"/>
       </field>
       <field name="current">
-        <type name="GtkBindingEntry*" c:type="GtkBindingEntry*"/>
+        <type name="GtkBindingEntry" c:type="GtkBindingEntry*"/>
       </field>
       <field name="parsed">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <record name="GtkBindingEntry" c:type="GtkBindingEntry">
       <field name="keyval">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="modifiers">
         <type name="GdkModifierType" c:type="GdkModifierType"/>
       </field>
       <field name="binding_set">
-        <type name="GtkBindingSet*" c:type="GtkBindingSet*"/>
+        <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
       </field>
       <field name="destroyed">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="in_emission">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="marks_unbound">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="set_next">
-        <type name="GtkBindingEntry*" c:type="GtkBindingEntry*"/>
+        <type name="GtkBindingEntry" c:type="GtkBindingEntry*"/>
       </field>
       <field name="hash_next">
-        <type name="GtkBindingEntry*" c:type="GtkBindingEntry*"/>
+        <type name="GtkBindingEntry" c:type="GtkBindingEntry*"/>
       </field>
       <field name="signals">
-        <type name="GtkBindingSignal*" c:type="GtkBindingSignal*"/>
+        <type name="GtkBindingSignal" c:type="GtkBindingSignal*"/>
       </field>
     </record>
     <record name="GtkBindingSignal" c:type="GtkBindingSignal">
       <field name="next">
-        <type name="GtkBindingSignal*" c:type="GtkBindingSignal*"/>
+        <type name="GtkBindingSignal" c:type="GtkBindingSignal*"/>
       </field>
       <field name="signal_name">
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="n_args">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="args">
-        <type name="GtkBindingArg*" c:type="GtkBindingArg*"/>
+        <type name="GtkBindingArg" c:type="GtkBindingArg*"/>
       </field>
     </record>
     <record name="GtkBindingArg" c:type="GtkBindingArg">
       <field name="arg_type">
-        <type name="GType" c:type="GType"/>
+        <type name="GObject.GType" c:type="GType"/>
       </field>
       <field name="d">
         <type name="???" c:type="???"/>
@@ -19292,7 +19305,7 @@
     </record>
     <function name="binding_set_new" c:identifier="gtk_binding_set_new">
       <return-value>
-        <type name="GtkBindingSet*" c:type="GtkBindingSet*"/>
+        <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
       </return-value>
       <parameters>
         <parameter name="set_name">
@@ -19303,7 +19316,7 @@
     <function name="binding_set_by_class"
               c:identifier="gtk_binding_set_by_class">
       <return-value>
-        <type name="GtkBindingSet*" c:type="GtkBindingSet*"/>
+        <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
       </return-value>
       <parameters>
         <parameter name="object_class">
@@ -19313,7 +19326,7 @@
     </function>
     <function name="binding_set_find" c:identifier="gtk_binding_set_find">
       <return-value>
-        <type name="GtkBindingSet*" c:type="GtkBindingSet*"/>
+        <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
       </return-value>
       <parameters>
         <parameter name="set_name">
@@ -19330,7 +19343,7 @@
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="modifiers">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -19347,7 +19360,7 @@
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="event">
-          <type name="GdkEventKey" c:type="GdkEventKey*"/>
+          <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
         </parameter>
       </parameters>
     </function>
@@ -19361,7 +19374,7 @@
           <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
         </parameter>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="modifiers">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -19381,7 +19394,7 @@
           <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
         </parameter>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="modifiers">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -19398,7 +19411,7 @@
           <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
         </parameter>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="modifiers">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -19407,18 +19420,18 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="binding_args">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="binding_parse_binding"
               c:identifier="gtk_binding_parse_binding">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner" c:type="GScanner*"/>
+          <type name="GLib.GScanner" c:type="GScanner*"/>
         </parameter>
       </parameters>
     </function>
@@ -19431,7 +19444,7 @@
           <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
         </parameter>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="modifiers">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -19448,7 +19461,7 @@
           <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
         </parameter>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="modifiers">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -19457,7 +19470,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="n_args">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -19471,7 +19484,7 @@
           <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
         </parameter>
         <parameter name="keyval">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="modifiers">
           <type name="GdkModifierType" c:type="GdkModifierType"/>
@@ -19506,35 +19519,35 @@
     </function>
     <function name="binding_signal_new" c:identifier="_gtk_binding_signal_new">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="signal_name">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="itype">
-          <type name="GType" c:type="GType"/>
+          <type name="GObject.GType" c:type="GType"/>
         </parameter>
         <parameter name="signal_flags">
           <type name="GSignalFlags" c:type="GSignalFlags"/>
         </parameter>
         <parameter name="handler">
-          <type name="GCallback" c:type="GCallback"/>
+          <type name="GObject.GCallback" c:type="GCallback"/>
         </parameter>
         <parameter name="accumulator">
-          <type name="GSignalAccumulator" c:type="GSignalAccumulator"/>
+          <type name="GObject.GSignalAccumulator" c:type="GSignalAccumulator"/>
         </parameter>
         <parameter name="accu_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="c_marshaller">
-          <type name="GSignalCMarshaller" c:type="GSignalCMarshaller"/>
+          <type name="GObject.GSignalCMarshaller" c:type="GSignalCMarshaller"/>
         </parameter>
         <parameter name="return_type">
-          <type name="GType" c:type="GType"/>
+          <type name="GObject.GType" c:type="GType"/>
         </parameter>
         <parameter name="n_params">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -19542,7 +19555,7 @@
     <function name="builder_error_quark"
               c:identifier="gtk_builder_error_quark">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="GLib.GQuark" c:type="GQuark"/>
       </return-value>
     </function>
     <callback name="GtkBuilderConnectFunc">
@@ -19551,10 +19564,10 @@
       </return-value>
       <parameters>
         <parameter name="builder">
-          <type name="GtkBuilder*" c:type="GtkBuilder*"/>
+          <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
         <parameter name="object">
-          <type name="GObject*" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="signal_name">
           <type name="string" c:type="gchar*"/>
@@ -19563,7 +19576,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="connect_object">
-          <type name="GObject*" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="flags">
           <type name="GConnectFlags" c:type="GConnectFlags"/>
@@ -19575,7 +19588,7 @@
     </callback>
     <class name="Builder"
            c:type="GtkBuilder"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkBuilder"
            glib:get-type="gtk_builder_get_type">
       <constructor name="new" c:identifier="gtk_builder_new">
@@ -19585,7 +19598,7 @@
       </constructor>
       <method name="add_from_file" c:identifier="gtk_builder_add_from_file">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="builder">
@@ -19595,14 +19608,14 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
       <method name="add_from_string"
               c:identifier="gtk_builder_add_from_string">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="builder">
@@ -19615,13 +19628,13 @@
             <type name="size" c:type="gsize"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_object" c:identifier="gtk_builder_get_object">
         <return-value>
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </return-value>
         <parameters>
           <parameter name="builder">
@@ -19634,7 +19647,7 @@
       </method>
       <method name="get_objects" c:identifier="gtk_builder_get_objects">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
           <parameter name="builder">
@@ -19701,7 +19714,7 @@
       <method name="get_type_from_name"
               c:identifier="gtk_builder_get_type_from_name">
         <return-value>
-          <type name="GType" c:type="GType"/>
+          <type name="GObject.GType" c:type="GType"/>
         </return-value>
         <parameters>
           <parameter name="builder">
@@ -19722,16 +19735,16 @@
             <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="pspec">
-            <type name="GParamSpec" c:type="GParamSpec*"/>
+            <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
           </parameter>
           <parameter name="string">
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
@@ -19745,16 +19758,16 @@
             <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="type">
-            <type name="GType" c:type="GType"/>
+            <type name="GObject.GType" c:type="GType"/>
           </parameter>
           <parameter name="string">
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
@@ -19763,11 +19776,11 @@
       </property>
       <callback name="get_type_from_name">
         <return-value>
-          <type name="GType" c:type="GType"/>
+          <type name="GObject.GType" c:type="GType"/>
         </return-value>
         <parameters>
           <parameter name="builder">
-            <type name="GtkBuilder*" c:type="GtkBuilder*"/>
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="type_name">
             <type name="string" c:type="char*"/>
@@ -19826,7 +19839,7 @@
         </return-value>
         <parameters>
           <parameter name="buildable">
-            <type name="GtkBuildable*" c:type="GtkBuildable*"/>
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
           <parameter name="name">
             <type name="string" c:type="gchar*"/>
@@ -19839,7 +19852,7 @@
         </return-value>
         <parameters>
           <parameter name="buildable">
-            <type name="GtkBuildable*" c:type="GtkBuildable*"/>
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -19849,13 +19862,13 @@
         </return-value>
         <parameters>
           <parameter name="buildable">
-            <type name="GtkBuildable*" c:type="GtkBuildable*"/>
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
           <parameter name="builder">
-            <type name="GtkBuilder*" c:type="GtkBuilder*"/>
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="child">
-            <type name="GObject*" c:type="GObject*"/>
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
           <parameter name="type">
             <type name="string" c:type="gchar*"/>
@@ -19868,29 +19881,29 @@
         </return-value>
         <parameters>
           <parameter name="buildable">
-            <type name="GtkBuildable*" c:type="GtkBuildable*"/>
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
           <parameter name="builder">
-            <type name="GtkBuilder*" c:type="GtkBuilder*"/>
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="name">
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="construct_child">
         <return-value>
-          <type name="GObject*" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </return-value>
         <parameters>
           <parameter name="buildable">
-            <type name="GtkBuildable*" c:type="GtkBuildable*"/>
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
           <parameter name="builder">
-            <type name="GtkBuilder*" c:type="GtkBuilder*"/>
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="name">
             <type name="string" c:type="gchar*"/>
@@ -19903,22 +19916,22 @@
         </return-value>
         <parameters>
           <parameter name="buildable">
-            <type name="GtkBuildable*" c:type="GtkBuildable*"/>
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
           <parameter name="builder">
-            <type name="GtkBuilder*" c:type="GtkBuilder*"/>
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="child">
-            <type name="GObject*" c:type="GObject*"/>
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
           <parameter name="tagname">
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="parser">
-            <type name="GMarkupParser*" c:type="GMarkupParser*"/>
+            <type name="GLib.GMarkupParser" c:type="GMarkupParser*"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer*" c:type="gpointer*"/>
+            <type name="gpointer" c:type="gpointer*"/>
           </parameter>
         </parameters>
       </callback>
@@ -19928,19 +19941,19 @@
         </return-value>
         <parameters>
           <parameter name="buildable">
-            <type name="GtkBuildable*" c:type="GtkBuildable*"/>
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
           <parameter name="builder">
-            <type name="GtkBuilder*" c:type="GtkBuilder*"/>
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="child">
-            <type name="GObject*" c:type="GObject*"/>
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
           <parameter name="tagname">
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer*" c:type="gpointer*"/>
+            <type name="gpointer" c:type="gpointer*"/>
           </parameter>
         </parameters>
       </callback>
@@ -19950,13 +19963,13 @@
         </return-value>
         <parameters>
           <parameter name="buildable">
-            <type name="GtkBuildable*" c:type="GtkBuildable*"/>
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
           <parameter name="builder">
-            <type name="GtkBuilder*" c:type="GtkBuilder*"/>
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="child">
-            <type name="GObject*" c:type="GObject*"/>
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
           <parameter name="tagname">
             <type name="string" c:type="gchar*"/>
@@ -19972,23 +19985,23 @@
         </return-value>
         <parameters>
           <parameter name="buildable">
-            <type name="GtkBuildable*" c:type="GtkBuildable*"/>
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
           <parameter name="builder">
-            <type name="GtkBuilder*" c:type="GtkBuilder*"/>
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_internal_child">
         <return-value>
-          <type name="GObject*" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </return-value>
         <parameters>
           <parameter name="buildable">
-            <type name="GtkBuildable*" c:type="GtkBuildable*"/>
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
           <parameter name="builder">
-            <type name="GtkBuilder*" c:type="GtkBuilder*"/>
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
           <parameter name="childname">
             <type name="string" c:type="gchar*"/>
@@ -20032,7 +20045,7 @@
           <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
         <parameter name="child">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="type">
           <type name="string" c:type="gchar*"/>
@@ -20055,14 +20068,14 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
     <function name="buildable_construct_child"
               c:identifier="gtk_buildable_construct_child">
       <return-value>
-        <type name="GObject*" c:type="GObject*"/>
+        <type name="GObject.Object" c:type="GObject*"/>
       </return-value>
       <parameters>
         <parameter name="buildable">
@@ -20089,13 +20102,13 @@
           <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
         <parameter name="child">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="tagname">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="parser">
-          <type name="GMarkupParser" c:type="GMarkupParser*"/>
+          <type name="GLib.GMarkupParser" c:type="GMarkupParser*"/>
         </parameter>
         <parameter name="data">
           <type name="gpointer" c:type="gpointer*"/>
@@ -20115,7 +20128,7 @@
           <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
         <parameter name="child">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="tagname">
           <type name="string" c:type="gchar*"/>
@@ -20138,7 +20151,7 @@
           <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
         <parameter name="child">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="tagname">
           <type name="string" c:type="gchar*"/>
@@ -20165,7 +20178,7 @@
     <function name="buildable_get_internal_child"
               c:identifier="gtk_buildable_get_internal_child">
       <return-value>
-        <type name="GObject*" c:type="GObject*"/>
+        <type name="GObject.Object" c:type="GObject*"/>
       </return-value>
       <parameters>
         <parameter name="buildable">
@@ -20181,17 +20194,17 @@
     </function>
     <record name="GtkImagePixmapData" c:type="GtkImagePixmapData">
       <field name="pixmap">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
       </field>
     </record>
     <record name="GtkImageImageData" c:type="GtkImageImageData">
       <field name="image">
-        <type name="GdkImage*" c:type="GdkImage*"/>
+        <type name="Gdk.Image" c:type="GdkImage*"/>
       </field>
     </record>
     <record name="GtkImagePixbufData" c:type="GtkImagePixbufData">
       <field name="pixbuf">
-        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+        <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
       </field>
     </record>
     <record name="GtkImageStockData" c:type="GtkImageStockData">
@@ -20201,18 +20214,18 @@
     </record>
     <record name="GtkImageIconSetData" c:type="GtkImageIconSetData">
       <field name="icon_set">
-        <type name="GtkIconSet*" c:type="GtkIconSet*"/>
+        <type name="IconSet" c:type="GtkIconSet*"/>
       </field>
     </record>
     <record name="GtkImageAnimationData" c:type="GtkImageAnimationData">
       <field name="anim">
-        <type name="GdkPixbufAnimation*" c:type="GdkPixbufAnimation*"/>
+        <type name="GdkPixbufAnimation" c:type="GdkPixbufAnimation*"/>
       </field>
       <field name="iter">
-        <type name="GdkPixbufAnimationIter*" c:type="GdkPixbufAnimationIter*"/>
+        <type name="GdkPixbufAnimationIter" c:type="GdkPixbufAnimationIter*"/>
       </field>
       <field name="frame_timeout">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <record name="GtkImageIconNameData" c:type="GtkImageIconNameData">
@@ -20220,10 +20233,10 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="pixbuf">
-        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+        <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
       </field>
       <field name="theme_change_id">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <class name="Image"
@@ -20253,7 +20266,7 @@
             <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
           </parameter>
           <parameter name="mask" allow-none="1">
-            <type name="GdkBitmap" c:type="GdkBitmap*"/>
+            <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
           </parameter>
         </parameters>
       </method>
@@ -20269,7 +20282,7 @@
             <type name="Gdk.Image" c:type="GdkImage*"/>
           </parameter>
           <parameter name="mask" allow-none="1">
-            <type name="GdkBitmap" c:type="GdkBitmap*"/>
+            <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
           </parameter>
         </parameters>
       </method>
@@ -20325,7 +20338,7 @@
             <type name="Image" c:type="GtkImage*"/>
           </parameter>
           <parameter name="icon_set">
-            <type name="GtkIconSet" c:type="GtkIconSet*"/>
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
           <parameter name="size">
             <type name="IconSize" c:type="GtkIconSize"/>
@@ -20399,7 +20412,7 @@
             <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
           </parameter>
           <parameter name="mask">
-            <type name="GdkBitmap" c:type="GdkBitmap**"/>
+            <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
           </parameter>
         </parameters>
       </method>
@@ -20415,7 +20428,7 @@
             <type name="Gdk.Image" c:type="GdkImage**"/>
           </parameter>
           <parameter name="mask">
-            <type name="GdkBitmap" c:type="GdkBitmap**"/>
+            <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
           </parameter>
         </parameters>
       </method>
@@ -20438,7 +20451,7 @@
             <type name="Image" c:type="GtkImage*"/>
           </parameter>
           <parameter name="stock_id">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
           <parameter name="size">
             <type name="IconSize" c:type="GtkIconSize*"/>
@@ -20454,7 +20467,7 @@
             <type name="Image" c:type="GtkImage*"/>
           </parameter>
           <parameter name="icon_set">
-            <type name="GtkIconSet" c:type="GtkIconSet**"/>
+            <type name="IconSet" c:type="GtkIconSet**"/>
           </parameter>
           <parameter name="size">
             <type name="IconSize" c:type="GtkIconSize*"/>
@@ -20480,7 +20493,7 @@
             <type name="Image" c:type="GtkImage*"/>
           </parameter>
           <parameter name="icon_name">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
           <parameter name="size">
             <type name="IconSize" c:type="GtkIconSize*"/>
@@ -20509,7 +20522,7 @@
             <type name="Gdk.Image" c:type="GdkImage*"/>
           </parameter>
           <parameter name="mask">
-            <type name="GdkBitmap" c:type="GdkBitmap*"/>
+            <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
           </parameter>
         </parameters>
       </method>
@@ -20525,7 +20538,7 @@
             <type name="Gdk.Image" c:type="GdkImage**"/>
           </parameter>
           <parameter name="mask">
-            <type name="GdkBitmap" c:type="GdkBitmap**"/>
+            <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
           </parameter>
         </parameters>
       </method>
@@ -20533,13 +20546,13 @@
         <type name="GdkPixbuf" c:type="GdkPixbuf"/>
       </property>
       <property name="pixmap">
-        <type name="GdkPixmap" c:type="GdkPixmap"/>
+        <type name="Gdk.Pixmap" c:type="GdkPixmap"/>
       </property>
       <property name="image">
-        <type name="GdkImage" c:type="GdkImage"/>
+        <type name="Gdk.Image" c:type="GdkImage"/>
       </property>
       <property name="mask">
-        <type name="GdkPixmap" c:type="GdkPixmap"/>
+        <type name="Gdk.Pixmap" c:type="GdkPixmap"/>
       </property>
       <property name="file">
         <type name="string" c:type="gchararray"/>
@@ -20548,7 +20561,7 @@
         <type name="string" c:type="gchararray"/>
       </property>
       <property name="icon-set">
-        <type name="GtkIconSet" c:type="GtkIconSet"/>
+        <type name="IconSet" c:type="GtkIconSet"/>
       </property>
       <property name="icon-size">
         <type name="int32" c:type="gint"/>
@@ -20563,7 +20576,7 @@
         <type name="string" c:type="gchararray"/>
       </property>
       <property name="storage-type">
-        <type name="GtkImageType" c:type="GtkImageType"/>
+        <type name="ImageType" c:type="GtkImageType"/>
       </property>
       <callback name="_gtk_reserved1">
         <return-value>
@@ -20588,41 +20601,41 @@
     </class>
     <function name="image_new" c:identifier="gtk_image_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="image_new_from_pixmap"
               c:identifier="gtk_image_new_from_pixmap">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="pixmap" allow-none="1">
           <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
         <parameter name="mask" allow-none="1">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
       </parameters>
     </function>
     <function name="image_new_from_image"
               c:identifier="gtk_image_new_from_image">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="image" allow-none="1">
           <type name="Gdk.Image" c:type="GdkImage*"/>
         </parameter>
         <parameter name="mask" allow-none="1">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
       </parameters>
     </function>
     <function name="image_new_from_file"
               c:identifier="gtk_image_new_from_file">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="filename">
@@ -20633,7 +20646,7 @@
     <function name="image_new_from_pixbuf"
               c:identifier="gtk_image_new_from_pixbuf">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="pixbuf" allow-none="1">
@@ -20644,7 +20657,7 @@
     <function name="image_new_from_stock"
               c:identifier="gtk_image_new_from_stock">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="stock_id">
@@ -20658,11 +20671,11 @@
     <function name="image_new_from_icon_set"
               c:identifier="gtk_image_new_from_icon_set">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="icon_set">
-          <type name="GtkIconSet" c:type="GtkIconSet*"/>
+          <type name="IconSet" c:type="GtkIconSet*"/>
         </parameter>
         <parameter name="size">
           <type name="IconSize" c:type="GtkIconSize"/>
@@ -20672,7 +20685,7 @@
     <function name="image_new_from_animation"
               c:identifier="gtk_image_new_from_animation">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="animation">
@@ -20683,7 +20696,7 @@
     <function name="image_new_from_icon_name"
               c:identifier="gtk_image_new_from_icon_name">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="icon_name">
@@ -20893,10 +20906,10 @@
             <type name="Button" c:type="GtkButton*"/>
           </parameter>
           <parameter name="xalign">
-            <type name="gfloat" c:type="gfloat*"/>
+            <type name="GLib.gfloat" c:type="gfloat*"/>
           </parameter>
           <parameter name="yalign">
-            <type name="gfloat" c:type="gfloat*"/>
+            <type name="GLib.gfloat" c:type="gfloat*"/>
           </parameter>
         </parameters>
       </method>
@@ -20952,10 +20965,10 @@
         <type name="string" c:type="gchararray"/>
       </property>
       <property name="image">
-        <type name="GtkWidget" c:type="GtkWidget"/>
+        <type name="Widget" c:type="GtkWidget"/>
       </property>
       <property name="relief">
-        <type name="GtkReliefStyle" c:type="GtkReliefStyle"/>
+        <type name="ReliefStyle" c:type="GtkReliefStyle"/>
       </property>
       <property name="use-underline">
         <type name="boolean" c:type="gboolean"/>
@@ -20973,7 +20986,7 @@
         <type name="float" c:type="gfloat"/>
       </property>
       <property name="image-position">
-        <type name="GtkPositionType" c:type="GtkPositionType"/>
+        <type name="PositionType" c:type="GtkPositionType"/>
       </property>
       <callback name="pressed">
         <return-value>
@@ -20981,7 +20994,7 @@
         </return-value>
         <parameters>
           <parameter name="button">
-            <type name="GtkButton*" c:type="GtkButton*"/>
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -20991,7 +21004,7 @@
         </return-value>
         <parameters>
           <parameter name="button">
-            <type name="GtkButton*" c:type="GtkButton*"/>
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -21001,7 +21014,7 @@
         </return-value>
         <parameters>
           <parameter name="button">
-            <type name="GtkButton*" c:type="GtkButton*"/>
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -21011,7 +21024,7 @@
         </return-value>
         <parameters>
           <parameter name="button">
-            <type name="GtkButton*" c:type="GtkButton*"/>
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -21021,7 +21034,7 @@
         </return-value>
         <parameters>
           <parameter name="button">
-            <type name="GtkButton*" c:type="GtkButton*"/>
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -21031,7 +21044,7 @@
         </return-value>
         <parameters>
           <parameter name="button">
-            <type name="GtkButton*" c:type="GtkButton*"/>
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -21088,13 +21101,13 @@
     </class>
     <function name="button_new" c:identifier="gtk_button_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="button_new_with_label"
               c:identifier="gtk_button_new_with_label">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -21105,7 +21118,7 @@
     <function name="button_new_from_stock"
               c:identifier="gtk_button_new_from_stock">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="stock_id">
@@ -21116,7 +21129,7 @@
     <function name="button_new_with_mnemonic"
               c:identifier="gtk_button_new_with_mnemonic">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -21170,16 +21183,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21196,16 +21209,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21222,16 +21235,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21248,16 +21261,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21274,16 +21287,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21300,16 +21313,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21325,16 +21338,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21351,16 +21364,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21377,16 +21390,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21403,16 +21416,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21429,16 +21442,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21455,16 +21468,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21481,16 +21494,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21507,16 +21520,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21533,16 +21546,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21559,16 +21572,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21585,16 +21598,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21611,16 +21624,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21637,16 +21650,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21663,16 +21676,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21689,16 +21702,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21715,16 +21728,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21741,16 +21754,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21767,16 +21780,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21793,16 +21806,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21819,16 +21832,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure" c:type="GClosure*"/>
+          <type name="GObject.GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -21840,7 +21853,7 @@
     </function>
     <function name="signal_newv" c:identifier="gtk_signal_newv">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -21853,7 +21866,7 @@
           <type name="GtkType" c:type="GtkType"/>
         </parameter>
         <parameter name="function_offset">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="marshaller">
           <type name="GtkSignalMarshaller" c:type="GtkSignalMarshaller"/>
@@ -21862,7 +21875,7 @@
           <type name="GtkType" c:type="GtkType"/>
         </parameter>
         <parameter name="n_args">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="args">
           <type name="GtkType" c:type="GtkType*"/>
@@ -21871,7 +21884,7 @@
     </function>
     <function name="signal_new" c:identifier="gtk_signal_new">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -21884,7 +21897,7 @@
           <type name="GtkType" c:type="GtkType"/>
         </parameter>
         <parameter name="function_offset">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="marshaller">
           <type name="GtkSignalMarshaller" c:type="GtkSignalMarshaller"/>
@@ -21893,7 +21906,7 @@
           <type name="GtkType" c:type="GtkType"/>
         </parameter>
         <parameter name="n_args">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -21995,7 +22008,7 @@
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="signal_id">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="args">
           <type name="GtkArg" c:type="GtkArg*"/>
@@ -22011,7 +22024,7 @@
           <type name="GtkObject" c:type="GtkObject*"/>
         </parameter>
         <parameter name="signal_id">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -22065,7 +22078,7 @@
           <type name="GSignalMatchType" c:type="GSignalMatchType"/>
         </parameter>
         <parameter name="action">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -22084,10 +22097,10 @@
             <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
           <parameter name="month">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="year">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -22100,7 +22113,7 @@
             <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
           <parameter name="day">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -22113,7 +22126,7 @@
             <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
           <parameter name="day">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -22126,7 +22139,7 @@
             <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
           <parameter name="day">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -22191,13 +22204,13 @@
             <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
           <parameter name="year">
-            <type name="guint" c:type="guint*"/>
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
           <parameter name="month">
-            <type name="guint" c:type="guint*"/>
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
           <parameter name="day">
-            <type name="guint" c:type="guint*"/>
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
         </parameters>
       </method>
@@ -22248,7 +22261,7 @@
         </return-value>
         <parameters>
           <parameter name="calendar">
-            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
       </callback>
@@ -22258,7 +22271,7 @@
         </return-value>
         <parameters>
           <parameter name="calendar">
-            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
       </callback>
@@ -22268,7 +22281,7 @@
         </return-value>
         <parameters>
           <parameter name="calendar">
-            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
       </callback>
@@ -22278,7 +22291,7 @@
         </return-value>
         <parameters>
           <parameter name="calendar">
-            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
       </callback>
@@ -22288,7 +22301,7 @@
         </return-value>
         <parameters>
           <parameter name="calendar">
-            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
       </callback>
@@ -22298,7 +22311,7 @@
         </return-value>
         <parameters>
           <parameter name="calendar">
-            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
       </callback>
@@ -22308,7 +22321,7 @@
         </return-value>
         <parameters>
           <parameter name="calendar">
-            <type name="GtkCalendar*" c:type="GtkCalendar*"/>
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
       </callback>
@@ -22350,7 +22363,7 @@
     </class>
     <function name="calendar_new" c:identifier="gtk_calendar_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <record name="GtkCellEditable" c:type="GtkCellEditable"/>
@@ -22364,7 +22377,7 @@
         </return-value>
         <parameters>
           <parameter name="cell_editable">
-            <type name="GtkCellEditable*" c:type="GtkCellEditable*"/>
+            <type name="CellEditable" c:type="GtkCellEditable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -22374,7 +22387,7 @@
         </return-value>
         <parameters>
           <parameter name="cell_editable">
-            <type name="GtkCellEditable*" c:type="GtkCellEditable*"/>
+            <type name="CellEditable" c:type="GtkCellEditable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -22384,10 +22397,10 @@
         </return-value>
         <parameters>
           <parameter name="cell_editable">
-            <type name="GtkCellEditable*" c:type="GtkCellEditable*"/>
+            <type name="CellEditable" c:type="GtkCellEditable*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
       </callback>
@@ -22412,7 +22425,7 @@
           <type name="CellEditable" c:type="GtkCellEditable*"/>
         </parameter>
         <parameter name="event">
-          <type name="GdkEvent" c:type="GdkEvent*"/>
+          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
     </function>
@@ -22496,16 +22509,16 @@
             <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="x_offset">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y_offset">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -22546,7 +22559,7 @@
             <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEvent" c:type="GdkEvent*"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -22575,7 +22588,7 @@
             <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEvent" c:type="GdkEvent*"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -22621,10 +22634,10 @@
             <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -22654,7 +22667,7 @@
         </parameters>
       </method>
       <property name="mode">
-        <type name="GtkCellRendererMode" c:type="GtkCellRendererMode"/>
+        <type name="CellRendererMode" c:type="GtkCellRendererMode"/>
       </property>
       <property name="visible">
         <type name="boolean" c:type="gboolean"/>
@@ -22669,10 +22682,10 @@
         <type name="float" c:type="gfloat"/>
       </property>
       <property name="xpad">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="ypad">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="width">
         <type name="int32" c:type="gint"/>
@@ -22701,25 +22714,25 @@
         </return-value>
         <parameters>
           <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="cell_area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="x_offset">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y_offset">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -22729,25 +22742,25 @@
         </return-value>
         <parameters>
           <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkDrawable*" c:type="GdkDrawable*"/>
+            <type name="Gdk.Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="background_area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="cell_area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="expose_area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GtkCellRendererState" c:type="GtkCellRendererState"/>
+            <type name="CellRendererState" c:type="GtkCellRendererState"/>
           </parameter>
         </parameters>
       </callback>
@@ -22757,53 +22770,53 @@
         </return-value>
         <parameters>
           <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <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*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="cell_area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GtkCellRendererState" c:type="GtkCellRendererState"/>
+            <type name="CellRendererState" c:type="GtkCellRendererState"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="start_editing">
         <return-value>
-          <type name="GtkCellEditable*" c:type="GtkCellEditable*"/>
+          <type name="CellEditable" c:type="GtkCellEditable*"/>
         </return-value>
         <parameters>
           <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <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*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="cell_area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="flags">
-            <type name="GtkCellRendererState" c:type="GtkCellRendererState"/>
+            <type name="CellRendererState" c:type="GtkCellRendererState"/>
           </parameter>
         </parameters>
       </callback>
@@ -22813,7 +22826,7 @@
         </return-value>
         <parameters>
           <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
       </callback>
@@ -22823,10 +22836,10 @@
         </return-value>
         <parameters>
           <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
           <parameter name="editable">
-            <type name="GtkCellEditable*" c:type="GtkCellEditable*"/>
+            <type name="CellEditable" c:type="GtkCellEditable*"/>
           </parameter>
           <parameter name="path">
             <type name="string" c:type="gchar*"/>
@@ -22854,7 +22867,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkCellEditable" c:type="GtkCellEditable"/>
+            <type name="CellEditable" c:type="GtkCellEditable"/>
           </parameter>
           <parameter name="p0">
             <type name="string" c:type="gchararray"/>
@@ -22869,13 +22882,13 @@
       </return-value>
       <parameters>
         <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
         <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -22884,13 +22897,13 @@
     </callback>
     <function name="tree_path_new" c:identifier="gtk_tree_path_new">
       <return-value>
-        <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+        <type name="TreePath" 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*"/>
+        <type name="TreePath" c:type="GtkTreePath*"/>
       </return-value>
       <parameters>
         <parameter name="path">
@@ -22901,7 +22914,7 @@
     <function name="tree_path_new_from_indices"
               c:identifier="gtk_tree_path_new_from_indices">
       <return-value>
-        <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+        <type name="TreePath" c:type="GtkTreePath*"/>
       </return-value>
       <parameters>
         <parameter name="first_index">
@@ -22916,14 +22929,14 @@
       </return-value>
       <parameters>
         <parameter name="path">
-          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+          <type name="TreePath" 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*"/>
+        <type name="TreePath" c:type="GtkTreePath*"/>
       </return-value>
     </function>
     <function name="tree_path_append_index"
@@ -22933,7 +22946,7 @@
       </return-value>
       <parameters>
         <parameter name="path">
-          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
         <parameter name="index_">
           <type name="int32" c:type="gint"/>
@@ -22947,7 +22960,7 @@
       </return-value>
       <parameters>
         <parameter name="path">
-          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
         <parameter name="index_">
           <type name="int32" c:type="gint"/>
@@ -22961,18 +22974,18 @@
       </return-value>
       <parameters>
         <parameter name="path">
-          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+          <type name="TreePath" 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*"/>
+        <type name="GLib.gint" c:type="gint*"/>
       </return-value>
       <parameters>
         <parameter name="path">
-          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
       </parameters>
     </function>
@@ -22982,17 +22995,17 @@
       </return-value>
       <parameters>
         <parameter name="path">
-          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+          <type name="TreePath" 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*"/>
+        <type name="TreePath" c:type="GtkTreePath*"/>
       </return-value>
       <parameters>
         <parameter name="path">
-          <type name="GtkTreePath" c:type="GtkTreePath*"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
       </parameters>
     </function>
@@ -23090,7 +23103,7 @@
         </return-value>
         <parameters>
           <parameter name="model">
-            <type name="GtkTreeModel" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="path">
             <type name="TreePath" c:type="GtkTreePath*"/>
@@ -23104,10 +23117,10 @@
         </return-value>
         <parameters>
           <parameter name="proxy">
-            <type name="GLib.Object" c:type="GObject*"/>
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
           <parameter name="model">
-            <type name="GtkTreeModel" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="path">
             <type name="TreePath" c:type="GtkTreePath*"/>
@@ -23136,7 +23149,7 @@
       </method>
       <method name="get_model" c:identifier="gtk_tree_row_reference_get_model">
         <return-value>
-          <type name="GtkTreeModel" c:type="GtkTreeModel*"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </return-value>
         <parameters>
           <parameter name="reference">
@@ -23172,7 +23185,7 @@
       </return-value>
       <parameters>
         <parameter name="proxy">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="path">
           <type name="TreePath" c:type="GtkTreePath*"/>
@@ -23186,7 +23199,7 @@
       </return-value>
       <parameters>
         <parameter name="proxy">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="path">
           <type name="TreePath" c:type="GtkTreePath*"/>
@@ -23200,26 +23213,26 @@
       </return-value>
       <parameters>
         <parameter name="proxy">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="path">
           <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
         <parameter name="iter">
-          <type name="GtkTreeIter" c:type="GtkTreeIter*"/>
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
         <parameter name="new_order">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.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*"/>
+        <type name="TreeIter" c:type="GtkTreeIter*"/>
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GtkTreeIter" c:type="GtkTreeIter*"/>
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
@@ -23229,7 +23242,7 @@
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GtkTreeIter" c:type="GtkTreeIter*"/>
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
@@ -23248,13 +23261,13 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -23264,13 +23277,13 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -23280,13 +23293,13 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -23296,10 +23309,10 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </callback>
@@ -23309,26 +23322,26 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="new_order">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_flags">
         <return-value>
-          <type name="GtkTreeModelFlags" c:type="GtkTreeModelFlags"/>
+          <type name="TreeModelFlags" c:type="GtkTreeModelFlags"/>
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
         </parameters>
       </callback>
@@ -23338,17 +23351,17 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_column_type">
         <return-value>
-          <type name="GType" c:type="GType"/>
+          <type name="GObject.GType" c:type="GType"/>
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="index_">
             <type name="int32" c:type="gint"/>
@@ -23361,26 +23374,26 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_path">
         <return-value>
-          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -23390,16 +23403,16 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <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*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -23409,10 +23422,10 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -23422,13 +23435,13 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="parent">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -23438,10 +23451,10 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -23451,10 +23464,10 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -23464,13 +23477,13 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="parent">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="n">
             <type name="int32" c:type="gint"/>
@@ -23483,13 +23496,13 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="child">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -23499,10 +23512,10 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -23512,10 +23525,10 @@
         </return-value>
         <parameters>
           <parameter name="tree_model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -23525,10 +23538,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+            <type name="TreeIter" c:type="GtkTreeIter"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -23538,10 +23551,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+            <type name="TreeIter" c:type="GtkTreeIter"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -23551,10 +23564,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+            <type name="TreeIter" c:type="GtkTreeIter"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -23564,7 +23577,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -23574,10 +23587,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+            <type name="TreeIter" c:type="GtkTreeIter"/>
           </parameter>
           <parameter name="p1">
             <type name="any" c:type="gpointer"/>
@@ -23588,7 +23601,7 @@
     <function name="tree_model_get_flags"
               c:identifier="gtk_tree_model_get_flags">
       <return-value>
-        <type name="GtkTreeModelFlags" c:type="GtkTreeModelFlags"/>
+        <type name="TreeModelFlags" c:type="GtkTreeModelFlags"/>
       </return-value>
       <parameters>
         <parameter name="tree_model">
@@ -23610,7 +23623,7 @@
     <function name="tree_model_get_column_type"
               c:identifier="gtk_tree_model_get_column_type">
       <return-value>
-        <type name="GType" c:type="GType"/>
+        <type name="GObject.GType" c:type="GType"/>
       </return-value>
       <parameters>
         <parameter name="tree_model">
@@ -23686,7 +23699,7 @@
     <function name="tree_model_get_path"
               c:identifier="gtk_tree_model_get_path">
       <return-value>
-        <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+        <type name="TreePath" c:type="GtkTreePath*"/>
       </return-value>
       <parameters>
         <parameter name="tree_model">
@@ -23713,7 +23726,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="value">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -23969,7 +23982,7 @@
           <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
         <parameter name="new_order">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -23980,13 +23993,13 @@
       </return-value>
       <parameters>
         <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
         <parameter name="a">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
         <parameter name="b">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -24003,7 +24016,7 @@
         </return-value>
         <parameters>
           <parameter name="sortable">
-            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
+            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -24013,13 +24026,13 @@
         </return-value>
         <parameters>
           <parameter name="sortable">
-            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
+            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
           </parameter>
           <parameter name="sort_column_id">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="order">
-            <type name="GtkSortType*" c:type="GtkSortType*"/>
+            <type name="SortType" c:type="GtkSortType*"/>
           </parameter>
         </parameters>
       </callback>
@@ -24029,13 +24042,13 @@
         </return-value>
         <parameters>
           <parameter name="sortable">
-            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
+            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
           </parameter>
           <parameter name="sort_column_id">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="order">
-            <type name="GtkSortType" c:type="GtkSortType"/>
+            <type name="SortType" c:type="GtkSortType"/>
           </parameter>
         </parameters>
       </callback>
@@ -24045,7 +24058,7 @@
         </return-value>
         <parameters>
           <parameter name="sortable">
-            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
+            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
           </parameter>
           <parameter name="sort_column_id">
             <type name="int32" c:type="gint"/>
@@ -24068,7 +24081,7 @@
         </return-value>
         <parameters>
           <parameter name="sortable">
-            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
+            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
           </parameter>
           <parameter name="func">
             <type name="GtkTreeIterCompareFunc"
@@ -24088,7 +24101,7 @@
         </return-value>
         <parameters>
           <parameter name="sortable">
-            <type name="GtkTreeSortable*" c:type="GtkTreeSortable*"/>
+            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -24119,7 +24132,7 @@
           <type name="TreeSortable" c:type="GtkTreeSortable*"/>
         </parameter>
         <parameter name="sort_column_id">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="order">
           <type name="SortType" c:type="GtkSortType*"/>
@@ -24203,16 +24216,16 @@
       </return-value>
       <parameters>
         <parameter name="tree_column">
-          <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </parameter>
         <parameter name="cell">
-          <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
         </parameter>
         <parameter name="tree_model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
         <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -24288,7 +24301,7 @@
       <method name="get_cell_renderers"
               c:identifier="gtk_tree_view_column_get_cell_renderers">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="tree_column">
@@ -24816,16 +24829,16 @@
             <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="x_offset">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y_offset">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -24866,10 +24879,10 @@
             <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
           <parameter name="start_pos">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -24908,7 +24921,7 @@
         <type name="int32" c:type="gint"/>
       </property>
       <property name="sizing">
-        <type name="GtkTreeViewColumnSizing" c:type="GtkTreeViewColumnSizing"/>
+        <type name="TreeViewColumnSizing" c:type="GtkTreeViewColumnSizing"/>
       </property>
       <property name="fixed-width">
         <type name="int32" c:type="gint"/>
@@ -24929,7 +24942,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
+        <type name="Widget" c:type="GtkWidget"/>
       </property>
       <property name="alignment">
         <type name="float" c:type="gfloat"/>
@@ -24941,7 +24954,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="sort-order">
-        <type name="GtkSortType" c:type="GtkSortType"/>
+        <type name="SortType" c:type="GtkSortType"/>
       </property>
       <callback name="clicked">
         <return-value>
@@ -24949,7 +24962,7 @@
         </return-value>
         <parameters>
           <parameter name="tree_column">
-            <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </callback>
@@ -24986,16 +24999,16 @@
       </return-value>
       <parameters>
         <parameter name="cell_layout">
-          <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
         </parameter>
         <parameter name="cell">
-          <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
         </parameter>
         <parameter name="tree_model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
         <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -25012,10 +25025,10 @@
         </return-value>
         <parameters>
           <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
           <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
           <parameter name="expand">
             <type name="boolean" c:type="gboolean"/>
@@ -25028,10 +25041,10 @@
         </return-value>
         <parameters>
           <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
           <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
           <parameter name="expand">
             <type name="boolean" c:type="gboolean"/>
@@ -25044,7 +25057,7 @@
         </return-value>
         <parameters>
           <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
         </parameters>
       </callback>
@@ -25054,10 +25067,10 @@
         </return-value>
         <parameters>
           <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
           <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
           <parameter name="attribute">
             <type name="string" c:type="gchar*"/>
@@ -25073,10 +25086,10 @@
         </return-value>
         <parameters>
           <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
           <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
           <parameter name="func">
             <type name="GtkCellLayoutDataFunc" c:type="GtkCellLayoutDataFunc"/>
@@ -25085,7 +25098,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </callback>
@@ -25095,10 +25108,10 @@
         </return-value>
         <parameters>
           <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
           <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
       </callback>
@@ -25108,10 +25121,10 @@
         </return-value>
         <parameters>
           <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
           <parameter name="cell">
-            <type name="GtkCellRenderer*" c:type="GtkCellRenderer*"/>
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
           <parameter name="position">
             <type name="int32" c:type="gint"/>
@@ -25120,11 +25133,11 @@
       </callback>
       <callback name="get_cells">
         <return-value>
-          <type name="GList*" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="cell_layout">
-            <type name="GtkCellLayout*" c:type="GtkCellLayout*"/>
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
         </parameters>
       </callback>
@@ -25166,7 +25179,7 @@
     <function name="cell_layout_get_cells"
               c:identifier="gtk_cell_layout_get_cells">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="cell_layout">
@@ -25237,7 +25250,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -25285,13 +25298,13 @@
           <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
         <parameter name="child">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="tagname">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="parser">
-          <type name="GMarkupParser" c:type="GMarkupParser*"/>
+          <type name="GLib.GMarkupParser" c:type="GMarkupParser*"/>
         </parameter>
         <parameter name="data">
           <type name="gpointer" c:type="gpointer*"/>
@@ -25311,7 +25324,7 @@
           <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
         <parameter name="child">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="tagname">
           <type name="string" c:type="gchar*"/>
@@ -25334,7 +25347,7 @@
           <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
         <parameter name="child">
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="type">
           <type name="string" c:type="gchar*"/>
@@ -25498,7 +25511,7 @@
         </return-value>
         <parameters>
           <parameter name="cell_renderer_text">
-            <type name="GtkCellRendererText*" c:type="GtkCellRendererText*"/>
+            <type name="CellRendererText" c:type="GtkCellRendererText*"/>
           </parameter>
           <parameter name="path">
             <type name="string" c:type="gchar*"/>
@@ -25548,17 +25561,16 @@
            glib:type-name="GtkCellRendererAccel"
            glib:get-type="gtk_cell_renderer_accel_get_type">
       <property name="accel-key">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="accel-mods">
         <type name="GdkModifierType" c:type="GdkModifierType"/>
       </property>
       <property name="keycode">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="accel-mode">
-        <type name="GtkCellRendererAccelMode"
-              c:type="GtkCellRendererAccelMode"/>
+        <type name="CellRendererAccelMode" c:type="GtkCellRendererAccelMode"/>
       </property>
       <callback name="accel_edited">
         <return-value>
@@ -25566,19 +25578,19 @@
         </return-value>
         <parameters>
           <parameter name="accel">
-            <type name="GtkCellRendererAccel*" c:type="GtkCellRendererAccel*"/>
+            <type name="CellRendererAccel" 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"/>
+            <type name="uint32" 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"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
@@ -25588,7 +25600,7 @@
         </return-value>
         <parameters>
           <parameter name="accel">
-            <type name="GtkCellRendererAccel*" c:type="GtkCellRendererAccel*"/>
+            <type name="CellRendererAccel" c:type="GtkCellRendererAccel*"/>
           </parameter>
           <parameter name="path_string">
             <type name="string" c:type="gchar*"/>
@@ -25629,13 +25641,13 @@
             <type name="string" c:type="gchararray"/>
           </parameter>
           <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="p1">
             <type name="GdkModifierType" c:type="GdkModifierType"/>
           </parameter>
           <parameter name="p2">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -25656,7 +25668,7 @@
            glib:type-name="GtkCellRendererCombo"
            glib:get-type="gtk_cell_renderer_combo_get_type">
       <property name="model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+        <type name="TreeModel" c:type="GtkTreeModel"/>
       </property>
       <property name="text-column">
         <type name="int32" c:type="gint"/>
@@ -25683,7 +25695,7 @@
         <type name="string" c:type="gchararray"/>
       </property>
       <property name="stock-size">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="stock-detail">
         <type name="string" c:type="gchararray"/>
@@ -25738,7 +25750,7 @@
         <type name="float" c:type="gfloat"/>
       </property>
       <property name="orientation">
-        <type name="GtkProgressBarOrientation"
+        <type name="ProgressBarOrientation"
               c:type="GtkProgressBarOrientation"/>
       </property>
       <callback name="_gtk_reserved1">
@@ -25770,13 +25782,13 @@
            glib:type-name="GtkCellRendererSpin"
            glib:get-type="gtk_cell_renderer_spin_get_type">
       <property name="adjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+        <type name="Adjustment" c:type="GtkAdjustment"/>
       </property>
       <property name="climb-rate">
         <type name="double" c:type="gdouble"/>
       </property>
       <property name="digits">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
     </class>
     <class name="CellRendererToggle"
@@ -25855,8 +25867,7 @@
         </return-value>
         <parameters>
           <parameter name="cell_renderer_toggle">
-            <type name="GtkCellRendererToggle*"
-                  c:type="GtkCellRendererToggle*"/>
+            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
           </parameter>
           <parameter name="path">
             <type name="string" c:type="gchar*"/>
@@ -25972,7 +25983,7 @@
       <method name="get_cell_renderers"
               c:identifier="gtk_cell_view_get_cell_renderers">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="cell_view">
@@ -25990,18 +26001,18 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+        <type name="TreeModel" c:type="GtkTreeModel"/>
       </property>
     </class>
     <function name="cell_view_new" c:identifier="gtk_cell_view_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="text">
@@ -26012,7 +26023,7 @@
     <function name="cell_view_new_with_markup"
               c:identifier="gtk_cell_view_new_with_markup">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="markup">
@@ -26023,7 +26034,7 @@
     <function name="cell_view_new_with_pixbuf"
               c:identifier="gtk_cell_view_new_with_pixbuf">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="pixbuf">
@@ -26132,7 +26143,7 @@
         </return-value>
         <parameters>
           <parameter name="toggle_button">
-            <type name="GtkToggleButton*" c:type="GtkToggleButton*"/>
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -26164,13 +26175,13 @@
     </class>
     <function name="toggle_button_new" c:identifier="gtk_toggle_button_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -26181,7 +26192,7 @@
     <function name="toggle_button_new_with_mnemonic"
               c:identifier="gtk_toggle_button_new_with_mnemonic">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -26200,10 +26211,10 @@
         </return-value>
         <parameters>
           <parameter name="check_button">
-            <type name="GtkCheckButton*" c:type="GtkCheckButton*"/>
+            <type name="CheckButton" c:type="GtkCheckButton*"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </callback>
@@ -26230,13 +26241,13 @@
     </class>
     <function name="check_button_new" c:identifier="gtk_check_button_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -26247,7 +26258,7 @@
     <function name="check_button_new_with_mnemonic"
               c:identifier="gtk_check_button_new_with_mnemonic">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -26265,10 +26276,10 @@
           <type name="CheckButton" c:type="GtkCheckButton*"/>
         </parameter>
         <parameter name="indicator_size">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="indicator_spacing">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -26313,7 +26324,7 @@
         </return-value>
         <parameters>
           <parameter name="item">
-            <type name="GtkItem*" c:type="GtkItem*"/>
+            <type name="Item" c:type="GtkItem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -26323,7 +26334,7 @@
         </return-value>
         <parameters>
           <parameter name="item">
-            <type name="GtkItem*" c:type="GtkItem*"/>
+            <type name="Item" c:type="GtkItem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -26333,7 +26344,7 @@
         </return-value>
         <parameters>
           <parameter name="item">
-            <type name="GtkItem*" c:type="GtkItem*"/>
+            <type name="Item" c:type="GtkItem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -26441,7 +26452,7 @@
             <type name="MenuItem" c:type="GtkMenuItem*"/>
           </parameter>
           <parameter name="requisition">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -26510,10 +26521,10 @@
         </parameters>
       </method>
       <property name="submenu">
-        <type name="GtkMenu" c:type="GtkMenu"/>
+        <type name="Menu" c:type="GtkMenu"/>
       </property>
       <field name="hide_on_activate">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <callback name="activate">
         <return-value>
@@ -26521,7 +26532,7 @@
         </return-value>
         <parameters>
           <parameter name="menu_item">
-            <type name="GtkMenuItem*" c:type="GtkMenuItem*"/>
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -26531,7 +26542,7 @@
         </return-value>
         <parameters>
           <parameter name="menu_item">
-            <type name="GtkMenuItem*" c:type="GtkMenuItem*"/>
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -26541,10 +26552,10 @@
         </return-value>
         <parameters>
           <parameter name="menu_item">
-            <type name="GtkMenuItem*" c:type="GtkMenuItem*"/>
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
           </parameter>
           <parameter name="requisition">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -26554,7 +26565,7 @@
         </return-value>
         <parameters>
           <parameter name="menu_item">
-            <type name="GtkMenuItem*" c:type="GtkMenuItem*"/>
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
           </parameter>
           <parameter name="allocation">
             <type name="int32" c:type="gint"/>
@@ -26614,13 +26625,13 @@
     </class>
     <function name="menu_item_new" c:identifier="gtk_menu_item_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -26631,7 +26642,7 @@
     <function name="menu_item_new_with_mnemonic"
               c:identifier="gtk_menu_item_new_with_mnemonic">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -26812,7 +26823,7 @@
         </return-value>
         <parameters>
           <parameter name="check_menu_item">
-            <type name="GtkCheckMenuItem*" c:type="GtkCheckMenuItem*"/>
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -26822,10 +26833,10 @@
         </return-value>
         <parameters>
           <parameter name="check_menu_item">
-            <type name="GtkCheckMenuItem*" c:type="GtkCheckMenuItem*"/>
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </callback>
@@ -26858,13 +26869,13 @@
     <function name="check_menu_item_new"
               c:identifier="gtk_check_menu_item_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -26875,7 +26886,7 @@
     <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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -26885,7 +26896,7 @@
     </function>
     <class name="TextTag"
            c:type="GtkTextTag"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkTextTag"
            glib:get-type="gtk_text_tag_get_type">
       <constructor name="new" c:identifier="gtk_text_tag_new">
@@ -26944,13 +26955,13 @@
             <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
           <parameter name="event_object">
-            <type name="GLib.Object" c:type="GObject*"/>
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEvent" c:type="GdkEvent*"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTextIter" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
@@ -26970,10 +26981,10 @@
         <type name="GdkColor" c:type="GdkColor"/>
       </property>
       <property name="background-stipple">
-        <type name="GdkPixmap" c:type="GdkPixmap"/>
+        <type name="Gdk.Pixmap" c:type="GdkPixmap"/>
       </property>
       <property name="foreground-stipple">
-        <type name="GdkPixmap" c:type="GdkPixmap"/>
+        <type name="Gdk.Pixmap" c:type="GdkPixmap"/>
       </property>
       <property name="font">
         <type name="string" c:type="gchararray"/>
@@ -27018,13 +27029,13 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="wrap-mode">
-        <type name="GtkWrapMode" c:type="GtkWrapMode"/>
+        <type name="WrapMode" c:type="GtkWrapMode"/>
       </property>
       <property name="justification">
-        <type name="GtkJustification" c:type="GtkJustification"/>
+        <type name="Justification" c:type="GtkJustification"/>
       </property>
       <property name="direction">
-        <type name="GtkTextDirection" c:type="GtkTextDirection"/>
+        <type name="TextDirection" c:type="GtkTextDirection"/>
       </property>
       <property name="left-margin">
         <type name="int32" c:type="gint"/>
@@ -27155,16 +27166,16 @@
         </return-value>
         <parameters>
           <parameter name="tag">
-            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
           <parameter name="event_object">
-            <type name="GObject*" c:type="GObject*"/>
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -27194,13 +27205,13 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GObject" c:type="GObject"/>
+            <type name="GObject.Object" c:type="GObject"/>
           </parameter>
           <parameter name="p0">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
           <parameter name="p1">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -27213,10 +27224,10 @@
         <type name="GdkColor" c:type="GdkColor"/>
       </field>
       <field name="bg_stipple">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+        <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
       </field>
       <field name="fg_stipple">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+        <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
       </field>
       <field name="rise">
         <type name="int32" c:type="gint"/>
@@ -27225,47 +27236,47 @@
         <type name="any" c:type="gpointer"/>
       </field>
       <field name="underline">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="strikethrough">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="draw_bg">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="inside_selection">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="is_text">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="pad1">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="pad2">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="pad3">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="pad4">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <function name="text_attributes_new"
               c:identifier="gtk_text_attributes_new">
       <return-value>
-        <type name="GtkTextAttributes*" c:type="GtkTextAttributes*"/>
+        <type name="TextAttributes" 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*"/>
+        <type name="TextAttributes" c:type="GtkTextAttributes*"/>
       </return-value>
       <parameters>
         <parameter name="src">
-          <type name="GtkTextAttributes" c:type="GtkTextAttributes*"/>
+          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
         </parameter>
       </parameters>
     </function>
@@ -27276,10 +27287,10 @@
       </return-value>
       <parameters>
         <parameter name="src">
-          <type name="GtkTextAttributes" c:type="GtkTextAttributes*"/>
+          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
         </parameter>
         <parameter name="dest">
-          <type name="GtkTextAttributes" c:type="GtkTextAttributes*"/>
+          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
         </parameter>
       </parameters>
     </function>
@@ -27290,18 +27301,18 @@
       </return-value>
       <parameters>
         <parameter name="values">
-          <type name="GtkTextAttributes" c:type="GtkTextAttributes*"/>
+          <type name="TextAttributes" 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*"/>
+        <type name="TextAttributes" c:type="GtkTextAttributes*"/>
       </return-value>
       <parameters>
         <parameter name="values">
-          <type name="GtkTextAttributes" c:type="GtkTextAttributes*"/>
+          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
         </parameter>
       </parameters>
     </function>
@@ -27312,7 +27323,7 @@
     </glib:boxed>
     <class name="TextChildAnchor"
            c:type="GtkTextChildAnchor"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkTextChildAnchor"
            glib:get-type="gtk_text_child_anchor_get_type">
       <constructor name="new" c:identifier="gtk_text_child_anchor_new">
@@ -27323,7 +27334,7 @@
       <method name="get_widgets"
               c:identifier="gtk_text_child_anchor_get_widgets">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="anchor">
@@ -27411,21 +27422,21 @@
     <function name="text_iter_get_buffer"
               c:identifier="gtk_text_iter_get_buffer">
       <return-value>
-        <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+        <type name="TextBuffer" c:type="GtkTextBuffer*"/>
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GtkTextIter" c:type="GtkTextIter*"/>
+          <type name="TextIter" 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*"/>
+        <type name="TextIter" c:type="GtkTextIter*"/>
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GtkTextIter" c:type="GtkTextIter*"/>
+          <type name="TextIter" c:type="GtkTextIter*"/>
         </parameter>
       </parameters>
     </function>
@@ -27435,7 +27446,7 @@
       </return-value>
       <parameters>
         <parameter name="iter">
-          <type name="GtkTextIter" c:type="GtkTextIter*"/>
+          <type name="TextIter" c:type="GtkTextIter*"/>
         </parameter>
       </parameters>
     </function>
@@ -27509,7 +27520,7 @@
       </method>
       <method name="get_char" c:identifier="gtk_text_iter_get_char">
         <return-value>
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="GLib.gunichar" c:type="gunichar"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -27583,7 +27594,7 @@
       </method>
       <method name="get_marks" c:identifier="gtk_text_iter_get_marks">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -27605,7 +27616,7 @@
       <method name="get_toggled_tags"
               c:identifier="gtk_text_iter_get_toggled_tags">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -27670,7 +27681,7 @@
       </method>
       <method name="get_tags" c:identifier="gtk_text_iter_get_tags">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -28543,7 +28554,7 @@
       </return-value>
       <parameters>
         <parameter name="ch">
-          <type name="gunichar" c:type="gunichar"/>
+          <type name="GLib.gunichar" c:type="gunichar"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -28555,10 +28566,10 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="flags">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="info">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <record name="GtkTargetPair" c:type="GtkTargetPair">
@@ -28566,32 +28577,32 @@
         <type name="GdkAtom" c:type="GdkAtom"/>
       </field>
       <field name="flags">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="info">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <function name="target_list_new" c:identifier="gtk_target_list_new">
       <return-value>
-        <type name="GtkTargetList*" c:type="GtkTargetList*"/>
+        <type name="TargetList" 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"/>
+          <type name="uint32" 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*"/>
+        <type name="TargetList" c:type="GtkTargetList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
       </parameters>
     </function>
@@ -28601,7 +28612,7 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
       </parameters>
     </function>
@@ -28611,16 +28622,16 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
         <parameter name="target">
           <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="flags">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="info">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -28631,10 +28642,10 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
         <parameter name="info">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -28645,16 +28656,16 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
         <parameter name="info">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="deserializable">
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="buffer">
-          <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
         </parameter>
       </parameters>
     </function>
@@ -28665,10 +28676,10 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
         <parameter name="info">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="writable">
           <type name="boolean" c:type="gboolean"/>
@@ -28682,10 +28693,10 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
         <parameter name="info">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -28696,13 +28707,13 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
         <parameter name="targets">
           <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
         </parameter>
         <parameter name="ntargets">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -28712,7 +28723,7 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
         <parameter name="target">
           <type name="GdkAtom" c:type="GdkAtom"/>
@@ -28725,27 +28736,27 @@
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
         <parameter name="target">
           <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="info">
-          <type name="guint" c:type="guint*"/>
+          <type name="GLib.guint" c:type="guint*"/>
         </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*"/>
+        <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
       </return-value>
       <parameters>
         <parameter name="list">
-          <type name="GtkTargetList" c:type="GtkTargetList*"/>
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
         <parameter name="n_targets">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -28815,7 +28826,7 @@
           <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="info">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -28835,7 +28846,7 @@
           <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
         </parameter>
         <parameter name="ntargets">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -28878,7 +28889,7 @@
       </return-value>
       <parameters>
         <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
         <parameter name="type">
           <type name="GdkAtom" c:type="GdkAtom"/>
@@ -28887,7 +28898,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="data">
-          <type name="guchar" c:type="guchar*"/>
+          <type name="GLib.guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="length">
           <type name="int32" c:type="gint"/>
@@ -28901,7 +28912,7 @@
       </return-value>
       <parameters>
         <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
         <parameter name="str">
           <type name="string" c:type="gchar*"/>
@@ -28914,11 +28925,11 @@
     <function name="selection_data_get_text"
               c:identifier="gtk_selection_data_get_text">
       <return-value>
-        <type name="guchar*" c:type="guchar*"/>
+        <type name="GLib.guchar" c:type="guchar*"/>
       </return-value>
       <parameters>
         <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
       </parameters>
     </function>
@@ -28929,7 +28940,7 @@
       </return-value>
       <parameters>
         <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
         <parameter name="pixbuf">
           <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
@@ -28939,11 +28950,11 @@
     <function name="selection_data_get_pixbuf"
               c:identifier="gtk_selection_data_get_pixbuf">
       <return-value>
-        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+        <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
       </return-value>
       <parameters>
         <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
       </parameters>
     </function>
@@ -28954,21 +28965,21 @@
       </return-value>
       <parameters>
         <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
         <parameter name="uris">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GLib.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**"/>
+        <type name="GLib.gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
       </parameters>
     </function>
@@ -28979,13 +28990,13 @@
       </return-value>
       <parameters>
         <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
         <parameter name="targets">
           <type name="GdkAtom" c:type="GdkAtom**"/>
         </parameter>
         <parameter name="n_atoms">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -28996,7 +29007,7 @@
       </return-value>
       <parameters>
         <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
       </parameters>
     </function>
@@ -29007,10 +29018,10 @@
       </return-value>
       <parameters>
         <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
         <parameter name="buffer">
-          <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
         </parameter>
       </parameters>
     </function>
@@ -29021,7 +29032,7 @@
       </return-value>
       <parameters>
         <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
         <parameter name="writable">
           <type name="boolean" c:type="gboolean"/>
@@ -29035,7 +29046,7 @@
       </return-value>
       <parameters>
         <parameter name="selection_data">
-          <type name="GtkSelectionData" c:type="GtkSelectionData*"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
       </parameters>
     </function>
@@ -29066,7 +29077,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="buffer">
-          <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
         </parameter>
       </parameters>
     </function>
@@ -29121,7 +29132,7 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="event">
-          <type name="GdkEventSelection" c:type="GdkEventSelection*"/>
+          <type name="Gdk.GdkEventSelection" c:type="GdkEventSelection*"/>
         </parameter>
       </parameters>
     </function>
@@ -29134,7 +29145,7 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="event">
-          <type name="GdkEventSelection" c:type="GdkEventSelection*"/>
+          <type name="Gdk.GdkEventSelection" c:type="GdkEventSelection*"/>
         </parameter>
       </parameters>
     </function>
@@ -29148,7 +29159,7 @@
           <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="event">
-          <type name="GdkEventProperty" c:type="GdkEventProperty*"/>
+          <type name="Gdk.GdkEventProperty" c:type="GdkEventProperty*"/>
         </parameter>
       </parameters>
     </function>
@@ -29161,7 +29172,7 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="event">
-          <type name="GdkEventSelection" c:type="GdkEventSelection*"/>
+          <type name="Gdk.GdkEventSelection" c:type="GdkEventSelection*"/>
         </parameter>
       </parameters>
     </function>
@@ -29175,7 +29186,7 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="event">
-          <type name="GdkEventProperty" c:type="GdkEventProperty*"/>
+          <type name="Gdk.GdkEventProperty" c:type="GdkEventProperty*"/>
         </parameter>
       </parameters>
     </function>
@@ -29215,10 +29226,10 @@
       </return-value>
       <parameters>
         <parameter name="clipboard">
-          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
+          <type name="Clipboard" c:type="GtkClipboard*"/>
         </parameter>
         <parameter name="selection_data">
-          <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -29231,7 +29242,7 @@
       </return-value>
       <parameters>
         <parameter name="clipboard">
-          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
+          <type name="Clipboard" c:type="GtkClipboard*"/>
         </parameter>
         <parameter name="text">
           <type name="string" c:type="gchar*"/>
@@ -29247,13 +29258,13 @@
       </return-value>
       <parameters>
         <parameter name="clipboard">
-          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
+          <type name="Clipboard" c:type="GtkClipboard*"/>
         </parameter>
         <parameter name="format">
           <type name="GdkAtom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="text">
-          <type name="guint8*" c:type="guint8*"/>
+          <type name="guint8" c:type="guint8*"/>
         </parameter>
         <parameter name="length">
           <type name="size" c:type="gsize"/>
@@ -29269,10 +29280,10 @@
       </return-value>
       <parameters>
         <parameter name="clipboard">
-          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
+          <type name="Clipboard" c:type="GtkClipboard*"/>
         </parameter>
         <parameter name="pixbuf">
-          <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -29285,10 +29296,10 @@
       </return-value>
       <parameters>
         <parameter name="clipboard">
-          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
+          <type name="Clipboard" c:type="GtkClipboard*"/>
         </parameter>
         <parameter name="atoms">
-          <type name="GdkAtom*" c:type="GdkAtom*"/>
+          <type name="GdkAtom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="n_atoms">
           <type name="int32" c:type="gint"/>
@@ -29304,13 +29315,13 @@
       </return-value>
       <parameters>
         <parameter name="clipboard">
-          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
+          <type name="Clipboard" c:type="GtkClipboard*"/>
         </parameter>
         <parameter name="selection_data">
-          <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
         <parameter name="info">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="user_data_or_owner">
           <type name="any" c:type="gpointer"/>
@@ -29323,7 +29334,7 @@
       </return-value>
       <parameters>
         <parameter name="clipboard">
-          <type name="GtkClipboard*" c:type="GtkClipboard*"/>
+          <type name="Clipboard" c:type="GtkClipboard*"/>
         </parameter>
         <parameter name="user_data_or_owner">
           <type name="any" c:type="gpointer"/>
@@ -29332,7 +29343,7 @@
     </callback>
     <class name="Clipboard"
            c:type="GtkClipboard"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkClipboard"
            glib:get-type="gtk_clipboard_get_type">
       <constructor name="get_for_display"
@@ -29381,7 +29392,7 @@
             <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
           </parameter>
           <parameter name="n_targets">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="get_func">
             <type name="GtkClipboardGetFunc" c:type="GtkClipboardGetFunc"/>
@@ -29407,7 +29418,7 @@
             <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
           </parameter>
           <parameter name="n_targets">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="get_func">
             <type name="GtkClipboardGetFunc" c:type="GtkClipboardGetFunc"/>
@@ -29416,13 +29427,13 @@
             <type name="GtkClipboardClearFunc" c:type="GtkClipboardClearFunc"/>
           </parameter>
           <parameter name="owner">
-            <type name="GLib.Object" c:type="GObject*"/>
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_owner" c:identifier="gtk_clipboard_get_owner">
         <return-value>
-          <type name="GLib.Object" c:type="GObject*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </return-value>
         <parameters>
           <parameter name="clipboard">
@@ -29517,7 +29528,7 @@
             <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
           <parameter name="buffer">
-            <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="callback">
             <type name="GtkClipboardRichTextReceivedFunc"
@@ -29597,7 +29608,7 @@
             <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
           <parameter name="buffer">
-            <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="format">
             <type name="GdkAtom" c:type="GdkAtom*"/>
@@ -29631,7 +29642,7 @@
             <type name="GdkAtom" c:type="GdkAtom**"/>
           </parameter>
           <parameter name="n_targets">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -29656,7 +29667,7 @@
             <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
           <parameter name="buffer">
-            <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
       </method>
@@ -29717,7 +29728,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -29729,7 +29740,7 @@
       </return-value>
       <parameters>
         <parameter name="event">
-          <type name="GdkEventOwnerChange" c:type="GdkEventOwnerChange*"/>
+          <type name="Gdk.GdkEventOwnerChange" c:type="GdkEventOwnerChange*"/>
         </parameter>
       </parameters>
     </function>
@@ -29996,19 +30007,19 @@
         </parameters>
       </method>
       <property name="update-policy">
-        <type name="GtkUpdateType" c:type="GtkUpdateType"/>
+        <type name="UpdateType" c:type="GtkUpdateType"/>
       </property>
       <property name="adjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+        <type name="Adjustment" 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"/>
+        <type name="SensitivityType" c:type="GtkSensitivityType"/>
       </property>
       <property name="upper-stepper-sensitivity">
-        <type name="GtkSensitivityType" c:type="GtkSensitivityType"/>
+        <type name="SensitivityType" c:type="GtkSensitivityType"/>
       </property>
       <property name="show-fill-level">
         <type name="boolean" c:type="gboolean"/>
@@ -30031,7 +30042,7 @@
         </return-value>
         <parameters>
           <parameter name="range">
-            <type name="GtkRange*" c:type="GtkRange*"/>
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30041,7 +30052,7 @@
         </return-value>
         <parameters>
           <parameter name="range">
-            <type name="GtkRange*" c:type="GtkRange*"/>
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
           <parameter name="new_value">
             <type name="double" c:type="gdouble"/>
@@ -30054,10 +30065,10 @@
         </return-value>
         <parameters>
           <parameter name="range">
-            <type name="GtkRange*" c:type="GtkRange*"/>
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
           <parameter name="scroll">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
       </callback>
@@ -30067,10 +30078,10 @@
         </return-value>
         <parameters>
           <parameter name="range">
-            <type name="GtkRange*" c:type="GtkRange*"/>
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
           <parameter name="border_">
-            <type name="GtkBorder*" c:type="GtkBorder*"/>
+            <type name="Border" c:type="GtkBorder*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30080,10 +30091,10 @@
         </return-value>
         <parameters>
           <parameter name="range">
-            <type name="GtkRange*" c:type="GtkRange*"/>
+            <type name="Range" c:type="GtkRange*"/>
           </parameter>
           <parameter name="scroll">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
           <parameter name="new_value">
             <type name="double" c:type="gdouble"/>
@@ -30126,7 +30137,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -30136,7 +30147,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
           <parameter name="p0">
             <type name="double" c:type="gdouble"/>
@@ -30192,7 +30203,7 @@
     </class>
     <function name="hscrollbar_new" c:identifier="gtk_hscrollbar_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="adjustment">
@@ -30208,7 +30219,7 @@
     </class>
     <function name="vscrollbar_new" c:identifier="gtk_vscrollbar_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="adjustment">
@@ -30218,7 +30229,7 @@
     </function>
     <record name="GtkCList" c:type="GtkCList">
       <field name="container">
-        <type name="GtkContainer" c:type="GtkContainer"/>
+        <type name="Container" c:type="GtkContainer"/>
       </field>
       <field name="flags">
         <type name="uint16" c:type="guint16"/>
@@ -30230,7 +30241,7 @@
         <type name="any" c:type="gpointer"/>
       </field>
       <field name="freeze_count">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="internal_allocation">
         <type name="GdkRectangle" c:type="GdkRectangle"/>
@@ -30242,10 +30253,10 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="row_list">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </field>
       <field name="row_list_end">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </field>
       <field name="columns">
         <type name="int32" c:type="gint"/>
@@ -30254,13 +30265,13 @@
         <type name="GdkRectangle" c:type="GdkRectangle"/>
       </field>
       <field name="title_window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
+        <type name="Gdk.Window" c:type="GdkWindow*"/>
       </field>
       <field name="column">
-        <type name="GtkCListColumn*" c:type="GtkCListColumn*"/>
+        <type name="GtkCListColumn" c:type="GtkCListColumn*"/>
       </field>
       <field name="clist_window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
+        <type name="Gdk.Window" c:type="GdkWindow*"/>
       </field>
       <field name="clist_window_width">
         <type name="int32" c:type="gint"/>
@@ -30275,22 +30286,22 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="shadow_type">
-        <type name="GtkShadowType" c:type="GtkShadowType"/>
+        <type name="ShadowType" c:type="GtkShadowType"/>
       </field>
       <field name="selection_mode">
-        <type name="GtkSelectionMode" c:type="GtkSelectionMode"/>
+        <type name="SelectionMode" c:type="GtkSelectionMode"/>
       </field>
       <field name="selection">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </field>
       <field name="selection_end">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </field>
       <field name="undo_selection">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </field>
       <field name="undo_unselection">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </field>
       <field name="undo_anchor">
         <type name="int32" c:type="gint"/>
@@ -30305,22 +30316,22 @@
         <type name="GtkCListCellInfo" c:type="GtkCListCellInfo"/>
       </field>
       <field name="hadjustment">
-        <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+        <type name="Adjustment" c:type="GtkAdjustment*"/>
       </field>
       <field name="vadjustment">
-        <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+        <type name="Adjustment" c:type="GtkAdjustment*"/>
       </field>
       <field name="xor_gc">
-        <type name="GdkGC*" c:type="GdkGC*"/>
+        <type name="Gdk.GC" c:type="GdkGC*"/>
       </field>
       <field name="fg_gc">
-        <type name="GdkGC*" c:type="GdkGC*"/>
+        <type name="Gdk.GC" c:type="GdkGC*"/>
       </field>
       <field name="bg_gc">
-        <type name="GdkGC*" c:type="GdkGC*"/>
+        <type name="Gdk.GC" c:type="GdkGC*"/>
       </field>
       <field name="cursor_drag">
-        <type name="GdkCursor*" c:type="GdkCursor*"/>
+        <type name="GdkCursor" c:type="GdkCursor*"/>
       </field>
       <field name="x_drag">
         <type name="int32" c:type="gint"/>
@@ -30335,7 +30346,7 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="anchor_state">
-        <type name="GtkStateType" c:type="GtkStateType"/>
+        <type name="StateType" c:type="GtkStateType"/>
       </field>
       <field name="drag_pos">
         <type name="int32" c:type="gint"/>
@@ -30347,7 +30358,7 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="sort_type">
-        <type name="GtkSortType" c:type="GtkSortType"/>
+        <type name="SortType" c:type="GtkSortType"/>
       </field>
       <field name="compare">
         <type name="GtkCListCompareFunc" c:type="GtkCListCompareFunc"/>
@@ -30359,7 +30370,7 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="drag_highlight_pos">
-        <type name="GtkCListDragPos" c:type="GtkCListDragPos"/>
+        <type name="CListDragPos" c:type="GtkCListDragPos"/>
       </field>
       <callback name="set_scroll_adjustments">
         <return-value>
@@ -30367,13 +30378,13 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="hadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
           <parameter name="vadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30383,7 +30394,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30393,7 +30404,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -30402,7 +30413,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30412,7 +30423,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -30421,7 +30432,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30431,7 +30442,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="source_row">
             <type name="int32" c:type="gint"/>
@@ -30447,7 +30458,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="column">
             <type name="int32" c:type="gint"/>
@@ -30460,7 +30471,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="column">
             <type name="int32" c:type="gint"/>
@@ -30476,7 +30487,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30486,7 +30497,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30496,7 +30507,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30506,7 +30517,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30516,7 +30527,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30526,7 +30537,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30536,10 +30547,10 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="scroll_type">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
           <parameter name="position">
             <type name="float" c:type="gfloat"/>
@@ -30555,10 +30566,10 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="scroll_type">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
           <parameter name="position">
             <type name="float" c:type="gfloat"/>
@@ -30571,10 +30582,10 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="scroll_type">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
           <parameter name="position">
             <type name="float" c:type="gfloat"/>
@@ -30587,7 +30598,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30597,7 +30608,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30607,26 +30618,26 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEvent*" c:type="GdkEvent*"/>
+            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="selection_find">
         <return-value>
-          <type name="GList*" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <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*"/>
+            <type name="GLib.GList" c:type="GList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30636,16 +30647,16 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="clist_row">
-            <type name="GtkCListRow*" c:type="GtkCListRow*"/>
+            <type name="GtkCListRow" c:type="GtkCListRow*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30655,16 +30666,16 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="target_row">
-            <type name="GtkCListRow*" c:type="GtkCListRow*"/>
+            <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"/>
+            <type name="CListDragPos" c:type="GtkCListDragPos"/>
           </parameter>
         </parameters>
       </callback>
@@ -30674,7 +30685,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30684,7 +30695,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -30697,7 +30708,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30707,7 +30718,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -30723,7 +30734,7 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -30736,16 +30747,16 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="clist_row">
-            <type name="GtkCListRow*" c:type="GtkCListRow*"/>
+            <type name="GtkCListRow" c:type="GtkCListRow*"/>
           </parameter>
           <parameter name="column">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="type">
-            <type name="GtkCellType" c:type="GtkCellType"/>
+            <type name="CellType" c:type="GtkCellType"/>
           </parameter>
           <parameter name="text">
             <type name="string" c:type="gchar*"/>
@@ -30754,10 +30765,10 @@
             <type name="uint8" c:type="guint8"/>
           </parameter>
           <parameter name="pixmap">
-            <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+            <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
           </parameter>
           <parameter name="mask">
-            <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+            <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30767,16 +30778,16 @@
         </return-value>
         <parameters>
           <parameter name="clist">
-            <type name="GtkCList*" c:type="GtkCList*"/>
+            <type name="GtkCList" c:type="GtkCList*"/>
           </parameter>
           <parameter name="clist_row">
-            <type name="GtkCListRow*" c:type="GtkCListRow*"/>
+            <type name="GtkCListRow" c:type="GtkCListRow*"/>
           </parameter>
           <parameter name="column">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="requisition">
-            <type name="GtkRequisition*" c:type="GtkRequisition*"/>
+            <type name="Requisition" c:type="GtkRequisition*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30789,10 +30800,10 @@
         <type name="GdkRectangle" c:type="GdkRectangle"/>
       </field>
       <field name="button">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </field>
       <field name="window">
-        <type name="GdkWindow*" c:type="GdkWindow*"/>
+        <type name="Gdk.Window" c:type="GdkWindow*"/>
       </field>
       <field name="width">
         <type name="int32" c:type="gint"/>
@@ -30804,30 +30815,30 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="justification">
-        <type name="GtkJustification" c:type="GtkJustification"/>
+        <type name="Justification" c:type="GtkJustification"/>
       </field>
       <field name="visible">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="width_set">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="resizeable">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="auto_resize">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="button_passive">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <record name="GtkCListRow" c:type="GtkCListRow">
       <field name="cell">
-        <type name="GtkCell*" c:type="GtkCell*"/>
+        <type name="GtkCell" c:type="GtkCell*"/>
       </field>
       <field name="state">
-        <type name="GtkStateType" c:type="GtkStateType"/>
+        <type name="StateType" c:type="GtkStateType"/>
       </field>
       <field name="foreground">
         <type name="GdkColor" c:type="GdkColor"/>
@@ -30836,7 +30847,7 @@
         <type name="GdkColor" c:type="GdkColor"/>
       </field>
       <field name="style">
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="Style" c:type="GtkStyle*"/>
       </field>
       <field name="data">
         <type name="any" c:type="gpointer"/>
@@ -30845,18 +30856,18 @@
         <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
       </field>
       <field name="fg_set">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="bg_set">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="selectable">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <record name="GtkCell" c:type="GtkCell">
       <field name="type">
-        <type name="GtkCellType" c:type="GtkCellType"/>
+        <type name="CellType" c:type="GtkCellType"/>
       </field>
       <field name="vertical">
         <type name="int16" c:type="gint16"/>
@@ -30865,7 +30876,7 @@
         <type name="int16" c:type="gint16"/>
       </field>
       <field name="style">
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="Style" c:type="GtkStyle*"/>
       </field>
       <field name="u">
         <type name="???" c:type="???"/>
@@ -30873,7 +30884,7 @@
     </record>
     <record name="GtkCellText" c:type="GtkCellText">
       <field name="type">
-        <type name="GtkCellType" c:type="GtkCellType"/>
+        <type name="CellType" c:type="GtkCellType"/>
       </field>
       <field name="vertical">
         <type name="int16" c:type="gint16"/>
@@ -30882,7 +30893,7 @@
         <type name="int16" c:type="gint16"/>
       </field>
       <field name="style">
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="Style" c:type="GtkStyle*"/>
       </field>
       <field name="text">
         <type name="string" c:type="gchar*"/>
@@ -30890,7 +30901,7 @@
     </record>
     <record name="GtkCellPixmap" c:type="GtkCellPixmap">
       <field name="type">
-        <type name="GtkCellType" c:type="GtkCellType"/>
+        <type name="CellType" c:type="GtkCellType"/>
       </field>
       <field name="vertical">
         <type name="int16" c:type="gint16"/>
@@ -30899,18 +30910,18 @@
         <type name="int16" c:type="gint16"/>
       </field>
       <field name="style">
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="Style" c:type="GtkStyle*"/>
       </field>
       <field name="pixmap">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
       </field>
       <field name="mask">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+        <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
       </field>
     </record>
     <record name="GtkCellPixText" c:type="GtkCellPixText">
       <field name="type">
-        <type name="GtkCellType" c:type="GtkCellType"/>
+        <type name="CellType" c:type="GtkCellType"/>
       </field>
       <field name="vertical">
         <type name="int16" c:type="gint16"/>
@@ -30919,7 +30930,7 @@
         <type name="int16" c:type="gint16"/>
       </field>
       <field name="style">
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="Style" c:type="GtkStyle*"/>
       </field>
       <field name="text">
         <type name="string" c:type="gchar*"/>
@@ -30928,15 +30939,15 @@
         <type name="uint8" c:type="guint8"/>
       </field>
       <field name="pixmap">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
       </field>
       <field name="mask">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+        <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
       </field>
     </record>
     <record name="GtkCellWidget" c:type="GtkCellWidget">
       <field name="type">
-        <type name="GtkCellType" c:type="GtkCellType"/>
+        <type name="CellType" c:type="GtkCellType"/>
       </field>
       <field name="vertical">
         <type name="int16" c:type="gint16"/>
@@ -30945,10 +30956,10 @@
         <type name="int16" c:type="gint16"/>
       </field>
       <field name="style">
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="Style" c:type="GtkStyle*"/>
       </field>
       <field name="widget">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </field>
     </record>
     <callback name="GtkCListCompareFunc">
@@ -30957,7 +30968,7 @@
       </return-value>
       <parameters>
         <parameter name="clist">
-          <type name="GtkCList*" c:type="GtkCList*"/>
+          <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
         <parameter name="ptr1">
           <type name="gconstpointer" c:type="gconstpointer"/>
@@ -30980,7 +30991,7 @@
         <type name="GtkCListCellInfo" c:type="GtkCListCellInfo"/>
       </field>
       <field name="insert_pos">
-        <type name="GtkCListDragPos" c:type="GtkCListDragPos"/>
+        <type name="CListDragPos" c:type="GtkCListDragPos"/>
       </field>
     </record>
     <function name="clist_get_type" c:identifier="gtk_clist_get_type">
@@ -30990,7 +31001,7 @@
     </function>
     <function name="clist_new" c:identifier="gtk_clist_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="columns">
@@ -31001,7 +31012,7 @@
     <function name="clist_new_with_titles"
               c:identifier="gtk_clist_new_with_titles">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="columns">
@@ -31043,7 +31054,7 @@
     <function name="clist_get_hadjustment"
               c:identifier="gtk_clist_get_hadjustment">
       <return-value>
-        <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+        <type name="Adjustment" c:type="GtkAdjustment*"/>
       </return-value>
       <parameters>
         <parameter name="clist">
@@ -31054,7 +31065,7 @@
     <function name="clist_get_vadjustment"
               c:identifier="gtk_clist_get_vadjustment">
       <return-value>
-        <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+        <type name="Adjustment" c:type="GtkAdjustment*"/>
       </return-value>
       <parameters>
         <parameter name="clist">
@@ -31128,7 +31139,7 @@
           <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
         <parameter name="button">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="button_actions">
           <type name="uint8" c:type="guint8"/>
@@ -31278,7 +31289,7 @@
     <function name="clist_get_column_widget"
               c:identifier="gtk_clist_get_column_widget">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="clist">
@@ -31443,7 +31454,7 @@
           <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
         <parameter name="height">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -31472,7 +31483,7 @@
     <function name="clist_row_is_visible"
               c:identifier="gtk_clist_row_is_visible">
       <return-value>
-        <type name="GtkVisibility" c:type="GtkVisibility"/>
+        <type name="Visibility" c:type="GtkVisibility"/>
       </return-value>
       <parameters>
         <parameter name="clist">
@@ -31486,7 +31497,7 @@
     <function name="clist_get_cell_type"
               c:identifier="gtk_clist_get_cell_type">
       <return-value>
-        <type name="GtkCellType" c:type="GtkCellType"/>
+        <type name="CellType" c:type="GtkCellType"/>
       </return-value>
       <parameters>
         <parameter name="clist">
@@ -31534,7 +31545,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="text">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -31556,7 +31567,7 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
         <parameter name="mask" allow-none="1">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
       </parameters>
     </function>
@@ -31578,7 +31589,7 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
         </parameter>
         <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
         </parameter>
       </parameters>
     </function>
@@ -31606,7 +31617,7 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
         <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
       </parameters>
     </function>
@@ -31625,7 +31636,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="text">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </parameter>
         <parameter name="spacing">
           <type name="guint8" c:type="guint8*"/>
@@ -31634,7 +31645,7 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
         </parameter>
         <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
         </parameter>
       </parameters>
     </function>
@@ -31695,7 +31706,7 @@
     <function name="clist_get_cell_style"
               c:identifier="gtk_clist_get_cell_style">
       <return-value>
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="Style" c:type="GtkStyle*"/>
       </return-value>
       <parameters>
         <parameter name="clist">
@@ -31729,7 +31740,7 @@
     <function name="clist_get_row_style"
               c:identifier="gtk_clist_get_row_style">
       <return-value>
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="Style" c:type="GtkStyle*"/>
       </return-value>
       <parameters>
         <parameter name="clist">
@@ -31980,10 +31991,10 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="row">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="column">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -32108,7 +32119,7 @@
     <function name="clist_create_cell_layout"
               c:identifier="_gtk_clist_create_cell_layout">
       <return-value>
-        <type name="PangoLayout*" c:type="PangoLayout*"/>
+        <type name="Pango.Layout" c:type="PangoLayout*"/>
       </return-value>
       <parameters>
         <parameter name="clist">
@@ -32235,7 +32246,7 @@
         <type name="GdkColor" c:type="GdkColor"/>
       </property>
       <property name="alpha">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <callback name="color_set">
         <return-value>
@@ -32243,7 +32254,7 @@
         </return-value>
         <parameters>
           <parameter name="cp">
-            <type name="GtkColorButton*" c:type="GtkColorButton*"/>
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -32275,13 +32286,13 @@
     </class>
     <function name="color_button_new" c:identifier="gtk_color_button_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="color">
@@ -32297,7 +32308,7 @@
     </class>
     <function name="vbox_new" c:identifier="gtk_vbox_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="homogeneous">
@@ -32314,7 +32325,7 @@
       </return-value>
       <parameters>
         <parameter name="colors">
-          <type name="GdkColor*" c:type="GdkColor*"/>
+          <type name="GdkColor" c:type="GdkColor*"/>
         </parameter>
         <parameter name="n_colors">
           <type name="int32" c:type="gint"/>
@@ -32327,10 +32338,10 @@
       </return-value>
       <parameters>
         <parameter name="screen">
-          <type name="GdkScreen*" c:type="GdkScreen*"/>
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
         </parameter>
         <parameter name="colors">
-          <type name="GdkColor*" c:type="GdkColor*"/>
+          <type name="GdkColor" c:type="GdkColor*"/>
         </parameter>
         <parameter name="n_colors">
           <type name="int32" c:type="gint"/>
@@ -32518,7 +32529,7 @@
             <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
           <parameter name="color">
-            <type name="gdouble" c:type="gdouble*"/>
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
@@ -32531,7 +32542,7 @@
             <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
           <parameter name="color">
-            <type name="gdouble" c:type="gdouble*"/>
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
@@ -32559,7 +32570,7 @@
         <type name="GdkColor" c:type="GdkColor"/>
       </property>
       <property name="current-alpha">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <callback name="color_changed">
         <return-value>
@@ -32567,7 +32578,7 @@
         </return-value>
         <parameters>
           <parameter name="color_selection">
-            <type name="GtkColorSelection*" c:type="GtkColorSelection*"/>
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
         </parameters>
       </callback>
@@ -32600,7 +32611,7 @@
     <function name="color_selection_new"
               c:identifier="gtk_color_selection_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="color_selection_palette_from_string"
@@ -32616,7 +32627,7 @@
           <type name="GdkColor" c:type="GdkColor**"/>
         </parameter>
         <parameter name="n_colors">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -32689,7 +32700,7 @@
     <function name="color_selection_dialog_new"
               c:identifier="gtk_color_selection_dialog_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="title">
@@ -32738,7 +32749,7 @@
     <function name="drag_get_source_widget"
               c:identifier="gtk_drag_get_source_widget">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -32838,7 +32849,7 @@
     <function name="drag_dest_get_target_list"
               c:identifier="gtk_drag_dest_get_target_list">
       <return-value>
-        <type name="GtkTargetList*" c:type="GtkTargetList*"/>
+        <type name="TargetList" c:type="GtkTargetList*"/>
       </return-value>
       <parameters>
         <parameter name="widget">
@@ -32953,7 +32964,7 @@
     <function name="drag_source_get_target_list"
               c:identifier="gtk_drag_source_get_target_list">
       <return-value>
-        <type name="GtkTargetList*" c:type="GtkTargetList*"/>
+        <type name="TargetList" c:type="GtkTargetList*"/>
       </return-value>
       <parameters>
         <parameter name="widget">
@@ -33024,7 +33035,7 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
         <parameter name="mask" allow-none="1">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
       </parameters>
     </function>
@@ -33072,7 +33083,7 @@
     </function>
     <function name="drag_begin" c:identifier="gtk_drag_begin">
       <return-value>
-        <type name="GdkDragContext*" c:type="GdkDragContext*"/>
+        <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
       </return-value>
       <parameters>
         <parameter name="widget">
@@ -33088,7 +33099,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="event">
-          <type name="GdkEvent" c:type="GdkEvent*"/>
+          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
     </function>
@@ -33128,7 +33139,7 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
         <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
         <parameter name="hot_x">
           <type name="int32" c:type="gint"/>
@@ -33241,7 +33252,7 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="event">
-          <type name="GdkEvent" c:type="GdkEvent*"/>
+          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
     </function>
@@ -33255,7 +33266,7 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="event">
-          <type name="GdkEvent" c:type="GdkEvent*"/>
+          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
     </function>
@@ -33272,7 +33283,7 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
         <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
         <parameter name="hot_x">
           <type name="int32" c:type="gint"/>
@@ -33293,7 +33304,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
           <parameter name="text">
             <type name="string" c:type="gchar*"/>
@@ -33302,7 +33313,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="position">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33312,7 +33323,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
           <parameter name="start_pos">
             <type name="int32" c:type="gint"/>
@@ -33328,7 +33339,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33338,7 +33349,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
           <parameter name="text">
             <type name="string" c:type="gchar*"/>
@@ -33347,7 +33358,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="position">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33357,7 +33368,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
           <parameter name="start_pos">
             <type name="int32" c:type="gint"/>
@@ -33373,7 +33384,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
           <parameter name="start_pos">
             <type name="int32" c:type="gint"/>
@@ -33389,7 +33400,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
           <parameter name="start_pos">
             <type name="int32" c:type="gint"/>
@@ -33405,13 +33416,13 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
           <parameter name="start_pos">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="end_pos">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33421,7 +33432,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
           <parameter name="position">
             <type name="int32" c:type="gint"/>
@@ -33434,7 +33445,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkEditable*" c:type="GtkEditable*"/>
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33500,10 +33511,10 @@
           <type name="Editable" c:type="GtkEditable*"/>
         </parameter>
         <parameter name="start">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="end">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -33523,7 +33534,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="position" direction="inout">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -33656,7 +33667,7 @@
     </function>
     <class name="IMContext"
            c:type="GtkIMContext"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkIMContext"
            glib:get-type="gtk_im_context_get_type">
       <constructor name="simple_new" c:identifier="gtk_im_context_simple_new">
@@ -33688,13 +33699,13 @@
             <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
           <parameter name="str">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.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*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -33708,7 +33719,7 @@
             <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventKey" c:type="GdkEventKey*"/>
+            <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
           </parameter>
         </parameters>
       </method>
@@ -33800,10 +33811,10 @@
             <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
           <parameter name="text">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
           <parameter name="cursor_index">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -33830,7 +33841,7 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33840,7 +33851,7 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33850,7 +33861,7 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33860,7 +33871,7 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
           <parameter name="str">
             <type name="string" c:type="gchar*"/>
@@ -33873,7 +33884,7 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33883,7 +33894,7 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
           <parameter name="offset">
             <type name="int32" c:type="gint"/>
@@ -33899,10 +33910,10 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
           <parameter name="window">
-            <type name="GdkWindow*" c:type="GdkWindow*"/>
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33912,16 +33923,16 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
           <parameter name="str">
-            <type name="gchar**" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
           <parameter name="attrs">
-            <type name="PangoAttrList**" c:type="PangoAttrList**"/>
+            <type name="PangoAttrList" c:type="PangoAttrList**"/>
           </parameter>
           <parameter name="cursor_pos">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33931,10 +33942,10 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventKey*" c:type="GdkEventKey*"/>
+            <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33944,7 +33955,7 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33954,7 +33965,7 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33964,7 +33975,7 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33974,10 +33985,10 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle*" c:type="GdkRectangle*"/>
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </callback>
@@ -33987,7 +33998,7 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
           <parameter name="use_preedit">
             <type name="boolean" c:type="gboolean"/>
@@ -34000,7 +34011,7 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
           <parameter name="text">
             <type name="string" c:type="gchar*"/>
@@ -34019,13 +34030,13 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
           <parameter name="text">
-            <type name="gchar**" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
           <parameter name="cursor_index">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -34105,7 +34116,7 @@
     </class>
     <class name="ListStore"
            c:type="GtkListStore"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkListStore"
            glib:get-type="gtk_list_store_get_type">
       <constructor name="new" c:identifier="gtk_list_store_new">
@@ -34127,7 +34138,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="types">
-            <type name="GType" c:type="GType*"/>
+            <type name="GObject.GType" c:type="GType*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -34144,7 +34155,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="types">
-            <type name="GType" c:type="GType*"/>
+            <type name="GObject.GType" c:type="GType*"/>
           </parameter>
         </parameters>
       </method>
@@ -34163,7 +34174,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </method>
@@ -34192,10 +34203,10 @@
             <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="columns">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="values">
-            <type name="GValue" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
           <parameter name="n_values">
             <type name="int32" c:type="gint"/>
@@ -34312,10 +34323,10 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="columns">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="values">
-            <type name="GValue" c:type="GValue*"/>
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
           <parameter name="n_values">
             <type name="int32" c:type="gint"/>
@@ -34380,7 +34391,7 @@
             <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
           <parameter name="new_order">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -34459,10 +34470,10 @@
       </return-value>
       <parameters>
         <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
         <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -34475,13 +34486,13 @@
       </return-value>
       <parameters>
         <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
         <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
         <parameter name="value">
-          <type name="GValue*" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="column">
           <type name="int32" c:type="gint"/>
@@ -34495,7 +34506,7 @@
             c:type="GtkTreeModelFilterPrivate"/>
     <class name="TreeModelFilter"
            c:type="GtkTreeModelFilter"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkTreeModelFilter"
            glib:get-type="gtk_tree_model_filter_get_type">
       <method name="set_visible_func"
@@ -34532,7 +34543,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="types">
-            <type name="GType" c:type="GType*"/>
+            <type name="GObject.GType" c:type="GType*"/>
           </parameter>
           <parameter name="func">
             <type name="GtkTreeModelFilterModifyFunc"
@@ -34654,10 +34665,10 @@
         </parameters>
       </method>
       <property name="child-model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+        <type name="TreeModel" c:type="GtkTreeModel"/>
       </property>
       <property name="virtual-root">
-        <type name="GtkTreePath" c:type="GtkTreePath"/>
+        <type name="TreePath" c:type="GtkTreePath"/>
       </property>
       <callback name="_gtk_reserved0">
         <return-value>
@@ -34683,7 +34694,7 @@
     <function name="tree_model_filter_new"
               c:identifier="gtk_tree_model_filter_new">
       <return-value>
-        <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+        <type name="TreeModel" c:type="GtkTreeModel*"/>
       </return-value>
       <parameters>
         <parameter name="child_model">
@@ -34702,13 +34713,13 @@
       </return-value>
       <parameters>
         <parameter name="completion">
-          <type name="GtkEntryCompletion*" c:type="GtkEntryCompletion*"/>
+          <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
         </parameter>
         <parameter name="key">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -34717,7 +34728,7 @@
     </callback>
     <class name="EntryCompletion"
            c:type="GtkEntryCompletion"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkEntryCompletion"
            glib:get-type="gtk_entry_completion_get_type">
       <constructor name="new" c:identifier="gtk_entry_completion_new">
@@ -34775,7 +34786,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="func_notify">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
@@ -35035,7 +35046,7 @@
         </parameters>
       </method>
       <property name="model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+        <type name="TreeModel" c:type="GtkTreeModel"/>
       </property>
       <property name="minimum-key-length">
         <type name="int32" c:type="gint"/>
@@ -35064,13 +35075,13 @@
         </return-value>
         <parameters>
           <parameter name="completion">
-            <type name="GtkEntryCompletion*" c:type="GtkEntryCompletion*"/>
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
           <parameter name="model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -35080,7 +35091,7 @@
         </return-value>
         <parameters>
           <parameter name="completion">
-            <type name="GtkEntryCompletion*" c:type="GtkEntryCompletion*"/>
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
           <parameter name="index_">
             <type name="int32" c:type="gint"/>
@@ -35093,7 +35104,7 @@
         </return-value>
         <parameters>
           <parameter name="completion">
-            <type name="GtkEntryCompletion*" c:type="GtkEntryCompletion*"/>
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
           <parameter name="prefix">
             <type name="string" c:type="gchar*"/>
@@ -35106,13 +35117,13 @@
         </return-value>
         <parameters>
           <parameter name="completion">
-            <type name="GtkEntryCompletion*" c:type="GtkEntryCompletion*"/>
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
           <parameter name="model">
-            <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -35142,10 +35153,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+            <type name="TreeModel" c:type="GtkTreeModel"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+            <type name="TreeIter" c:type="GtkTreeIter"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -35155,10 +35166,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+            <type name="TreeModel" c:type="GtkTreeModel"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+            <type name="TreeIter" c:type="GtkTreeIter"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -35211,14 +35222,14 @@
             <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
           <parameter name="ch">
-            <type name="gunichar" c:type="gunichar"/>
+            <type name="GLib.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"/>
+          <type name="GLib.gunichar" c:type="gunichar"/>
         </return-value>
         <parameters>
           <parameter name="entry">
@@ -35388,10 +35399,10 @@
             <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -35581,10 +35592,10 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="inner-border">
-        <type name="GtkBorder" c:type="GtkBorder"/>
+        <type name="Border" c:type="GtkBorder"/>
       </property>
       <property name="invisible-char">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="activates-default">
         <type name="boolean" c:type="gboolean"/>
@@ -35605,7 +35616,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="shadow-type">
-        <type name="GtkShadowType" c:type="GtkShadowType"/>
+        <type name="ShadowType" c:type="GtkShadowType"/>
       </property>
       <callback name="populate_popup">
         <return-value>
@@ -35613,10 +35624,10 @@
         </return-value>
         <parameters>
           <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
           <parameter name="menu">
-            <type name="GtkMenu*" c:type="GtkMenu*"/>
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
         </parameters>
       </callback>
@@ -35626,7 +35637,7 @@
         </return-value>
         <parameters>
           <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </callback>
@@ -35636,10 +35647,10 @@
         </return-value>
         <parameters>
           <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
           <parameter name="step">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="count">
             <type name="int32" c:type="gint"/>
@@ -35655,7 +35666,7 @@
         </return-value>
         <parameters>
           <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
           <parameter name="str">
             <type name="string" c:type="gchar*"/>
@@ -35668,10 +35679,10 @@
         </return-value>
         <parameters>
           <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
           <parameter name="type">
-            <type name="GtkDeleteType" c:type="GtkDeleteType"/>
+            <type name="DeleteType" c:type="GtkDeleteType"/>
           </parameter>
           <parameter name="count">
             <type name="int32" c:type="gint"/>
@@ -35684,7 +35695,7 @@
         </return-value>
         <parameters>
           <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </callback>
@@ -35694,7 +35705,7 @@
         </return-value>
         <parameters>
           <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </callback>
@@ -35704,7 +35715,7 @@
         </return-value>
         <parameters>
           <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </callback>
@@ -35714,7 +35725,7 @@
         </return-value>
         <parameters>
           <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </callback>
@@ -35724,7 +35735,7 @@
         </return-value>
         <parameters>
           <parameter name="entry">
-            <type name="GtkEntry*" c:type="GtkEntry*"/>
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </callback>
@@ -35749,7 +35760,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="p0">
             <type name="int32" c:type="gint"/>
@@ -35770,7 +35781,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkMenu" c:type="GtkMenu"/>
+            <type name="Menu" c:type="GtkMenu"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -35795,7 +35806,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkDeleteType" c:type="GtkDeleteType"/>
+            <type name="DeleteType" c:type="GtkDeleteType"/>
           </parameter>
           <parameter name="p0">
             <type name="int32" c:type="gint"/>
@@ -35825,13 +35836,13 @@
     </class>
     <function name="entry_new" c:identifier="gtk_entry_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="max">
@@ -35846,16 +35857,16 @@
       </return-value>
       <parameters>
         <parameter name="tree_view">
-          <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+          <type name="TreeView" c:type="GtkTreeView*"/>
         </parameter>
         <parameter name="column">
-          <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </parameter>
         <parameter name="prev_column">
-          <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </parameter>
         <parameter name="next_column">
-          <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -35868,10 +35879,10 @@
       </return-value>
       <parameters>
         <parameter name="tree_view">
-          <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+          <type name="TreeView" c:type="GtkTreeView*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -35884,7 +35895,7 @@
       </return-value>
       <parameters>
         <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
         <parameter name="column">
           <type name="int32" c:type="gint"/>
@@ -35893,7 +35904,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
         <parameter name="search_data">
           <type name="any" c:type="gpointer"/>
@@ -35906,10 +35917,10 @@
       </return-value>
       <parameters>
         <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
         <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -35922,10 +35933,10 @@
       </return-value>
       <parameters>
         <parameter name="tree_view">
-          <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+          <type name="TreeView" c:type="GtkTreeView*"/>
         </parameter>
         <parameter name="search_dialog">
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -35962,7 +35973,7 @@
       </method>
       <method name="get_selection" c:identifier="gtk_tree_view_get_selection">
         <return-value>
-          <type name="GtkTreeSelection" c:type="GtkTreeSelection*"/>
+          <type name="TreeSelection" c:type="GtkTreeSelection*"/>
         </return-value>
         <parameters>
           <parameter name="tree_view">
@@ -36193,7 +36204,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="dnotify">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
@@ -36212,7 +36223,7 @@
       </method>
       <method name="get_columns" c:identifier="gtk_tree_view_get_columns">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="tree_view">
@@ -36552,10 +36563,10 @@
             <type name="TreeViewColumn" c:type="GtkTreeViewColumn**"/>
           </parameter>
           <parameter name="cell_x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="cell_y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -36628,10 +36639,10 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="tx">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="ty">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -36651,10 +36662,10 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="wx">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="wy">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -36951,7 +36962,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
@@ -36971,10 +36982,10 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="tx">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="ty">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -36994,10 +37005,10 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="wx">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="wy">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -37017,10 +37028,10 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="bx">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="by">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -37040,10 +37051,10 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="wx">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="wy">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -37063,10 +37074,10 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="bx">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="by">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -37086,10 +37097,10 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="tx">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="ty">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -37368,7 +37379,7 @@
             <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
           <parameter name="tooltip">
-            <type name="GtkTooltip" c:type="GtkTooltip*"/>
+            <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
           <parameter name="path">
             <type name="TreePath" c:type="GtkTreePath*"/>
@@ -37385,7 +37396,7 @@
             <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
           <parameter name="tooltip">
-            <type name="GtkTooltip" c:type="GtkTooltip*"/>
+            <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
           <parameter name="path">
             <type name="TreePath" c:type="GtkTreePath*"/>
@@ -37408,10 +37419,10 @@
             <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="keyboard_tip">
             <type name="boolean" c:type="gboolean"/>
@@ -37453,13 +37464,13 @@
         </parameters>
       </method>
       <property name="model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+        <type name="TreeModel" c:type="GtkTreeModel"/>
       </property>
       <property name="hadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+        <type name="Adjustment" c:type="GtkAdjustment"/>
       </property>
       <property name="vadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+        <type name="Adjustment" c:type="GtkAdjustment"/>
       </property>
       <property name="headers-visible">
         <type name="boolean" c:type="gboolean"/>
@@ -37468,7 +37479,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="expander-column">
-        <type name="GtkTreeViewColumn" c:type="GtkTreeViewColumn"/>
+        <type name="TreeViewColumn" c:type="GtkTreeViewColumn"/>
       </property>
       <property name="reorderable">
         <type name="boolean" c:type="gboolean"/>
@@ -37501,7 +37512,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="enable-grid-lines">
-        <type name="GtkTreeViewGridLines" c:type="GtkTreeViewGridLines"/>
+        <type name="TreeViewGridLines" c:type="GtkTreeViewGridLines"/>
       </property>
       <property name="enable-tree-lines">
         <type name="boolean" c:type="gboolean"/>
@@ -37515,13 +37526,13 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
           <parameter name="hadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
           <parameter name="vadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </callback>
@@ -37531,13 +37542,13 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
           <parameter name="column">
-            <type name="GtkTreeViewColumn*" c:type="GtkTreeViewColumn*"/>
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </callback>
@@ -37547,13 +37558,13 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </callback>
@@ -37563,13 +37574,13 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </callback>
@@ -37579,13 +37590,13 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </callback>
@@ -37595,13 +37606,13 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
           <parameter name="iter">
-            <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </callback>
@@ -37611,7 +37622,7 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -37621,7 +37632,7 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -37631,10 +37642,10 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
           <parameter name="step">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="count">
             <type name="int32" c:type="gint"/>
@@ -37647,7 +37658,7 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -37657,7 +37668,7 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -37667,7 +37678,7 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
           <parameter name="start_editing">
             <type name="boolean" c:type="gboolean"/>
@@ -37680,7 +37691,7 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -37690,7 +37701,7 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
           <parameter name="logical">
             <type name="boolean" c:type="gboolean"/>
@@ -37709,7 +37720,7 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -37719,7 +37730,7 @@
         </return-value>
         <parameters>
           <parameter name="tree_view">
-            <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -37754,7 +37765,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="p0">
             <type name="int32" c:type="gint"/>
@@ -37767,10 +37778,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -37780,10 +37791,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTreeViewColumn" c:type="GtkTreeViewColumn"/>
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -37793,10 +37804,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+            <type name="TreeIter" c:type="GtkTreeIter"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -37806,10 +37817,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+            <type name="TreeIter" c:type="GtkTreeIter"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -37819,10 +37830,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+            <type name="TreeIter" c:type="GtkTreeIter"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -37832,10 +37843,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTreeIter" c:type="GtkTreeIter"/>
+            <type name="TreeIter" c:type="GtkTreeIter"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -37903,13 +37914,13 @@
     </class>
     <function name="tree_view_new" c:identifier="gtk_tree_view_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="model">
@@ -37923,10 +37934,10 @@
       </return-value>
       <parameters>
         <parameter name="tree_view">
-          <type name="GtkTreeView*" c:type="GtkTreeView*"/>
+          <type name="TreeView" c:type="GtkTreeView*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
         <parameter name="children">
           <type name="int32" c:type="gint"/>
@@ -38295,7 +38306,7 @@
         </parameters>
       </method>
       <property name="model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+        <type name="TreeModel" c:type="GtkTreeModel"/>
       </property>
       <property name="wrap-width">
         <type name="int32" c:type="gint"/>
@@ -38330,7 +38341,7 @@
         </return-value>
         <parameters>
           <parameter name="combo_box">
-            <type name="GtkComboBox*" c:type="GtkComboBox*"/>
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
         </parameters>
       </callback>
@@ -38340,7 +38351,7 @@
         </return-value>
         <parameters>
           <parameter name="combo_box">
-            <type name="GtkComboBox*" c:type="GtkComboBox*"/>
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
         </parameters>
       </callback>
@@ -38370,7 +38381,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -38387,13 +38398,13 @@
     </class>
     <function name="combo_box_new" c:identifier="gtk_combo_box_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="model">
@@ -38403,7 +38414,7 @@
     </function>
     <function name="combo_box_new_text" c:identifier="gtk_combo_box_new_text">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="combo_box_editing_canceled"
@@ -38475,13 +38486,13 @@
     <function name="combo_box_entry_new"
               c:identifier="gtk_combo_box_entry_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="model">
@@ -38495,7 +38506,7 @@
     <function name="combo_box_entry_new_text"
               c:identifier="gtk_combo_box_entry_new_text">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <class name="HBox"
@@ -38506,7 +38517,7 @@
     </class>
     <function name="hbox_new" c:identifier="gtk_hbox_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="homogeneous">
@@ -38606,7 +38617,7 @@
             <type name="Combo" c:type="GtkCombo*"/>
           </parameter>
           <parameter name="strings">
-            <type name="GList" c:type="GList*"/>
+            <type name="GLib.GList" c:type="GList*"/>
           </parameter>
         </parameters>
       </method>
@@ -38659,7 +38670,7 @@
     </class>
     <function name="combo_new" c:identifier="gtk_combo_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <record name="GtkCTree" c:type="GtkCTree">
@@ -38667,7 +38678,7 @@
         <type name="GtkCList" c:type="GtkCList"/>
       </field>
       <field name="lines_gc">
-        <type name="GdkGC*" c:type="GdkGC*"/>
+        <type name="Gdk.GC" c:type="GdkGC*"/>
       </field>
       <field name="tree_indent">
         <type name="int32" c:type="gint"/>
@@ -38679,13 +38690,13 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="line_style">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="expander_style">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="show_stub">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="drag_compare">
         <type name="GtkCTreeCompareDragFunc" c:type="GtkCTreeCompareDragFunc"/>
@@ -38696,10 +38707,10 @@
         </return-value>
         <parameters>
           <parameter name="ctree">
-            <type name="GtkCTree*" c:type="GtkCTree*"/>
+            <type name="GtkCTree" c:type="GtkCTree*"/>
           </parameter>
           <parameter name="row">
-            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+            <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
           <parameter name="column">
             <type name="int32" c:type="gint"/>
@@ -38712,10 +38723,10 @@
         </return-value>
         <parameters>
           <parameter name="ctree">
-            <type name="GtkCTree*" c:type="GtkCTree*"/>
+            <type name="GtkCTree" c:type="GtkCTree*"/>
           </parameter>
           <parameter name="row">
-            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+            <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
           <parameter name="column">
             <type name="int32" c:type="gint"/>
@@ -38728,10 +38739,10 @@
         </return-value>
         <parameters>
           <parameter name="ctree">
-            <type name="GtkCTree*" c:type="GtkCTree*"/>
+            <type name="GtkCTree" c:type="GtkCTree*"/>
           </parameter>
           <parameter name="node">
-            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+            <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
       </callback>
@@ -38741,10 +38752,10 @@
         </return-value>
         <parameters>
           <parameter name="ctree">
-            <type name="GtkCTree*" c:type="GtkCTree*"/>
+            <type name="GtkCTree" c:type="GtkCTree*"/>
           </parameter>
           <parameter name="node">
-            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+            <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
       </callback>
@@ -38754,16 +38765,16 @@
         </return-value>
         <parameters>
           <parameter name="ctree">
-            <type name="GtkCTree*" c:type="GtkCTree*"/>
+            <type name="GtkCTree" c:type="GtkCTree*"/>
           </parameter>
           <parameter name="node">
-            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+            <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
           <parameter name="new_parent">
-            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+            <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
           <parameter name="new_sibling">
-            <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+            <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
       </callback>
@@ -38773,10 +38784,10 @@
         </return-value>
         <parameters>
           <parameter name="ctree">
-            <type name="GtkCTree*" c:type="GtkCTree*"/>
+            <type name="GtkCTree" c:type="GtkCTree*"/>
           </parameter>
           <parameter name="action">
-            <type name="GtkCTreeExpansionType" c:type="GtkCTreeExpansionType"/>
+            <type name="CTreeExpansionType" c:type="GtkCTreeExpansionType"/>
           </parameter>
         </parameters>
       </callback>
@@ -38786,39 +38797,39 @@
         <type name="GtkCListRow" c:type="GtkCListRow"/>
       </field>
       <field name="parent">
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
       </field>
       <field name="sibling">
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
       </field>
       <field name="children">
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
       </field>
       <field name="pixmap_closed">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
       </field>
       <field name="mask_closed">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+        <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
       </field>
       <field name="pixmap_opened">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
       </field>
       <field name="mask_opened">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+        <type name="Gdk.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"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="expanded">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <record name="GtkCTreeNode" c:type="GtkCTreeNode">
       <field name="list">
-        <type name="GList" c:type="GList"/>
+        <type name="GLib.GList" c:type="GList"/>
       </field>
     </record>
     <callback name="GtkCTreeFunc">
@@ -38827,10 +38838,10 @@
       </return-value>
       <parameters>
         <parameter name="ctree">
-          <type name="GtkCTree*" c:type="GtkCTree*"/>
+          <type name="GtkCTree" c:type="GtkCTree*"/>
         </parameter>
         <parameter name="node">
-          <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -38843,16 +38854,16 @@
       </return-value>
       <parameters>
         <parameter name="ctree">
-          <type name="GtkCTree*" c:type="GtkCTree*"/>
+          <type name="GtkCTree" c:type="GtkCTree*"/>
         </parameter>
         <parameter name="depth">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="gnode">
-          <type name="GNode*" c:type="GNode*"/>
+          <type name="GLib.GNode" c:type="GNode*"/>
         </parameter>
         <parameter name="cnode">
-          <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -38865,16 +38876,16 @@
       </return-value>
       <parameters>
         <parameter name="ctree">
-          <type name="GtkCTree*" c:type="GtkCTree*"/>
+          <type name="GtkCTree" c:type="GtkCTree*"/>
         </parameter>
         <parameter name="source_node">
-          <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
         </parameter>
         <parameter name="new_parent">
-          <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
         </parameter>
         <parameter name="new_sibling">
-          <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
         </parameter>
       </parameters>
     </callback>
@@ -38886,7 +38897,7 @@
     <function name="ctree_new_with_titles"
               c:identifier="gtk_ctree_new_with_titles">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="columns">
@@ -38902,7 +38913,7 @@
     </function>
     <function name="ctree_new" c:identifier="gtk_ctree_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="columns">
@@ -38915,7 +38926,7 @@
     </function>
     <function name="ctree_insert_node" c:identifier="gtk_ctree_insert_node">
       <return-value>
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
       </return-value>
       <parameters>
         <parameter name="ctree">
@@ -38937,13 +38948,13 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
         <parameter name="mask_closed" allow-none="1">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+          <type name="Gdk.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*"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
         <parameter name="is_leaf">
           <type name="boolean" c:type="gboolean"/>
@@ -38968,7 +38979,7 @@
     </function>
     <function name="ctree_insert_gnode" c:identifier="gtk_ctree_insert_gnode">
       <return-value>
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
       </return-value>
       <parameters>
         <parameter name="ctree">
@@ -38981,7 +38992,7 @@
           <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
         </parameter>
         <parameter name="gnode">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="GLib.GNode" c:type="GNode*"/>
         </parameter>
         <parameter name="func">
           <type name="GtkCTreeGNodeFunc" c:type="GtkCTreeGNodeFunc"/>
@@ -38994,17 +39005,17 @@
     <function name="ctree_export_to_gnode"
               c:identifier="gtk_ctree_export_to_gnode">
       <return-value>
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GLib.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*"/>
+          <type name="GLib.GNode" c:type="GNode*"/>
         </parameter>
         <parameter name="sibling">
-          <type name="GNode" c:type="GNode*"/>
+          <type name="GLib.GNode" c:type="GNode*"/>
         </parameter>
         <parameter name="node">
           <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
@@ -39118,7 +39129,7 @@
     </function>
     <function name="ctree_last" c:identifier="gtk_ctree_last">
       <return-value>
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
       </return-value>
       <parameters>
         <parameter name="ctree">
@@ -39132,7 +39143,7 @@
     <function name="ctree_find_node_ptr"
               c:identifier="gtk_ctree_find_node_ptr">
       <return-value>
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
       </return-value>
       <parameters>
         <parameter name="ctree">
@@ -39145,14 +39156,14 @@
     </function>
     <function name="ctree_node_nth" c:identifier="gtk_ctree_node_nth">
       <return-value>
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        <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"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -39191,7 +39202,7 @@
     <function name="ctree_find_by_row_data"
               c:identifier="gtk_ctree_find_by_row_data">
       <return-value>
-        <type name="GtkCTreeNode*" c:type="GtkCTreeNode*"/>
+        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
       </return-value>
       <parameters>
         <parameter name="ctree">
@@ -39208,7 +39219,7 @@
     <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*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="ctree">
@@ -39225,7 +39236,7 @@
     <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*"/>
+        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
       </return-value>
       <parameters>
         <parameter name="ctree">
@@ -39238,14 +39249,14 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+          <type name="GLib.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*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="ctree">
@@ -39258,7 +39269,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+          <type name="GLib.GCompareFunc" c:type="GCompareFunc"/>
         </parameter>
       </parameters>
     </function>
@@ -39523,7 +39534,7 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
         <parameter name="mask" allow-none="1">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
       </parameters>
     </function>
@@ -39552,7 +39563,7 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
         <parameter name="mask" allow-none="1">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
       </parameters>
     </function>
@@ -39578,13 +39589,13 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
         <parameter name="mask_closed" allow-none="1">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+          <type name="Gdk.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*"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
         <parameter name="is_leaf">
           <type name="boolean" c:type="gboolean"/>
@@ -39651,7 +39662,7 @@
     <function name="ctree_node_get_cell_type"
               c:identifier="gtk_ctree_node_get_cell_type">
       <return-value>
-        <type name="GtkCellType" c:type="GtkCellType"/>
+        <type name="CellType" c:type="GtkCellType"/>
       </return-value>
       <parameters>
         <parameter name="ctree">
@@ -39681,7 +39692,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="text">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -39704,7 +39715,7 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
         </parameter>
         <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
         </parameter>
       </parameters>
     </function>
@@ -39724,7 +39735,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="text">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </parameter>
         <parameter name="spacing">
           <type name="guint8" c:type="guint8*"/>
@@ -39733,7 +39744,7 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
         </parameter>
         <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
         </parameter>
       </parameters>
     </function>
@@ -39750,7 +39761,7 @@
           <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
         </parameter>
         <parameter name="text">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </parameter>
         <parameter name="spacing">
           <type name="guint8" c:type="guint8*"/>
@@ -39759,19 +39770,19 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
         </parameter>
         <parameter name="mask_closed">
-          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+          <type name="Gdk.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**"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
         </parameter>
         <parameter name="is_leaf">
-          <type name="gboolean" c:type="gboolean*"/>
+          <type name="GLib.gboolean" c:type="gboolean*"/>
         </parameter>
         <parameter name="expanded">
-          <type name="gboolean" c:type="gboolean*"/>
+          <type name="GLib.gboolean" c:type="gboolean*"/>
         </parameter>
       </parameters>
     </function>
@@ -39795,7 +39806,7 @@
     <function name="ctree_node_get_row_style"
               c:identifier="gtk_ctree_node_get_row_style">
       <return-value>
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="Style" c:type="GtkStyle*"/>
       </return-value>
       <parameters>
         <parameter name="ctree">
@@ -39829,7 +39840,7 @@
     <function name="ctree_node_get_cell_style"
               c:identifier="gtk_ctree_node_get_cell_style">
       <return-value>
-        <type name="GtkStyle*" c:type="GtkStyle*"/>
+        <type name="Style" c:type="GtkStyle*"/>
       </return-value>
       <parameters>
         <parameter name="ctree">
@@ -39953,7 +39964,7 @@
     <function name="ctree_node_is_visible"
               c:identifier="gtk_ctree_node_is_visible">
       <return-value>
-        <type name="GtkVisibility" c:type="GtkVisibility"/>
+        <type name="Visibility" c:type="GtkVisibility"/>
       </return-value>
       <parameters>
         <parameter name="ctree">
@@ -40118,7 +40129,7 @@
     </class>
     <function name="drawing_area_new" c:identifier="gtk_drawing_area_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <class name="Curve"
@@ -40217,7 +40228,7 @@
         </parameters>
       </method>
       <property name="curve-type">
-        <type name="GtkCurveType" c:type="GtkCurveType"/>
+        <type name="CurveType" c:type="GtkCurveType"/>
       </property>
       <property name="min-x">
         <type name="float" c:type="gfloat"/>
@@ -40237,7 +40248,7 @@
         </return-value>
         <parameters>
           <parameter name="curve">
-            <type name="GtkCurve*" c:type="GtkCurve*"/>
+            <type name="Curve" c:type="GtkCurve*"/>
           </parameter>
         </parameters>
       </callback>
@@ -40269,7 +40280,7 @@
     </class>
     <function name="curve_new" c:identifier="gtk_curve_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <class name="EventBox"
@@ -40336,7 +40347,7 @@
     </class>
     <function name="event_box_new" c:identifier="gtk_event_box_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <record name="GtkExpanderPrivate" c:type="GtkExpanderPrivate"/>
@@ -40503,7 +40514,7 @@
         <type name="int32" c:type="gint"/>
       </property>
       <property name="label-widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
+        <type name="Widget" c:type="GtkWidget"/>
       </property>
       <callback name="activate">
         <return-value>
@@ -40511,7 +40522,7 @@
         </return-value>
         <parameters>
           <parameter name="expander">
-            <type name="GtkExpander*" c:type="GtkExpander*"/>
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
         </parameters>
       </callback>
@@ -40523,7 +40534,7 @@
     </class>
     <function name="expander_new" c:identifier="gtk_expander_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -40534,7 +40545,7 @@
     <function name="expander_new_with_mnemonic"
               c:identifier="gtk_expander_new_with_mnemonic">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label" allow-none="1">
@@ -40544,7 +40555,7 @@
     </function>
     <record name="GtkFileFilterInfo" c:type="GtkFileFilterInfo">
       <field name="contains">
-        <type name="GtkFileFilterFlags" c:type="GtkFileFilterFlags"/>
+        <type name="FileFilterFlags" c:type="GtkFileFilterFlags"/>
       </field>
       <field name="filename">
         <type name="string" c:type="gchar*"/>
@@ -40565,7 +40576,7 @@
       </return-value>
       <parameters>
         <parameter name="filter_info">
-          <type name="GtkFileFilterInfo*" c:type="GtkFileFilterInfo*"/>
+          <type name="GtkFileFilterInfo" c:type="GtkFileFilterInfo*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -40661,7 +40672,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="notify">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
@@ -40694,286 +40705,39 @@
                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 name="file-system-backend">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <property name="local-only">
+      <property name="select-multiple">
         <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 name="preview-widget">
+        <type name="Widget" c:type="GtkWidget"/>
       </property>
       <property name="extra-widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
+        <type name="Widget" c:type="GtkWidget"/>
       </property>
-      <property name="select-multiple">
+      <property name="use-preview-label">
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="preview-widget-active">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="use-preview-label">
+      <property name="do-overwrite-confirmation">
         <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>
-      </callback>
-      <callback name="get_current_folder">
-        <return-value>
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_current_name">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_path">
-        <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>
-      </callback>
-      <callback name="unselect_path">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="unselect_all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_paths">
-        <return-value>
-          <type name="GSList*" c:type="GSList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_preview_path">
-        <return-value>
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_file_system">
-        <return-value>
-          <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="add_filter">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-          <parameter name="filter">
-            <type name="GtkFileFilter*" c:type="GtkFileFilter*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove_filter">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-          <parameter name="filter">
-            <type name="GtkFileFilter*" c:type="GtkFileFilter*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="list_filters">
-        <return-value>
-          <type name="GSList*" c:type="GSList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="add_shortcut_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>
-      </callback>
-      <callback name="remove_shortcut_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>
-      </callback>
-      <callback name="list_shortcut_folders">
-        <return-value>
-          <type name="GSList*" c:type="GSList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="current_folder_changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="selection_changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="update_preview">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="file_activated">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="confirm_overwrite">
-        <return-value>
-          <type name="GtkFileChooserConfirmation"
-                c:type="GtkFileChooserConfirmation"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="GtkFileChooser*" c:type="GtkFileChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
+      <property name="filter">
+        <type name="FileFilter" c:type="GtkFileFilter"/>
+      </property>
+      <property name="local-only">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="action">
+        <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+      </property>
       <glib:signal name="current-folder-changed">
         <return-value>
           <type name="none" c:type="void"/>
@@ -40996,7 +40760,7 @@
       </glib:signal>
       <glib:signal name="confirm-overwrite">
         <return-value>
-          <type name="GtkFileChooserConfirmation"
+          <type name="FileChooserConfirmation"
                 c:type="GtkFileChooserConfirmation"/>
         </return-value>
       </glib:signal>
@@ -41004,7 +40768,7 @@
     <function name="file_chooser_error_quark"
               c:identifier="gtk_file_chooser_error_quark">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="GLib.GQuark" c:type="GQuark"/>
       </return-value>
     </function>
     <function name="file_chooser_set_action"
@@ -41024,7 +40788,7 @@
     <function name="file_chooser_get_action"
               c:identifier="gtk_file_chooser_get_action">
       <return-value>
-        <type name="GtkFileChooserAction" c:type="GtkFileChooserAction"/>
+        <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
       </return-value>
       <parameters>
         <parameter name="chooser">
@@ -41224,7 +40988,7 @@
     <function name="file_chooser_get_filenames"
               c:identifier="gtk_file_chooser_get_filenames">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="chooser">
@@ -41313,7 +41077,7 @@
     <function name="file_chooser_get_uris"
               c:identifier="gtk_file_chooser_get_uris">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="chooser">
@@ -41363,7 +41127,7 @@
     <function name="file_chooser_get_preview_widget"
               c:identifier="gtk_file_chooser_get_preview_widget">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="chooser">
@@ -41460,7 +41224,7 @@
     <function name="file_chooser_get_extra_widget"
               c:identifier="gtk_file_chooser_get_extra_widget">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="chooser">
@@ -41499,7 +41263,7 @@
     <function name="file_chooser_list_filters"
               c:identifier="gtk_file_chooser_list_filters">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="chooser">
@@ -41524,7 +41288,7 @@
     <function name="file_chooser_get_filter"
               c:identifier="gtk_file_chooser_get_filter">
       <return-value>
-        <type name="GtkFileFilter*" c:type="GtkFileFilter*"/>
+        <type name="FileFilter" c:type="GtkFileFilter*"/>
       </return-value>
       <parameters>
         <parameter name="chooser">
@@ -41545,7 +41309,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -41562,14 +41326,14 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.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*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="chooser">
@@ -41590,7 +41354,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -41607,14 +41371,14 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.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*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="chooser">
@@ -41705,7 +41469,7 @@
         </parameters>
       </method>
       <property name="dialog">
-        <type name="GtkFileChooser" c:type="GtkFileChooser"/>
+        <type name="FileChooser" c:type="GtkFileChooser"/>
       </property>
       <property name="focus-on-click">
         <type name="boolean" c:type="gboolean"/>
@@ -41722,7 +41486,7 @@
         </return-value>
         <parameters>
           <parameter name="fc">
-            <type name="GtkFileChooserButton*" c:type="GtkFileChooserButton*"/>
+            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -41756,7 +41520,7 @@
     <function name="file_chooser_button_new"
               c:identifier="gtk_file_chooser_button_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="title">
@@ -41770,7 +41534,7 @@
     <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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="title">
@@ -41787,7 +41551,7 @@
     <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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="dialog">
@@ -41796,17 +41560,7 @@
       </parameters>
     </function>
     <record name="GtkFileChooserDialogPrivate"
-            c:type="GtkFileChooserDialogPrivate">
-      <field name="widget">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </field>
-      <field name="file_system">
-        <type name="string" c:type="char*"/>
-      </field>
-      <field name="response_requested">
-        <type name="boolean" c:type="gboolean"/>
-      </field>
-    </record>
+            c:type="GtkFileChooserDialogPrivate"/>
     <class name="FileChooserDialog"
            c:type="GtkFileChooserDialog"
            parent="Dialog"
@@ -41816,7 +41570,7 @@
     <function name="file_chooser_dialog_new"
               c:identifier="gtk_file_chooser_dialog_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="title">
@@ -41836,7 +41590,7 @@
     <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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="title">
@@ -41856,108 +41610,282 @@
         </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">
+    <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="GQuark" c:type="GQuark"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
+      <parameters>
+        <parameter name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+        </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">
-        <return-value>
-          <type name="FileInfo" c:type="GtkFileInfo*"/>
-        </return-value>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_file_info_copy">
-        <return-value>
-          <type name="FileInfo" c:type="GtkFileInfo*"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_file_info_free">
+    <function name="file_chooser_widget_new_with_backend"
+              c:identifier="gtk_file_chooser_widget_new_with_backend">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+        </parameter>
+        <parameter name="backend">
+          <type name="string" c:type="gchar*"/>
+        </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">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          </parameter>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_display_name"
-              c:identifier="gtk_file_info_get_display_name">
+      <method name="get_filename"
+              c:identifier="gtk_file_selection_get_filename">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_display_key"
-              c:identifier="gtk_file_info_get_display_key">
+      <method name="complete" c:identifier="gtk_file_selection_complete">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          </parameter>
+          <parameter name="pattern">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_display_name"
-              c:identifier="gtk_file_info_set_display_name">
+      <method name="show_fileop_buttons"
+              c:identifier="gtk_file_selection_show_fileop_buttons">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="hide_fileop_buttons"
+              c:identifier="gtk_file_selection_hide_fileop_buttons">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_selections"
+              c:identifier="gtk_file_selection_get_selections">
+        <return-value>
+          <type name="GLib.gchar" c:type="gchar**"/>
+        </return-value>
+        <parameters>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_select_multiple"
+              c:identifier="gtk_file_selection_set_select_multiple">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          </parameter>
+          <parameter name="select_multiple">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_select_multiple"
+              c:identifier="gtk_file_selection_get_select_multiple">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          </parameter>
+        </parameters>
+      </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="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="file_selection_new" c:identifier="gtk_file_selection_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="title">
+          <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="GLib.GQuark" c:type="GQuark"/>
+      </return-value>
+    </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">
+        <return-value>
+          <type name="FileInfo" c:type="GtkFileInfo*"/>
+        </return-value>
+      </constructor>
+      <constructor name="copy" c:identifier="gtk_file_info_copy">
+        <return-value>
+          <type name="FileInfo" c:type="GtkFileInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="free" c:identifier="gtk_file_info_free">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_display_name"
+              c:identifier="gtk_file_info_get_display_name">
+        <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="get_display_key"
+              c:identifier="gtk_file_info_get_display_key">
+        <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="set_display_name"
+              c:identifier="gtk_file_info_set_display_name">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -42125,14 +42053,14 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
     </glib:boxed>
     <class name="FileSystemHandle"
            c:type="GtkFileSystemHandle"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkFileSystemHandle"
            glib:get-type="gtk_file_system_handle_get_type">
       <property name="cancelled">
@@ -42145,13 +42073,13 @@
       </return-value>
       <parameters>
         <parameter name="handle">
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
         </parameter>
         <parameter name="file_info">
-          <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
+          <type name="FileInfo" c:type="GtkFileInfo*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError*" c:type="GError*"/>
+          <type name="GLib.GError" c:type="GError*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -42164,13 +42092,13 @@
       </return-value>
       <parameters>
         <parameter name="handle">
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
         </parameter>
         <parameter name="folder">
-          <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+          <type name="FileFolder" c:type="GtkFileFolder*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError*" c:type="GError*"/>
+          <type name="GLib.GError" c:type="GError*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -42183,13 +42111,13 @@
       </return-value>
       <parameters>
         <parameter name="handle">
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError*" c:type="GError*"/>
+          <type name="GLib.GError" c:type="GError*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -42202,13 +42130,13 @@
       </return-value>
       <parameters>
         <parameter name="handle">
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
         </parameter>
         <parameter name="volume">
-          <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError*" c:type="GError*"/>
+          <type name="GLib.GError" c:type="GError*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -42221,37 +42149,37 @@
                glib:get-type="gtk_file_system_get_type">
       <callback name="list_volumes">
         <return-value>
-          <type name="GSList*" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_volume_for_path">
         <return-value>
-          <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+            <type name="FilePath" c:type="GtkFilePath*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_folder">
         <return-value>
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+            <type name="FilePath" c:type="GtkFilePath*"/>
           </parameter>
           <parameter name="types">
             <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
@@ -42267,14 +42195,14 @@
       </callback>
       <callback name="get_info">
         <return-value>
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+            <type name="FilePath" c:type="GtkFilePath*"/>
           </parameter>
           <parameter name="types">
             <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
@@ -42290,14 +42218,14 @@
       </callback>
       <callback name="create_folder">
         <return-value>
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+            <type name="FilePath" c:type="GtkFilePath*"/>
           </parameter>
           <parameter name="callback">
             <type name="GtkFileSystemCreateFolderCallback"
@@ -42314,7 +42242,7 @@
         </return-value>
         <parameters>
           <parameter name="handle">
-            <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+            <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
           </parameter>
         </parameters>
       </callback>
@@ -42324,23 +42252,23 @@
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+            <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="volume_get_base_path">
         <return-value>
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+            <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
           </parameter>
         </parameters>
       </callback>
@@ -42350,23 +42278,23 @@
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+            <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="volume_mount">
         <return-value>
-          <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+            <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
           </parameter>
           <parameter name="callback">
             <type name="GtkFileSystemVolumeMountCallback"
@@ -42383,10 +42311,10 @@
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+            <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
           </parameter>
         </parameters>
       </callback>
@@ -42396,13 +42324,13 @@
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="volume">
-            <type name="GtkFileSystemVolume*" c:type="GtkFileSystemVolume*"/>
+            <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -42412,35 +42340,35 @@
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+            <type name="FilePath" c:type="GtkFilePath*"/>
           </parameter>
           <parameter name="parent">
-            <type name="GtkFilePath**" c:type="GtkFilePath**"/>
+            <type name="FilePath" c:type="GtkFilePath**"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="make_path">
         <return-value>
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="base_path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+            <type name="FilePath" c:type="GtkFilePath*"/>
           </parameter>
           <parameter name="display_name">
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -42450,22 +42378,22 @@
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="base_path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+            <type name="FilePath" c:type="GtkFilePath*"/>
           </parameter>
           <parameter name="str">
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="folder">
-            <type name="GtkFilePath**" c:type="GtkFilePath**"/>
+            <type name="FilePath" c:type="GtkFilePath**"/>
           </parameter>
           <parameter name="file_part">
-            <type name="gchar**" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -42475,10 +42403,10 @@
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+            <type name="FilePath" c:type="GtkFilePath*"/>
           </parameter>
         </parameters>
       </callback>
@@ -42488,20 +42416,20 @@
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+            <type name="FilePath" c:type="GtkFilePath*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="uri_to_path">
         <return-value>
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="uri">
             <type name="string" c:type="gchar*"/>
@@ -42510,11 +42438,11 @@
       </callback>
       <callback name="filename_to_path">
         <return-value>
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="path">
             <type name="string" c:type="gchar*"/>
@@ -42527,16 +42455,16 @@
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+            <type name="FilePath" c:type="GtkFilePath*"/>
           </parameter>
           <parameter name="position">
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -42546,23 +42474,23 @@
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+            <type name="FilePath" c:type="GtkFilePath*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="list_bookmarks">
         <return-value>
-          <type name="GSList*" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -42572,7 +42500,7 @@
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -42582,7 +42510,7 @@
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -42592,10 +42520,10 @@
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+            <type name="FilePath" c:type="GtkFilePath*"/>
           </parameter>
         </parameters>
       </callback>
@@ -42605,10 +42533,10 @@
         </return-value>
         <parameters>
           <parameter name="file_system">
-            <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+            <type name="FileSystem" c:type="GtkFileSystem*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+            <type name="FilePath" c:type="GtkFilePath*"/>
           </parameter>
           <parameter name="label">
             <type name="string" c:type="gchar*"/>
@@ -42629,7 +42557,7 @@
     <function name="file_system_list_volumes"
               c:identifier="gtk_file_system_list_volumes">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="file_system">
@@ -42640,14 +42568,14 @@
     <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*"/>
+        <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*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
       </parameters>
     </function>
@@ -42668,7 +42596,7 @@
     <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*"/>
+        <type name="FilePath" c:type="GtkFilePath*"/>
       </return-value>
       <parameters>
         <parameter name="file_system">
@@ -42696,7 +42624,7 @@
     <function name="file_system_volume_mount"
               c:identifier="gtk_file_system_volume_mount">
       <return-value>
-        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+        <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
       </return-value>
       <parameters>
         <parameter name="file_system">
@@ -42731,7 +42659,7 @@
     <function name="file_system_volume_render_icon"
               c:identifier="gtk_file_system_volume_render_icon">
       <return-value>
-        <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+        <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
       </return-value>
       <parameters>
         <parameter name="file_system">
@@ -42747,7 +42675,7 @@
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -42764,7 +42692,7 @@
           <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -42778,27 +42706,27 @@
           <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
         <parameter name="parent">
-          <type name="GtkFilePath" c:type="GtkFilePath**"/>
+          <type name="FilePath" c:type="GtkFilePath**"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.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*"/>
+        <type name="FileSystemHandle" 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*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
         <parameter name="types">
           <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
@@ -42815,14 +42743,14 @@
     <function name="file_system_get_info"
               c:identifier="gtk_file_system_get_info">
       <return-value>
-        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+        <type name="FileSystemHandle" 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*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
         <parameter name="types">
           <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
@@ -42839,14 +42767,14 @@
     <function name="file_system_create_folder"
               c:identifier="gtk_file_system_create_folder">
       <return-value>
-        <type name="GtkFileSystemHandle*" c:type="GtkFileSystemHandle*"/>
+        <type name="FileSystemHandle" 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*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
         <parameter name="callback">
           <type name="GtkFileSystemCreateFolderCallback"
@@ -42871,20 +42799,20 @@
     <function name="file_system_make_path"
               c:identifier="gtk_file_system_make_path">
       <return-value>
-        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+        <type name="FilePath" c:type="GtkFilePath*"/>
       </return-value>
       <parameters>
         <parameter name="file_system">
           <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
         <parameter name="base_path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
         <parameter name="display_name">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -42897,19 +42825,19 @@
           <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
         <parameter name="base_path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
         <parameter name="str">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="folder">
-          <type name="GtkFilePath" c:type="GtkFilePath**"/>
+          <type name="FilePath" c:type="GtkFilePath**"/>
         </parameter>
         <parameter name="file_part">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -42923,7 +42851,7 @@
           <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
       </parameters>
     </function>
@@ -42937,14 +42865,14 @@
           <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_system_uri_to_path"
               c:identifier="gtk_file_system_uri_to_path">
       <return-value>
-        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+        <type name="FilePath" c:type="GtkFilePath*"/>
       </return-value>
       <parameters>
         <parameter name="file_system">
@@ -42958,7 +42886,7 @@
     <function name="file_system_filename_to_path"
               c:identifier="gtk_file_system_filename_to_path">
       <return-value>
-        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+        <type name="FilePath" c:type="GtkFilePath*"/>
       </return-value>
       <parameters>
         <parameter name="file_system">
@@ -42979,7 +42907,7 @@
           <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
       </parameters>
     </function>
@@ -42993,13 +42921,13 @@
           <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
         <parameter name="position">
           <type name="int32" c:type="gint"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -43013,17 +42941,17 @@
           <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.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*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="file_system">
@@ -43041,7 +42969,7 @@
           <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
       </parameters>
     </function>
@@ -43055,7 +42983,7 @@
           <type name="FileSystem" c:type="GtkFileSystem*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
         <parameter name="label">
           <type name="string" c:type="gchar*"/>
@@ -43068,17 +42996,17 @@
                glib:get-type="gtk_file_folder_get_type">
       <callback name="get_info">
         <return-value>
-          <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
+          <type name="FileInfo" c:type="GtkFileInfo*"/>
         </return-value>
         <parameters>
           <parameter name="folder">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+            <type name="FileFolder" c:type="GtkFileFolder*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkFilePath*" c:type="GtkFilePath*"/>
+            <type name="FilePath" c:type="GtkFilePath*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -43088,13 +43016,13 @@
         </return-value>
         <parameters>
           <parameter name="folder">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+            <type name="FileFolder" c:type="GtkFileFolder*"/>
           </parameter>
           <parameter name="children">
-            <type name="GSList**" c:type="GSList**"/>
+            <type name="GLib.GSList" c:type="GSList**"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -43104,7 +43032,7 @@
         </return-value>
         <parameters>
           <parameter name="monitor">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+            <type name="FileFolder" c:type="GtkFileFolder*"/>
           </parameter>
         </parameters>
       </callback>
@@ -43114,10 +43042,10 @@
         </return-value>
         <parameters>
           <parameter name="monitor">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+            <type name="FileFolder" c:type="GtkFileFolder*"/>
           </parameter>
           <parameter name="paths">
-            <type name="GSList*" c:type="GSList*"/>
+            <type name="GLib.GSList" c:type="GSList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -43127,10 +43055,10 @@
         </return-value>
         <parameters>
           <parameter name="monitor">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+            <type name="FileFolder" c:type="GtkFileFolder*"/>
           </parameter>
           <parameter name="paths">
-            <type name="GSList*" c:type="GSList*"/>
+            <type name="GLib.GSList" c:type="GSList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -43140,10 +43068,10 @@
         </return-value>
         <parameters>
           <parameter name="monitor">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+            <type name="FileFolder" c:type="GtkFileFolder*"/>
           </parameter>
           <parameter name="paths">
-            <type name="GSList*" c:type="GSList*"/>
+            <type name="GLib.GSList" c:type="GSList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -43153,7 +43081,7 @@
         </return-value>
         <parameters>
           <parameter name="folder">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+            <type name="FileFolder" c:type="GtkFileFolder*"/>
           </parameter>
         </parameters>
       </callback>
@@ -43163,7 +43091,7 @@
         </return-value>
         <parameters>
           <parameter name="folder">
-            <type name="GtkFileFolder*" c:type="GtkFileFolder*"/>
+            <type name="FileFolder" c:type="GtkFileFolder*"/>
           </parameter>
         </parameters>
       </callback>
@@ -43218,27 +43146,27 @@
           <type name="FileFolder" c:type="GtkFileFolder*"/>
         </parameter>
         <parameter name="children">
-          <type name="GSList" c:type="GSList**"/>
+          <type name="GLib.GSList" c:type="GSList**"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_folder_get_info"
               c:identifier="gtk_file_folder_get_info">
       <return-value>
-        <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
+        <type name="FileInfo" c:type="GtkFileInfo*"/>
       </return-value>
       <parameters>
         <parameter name="folder">
           <type name="FileFolder" c:type="GtkFileFolder*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkFilePath" c:type="GtkFilePath*"/>
+          <type name="FilePath" c:type="GtkFilePath*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -43260,21 +43188,21 @@
     </glib:boxed>
     <function name="file_paths_sort" c:identifier="gtk_file_paths_sort">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="paths">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_paths_copy" c:identifier="gtk_file_paths_copy">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="paths">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
@@ -43284,13 +43212,13 @@
       </return-value>
       <parameters>
         <parameter name="paths">
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
     <function name="file_system_create" c:identifier="gtk_file_system_create">
       <return-value>
-        <type name="GtkFileSystem*" c:type="GtkFileSystem*"/>
+        <type name="FileSystem" c:type="GtkFileSystem*"/>
       </return-value>
       <parameters>
         <parameter name="file_system_name">
@@ -43298,3183 +43226,636 @@
         </parameter>
       </parameters>
     </function>
-    <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="GType" c:type="GType"/>
-      </return-value>
-    </function>
-    <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="GtkFileSystemModel*" c:type="GtkFileSystemModel*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="root_path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="max_depth">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="types">
-          <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_model_get_info"
-              c:identifier="_gtk_file_system_model_get_info">
-      <return-value>
-        <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_model_get_path"
-              c:identifier="_gtk_file_system_model_get_path">
-      <return-value>
-        <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_model_set_show_hidden"
-              c:identifier="_gtk_file_system_model_set_show_hidden">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
-        </parameter>
-        <parameter name="show_hidden">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_model_set_show_folders"
-              c:identifier="_gtk_file_system_model_set_show_folders">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
-        </parameter>
-        <parameter name="show_folders">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_model_set_show_files"
-              c:identifier="_gtk_file_system_model_set_show_files">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
-        </parameter>
-        <parameter name="show_files">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <callback name="GtkFileSystemModelFilter">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="GtkFileSystemModel*" c:type="GtkFileSystemModel*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkFilePath*" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="info">
-          <type name="GtkFileInfo*" c:type="GtkFileInfo*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <function name="file_system_model_set_filter"
-              c:identifier="_gtk_file_system_model_set_filter">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
-        </parameter>
-        <parameter name="filter">
-          <type name="GtkFileSystemModelFilter"
-                c:type="GtkFileSystemModelFilter"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <callback name="GtkFileSystemModelPathFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="GtkFileSystemModel*" c:type="GtkFileSystemModel*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <function name="file_system_model_path_do"
-              c:identifier="_gtk_file_system_model_path_do">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <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="file_system_model_add_editable"
-              c:identifier="_gtk_file_system_model_add_editable">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_model_remove_editable"
-              c:identifier="_gtk_file_system_model_remove_editable">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="GtkFileSystemModel" c:type="GtkFileSystemModel*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <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*"/>
+    <record name="GtkFixedChild" c:type="GtkFixedChild">
+      <field name="widget">
+        <type name="Widget" c:type="GtkWidget*"/>
       </field>
-      <field name="groups">
-        <type name="gchar**" c:type="gchar**"/>
+      <field name="x">
+        <type name="int32" c:type="gint"/>
       </field>
-      <field name="is_private">
-        <type name="boolean" c:type="gboolean"/>
+      <field name="y">
+        <type name="int32" c:type="gint"/>
       </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="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">
-        <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">
+    <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="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="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="set_screen" c:identifier="gtk_recent_manager_set_screen">
+      </method>
+      <method name="move" c:identifier="gtk_fixed_move">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
           </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </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="add_item" c:identifier="gtk_recent_manager_add_item">
+      <method name="set_has_window" c:identifier="gtk_fixed_set_has_window">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="has_window">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_full" c:identifier="gtk_recent_manager_add_full">
+      <method name="get_has_window" c:identifier="gtk_fixed_get_has_window">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
-          </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
           </parameter>
-          <parameter name="recent_data">
-            <type name="GtkRecentData" c:type="GtkRecentData*"/>
+        </parameters>
+      </method>
+    </class>
+    <function name="fixed_new" c:identifier="gtk_fixed_new">
+      <return-value>
+        <type name="Widget" 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="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_item" c:identifier="gtk_recent_manager_remove_item">
+      <method name="set_title" c:identifier="gtk_font_button_set_title">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="uri">
+          <parameter name="title">
             <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">
+      <method name="get_use_font" c:identifier="gtk_font_button_get_use_font">
         <return-value>
-          <type name="GtkRecentInfo" c:type="GtkRecentInfo*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
+        </parameters>
+      </method>
+      <method name="set_use_font" c:identifier="gtk_font_button_set_use_font">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="use_font">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="has_item" c:identifier="gtk_recent_manager_has_item">
+      <method name="get_use_size" c:identifier="gtk_font_button_get_use_size">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
+        </parameters>
+      </method>
+      <method name="set_use_size" c:identifier="gtk_font_button_set_use_size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
+          </parameter>
+          <parameter name="use_size">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_item" c:identifier="gtk_recent_manager_move_item">
+      <method name="get_font_name"
+              c:identifier="gtk_font_button_get_font_name">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
+        </parameters>
+      </method>
+      <method name="set_font_name"
+              c:identifier="gtk_font_button_set_font_name">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="new_uri">
+          <parameter name="fontname">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="set_limit" c:identifier="gtk_recent_manager_set_limit">
+      <method name="get_show_style"
+              c:identifier="gtk_font_button_get_show_style">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
-          </parameter>
-          <parameter name="limit">
-            <type name="int32" c:type="gint"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_limit" c:identifier="gtk_recent_manager_get_limit">
+      <method name="set_show_style"
+              c:identifier="gtk_font_button_set_show_style">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <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_items" c:identifier="gtk_recent_manager_get_items">
+      <method name="get_show_size"
+              c:identifier="gtk_font_button_get_show_size">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="purge_items" c:identifier="gtk_recent_manager_purge_items">
+      <method name="set_show_size"
+              c:identifier="gtk_font_button_set_show_size">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="show_size">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <property name="filename">
+      <property name="title">
         <type name="string" c:type="gchararray"/>
       </property>
-      <property name="limit">
-        <type name="int32" c:type="gint"/>
+      <property name="font-name">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <property name="size">
-        <type name="int32" c:type="gint"/>
+      <property name="use-font">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="changed">
+      <property name="use-size">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-style">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-size">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="font_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="GtkRecentManager*" c:type="GtkRecentManager*"/>
+          <parameter name="gfp">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_recent1">
+      <callback name="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_recent2">
+      <callback name="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_recent3">
+      <callback name="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_recent4">
+      <callback name="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="changed">
+      <glib:signal name="font-set">
         <return-value>
           <type name="none" c:type="void"/>
         </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">
+    <function name="font_button_new" c:identifier="gtk_font_button_new">
+      <return-value>
+        <type name="Widget" 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="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="fontname">
+          <type name="string" 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="RecentInfo" c:type="GtkRecentInfo*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="unref" c:identifier="gtk_recent_info_unref">
+      </method>
+      <method name="get_font" c:identifier="gtk_font_selection_get_font">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GdkFont" c:type="GdkFont*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_uri" c:identifier="gtk_recent_info_get_uri">
+      <method name="set_font_name"
+              c:identifier="gtk_font_selection_set_font_name">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
+          </parameter>
+          <parameter name="fontname">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_display_name"
-              c:identifier="gtk_recent_info_get_display_name">
+      <method name="get_preview_text"
+              c:identifier="gtk_font_selection_get_preview_text">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_description"
-              c:identifier="gtk_recent_info_get_description">
+      <method name="set_preview_text"
+              c:identifier="gtk_font_selection_set_preview_text">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_mime_type"
-              c:identifier="gtk_recent_info_get_mime_type">
+      <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="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_added" c:identifier="gtk_recent_info_get_added">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="time_t" c:type="time_t"/>
+          <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="Widget" 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="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_modified" c:identifier="gtk_recent_info_get_modified">
+      <method name="get_font"
+              c:identifier="gtk_font_selection_dialog_get_font">
         <return-value>
-          <type name="time_t" c:type="time_t"/>
+          <type name="GdkFont" c:type="GdkFont*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visited" c:identifier="gtk_recent_info_get_visited">
+      <method name="set_font_name"
+              c:identifier="gtk_font_selection_dialog_set_font_name">
         <return-value>
-          <type name="time_t" c:type="time_t"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
+          </parameter>
+          <parameter name="fontname">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_private_hint"
-              c:identifier="gtk_recent_info_get_private_hint">
+      <method name="get_preview_text"
+              c:identifier="gtk_font_selection_dialog_get_preview_text">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_application_info"
-              c:identifier="gtk_recent_info_get_application_info">
+      <method name="set_preview_text"
+              c:identifier="gtk_font_selection_dialog_set_preview_text">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
-          <parameter name="app_name">
+          <parameter name="text">
             <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_applications"
-              c:identifier="gtk_recent_info_get_applications">
+      <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_dialog_new"
+              c:identifier="gtk_font_selection_dialog_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="title">
+          <type name="string" 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="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="gamma_curve_new" c:identifier="gtk_gamma_curve_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="gc_get" c:identifier="gtk_gc_get">
+      <return-value>
+        <type name="Gdk.GC" c:type="GdkGC*"/>
+      </return-value>
+      <parameters>
+        <parameter name="depth">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="colormap">
+          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+        </parameter>
+        <parameter name="values">
+          <type name="Gdk.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="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="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_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
-          <parameter name="length">
-            <type name="gsize" c:type="gsize*"/>
+          <parameter name="type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="last_application"
-              c:identifier="gtk_recent_info_last_application">
+      <method name="get_shadow_type"
+              c:identifier="gtk_handle_box_get_shadow_type">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="ShadowType" c:type="GtkShadowType"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="has_application"
-              c:identifier="gtk_recent_info_has_application">
+      <method name="set_handle_position"
+              c:identifier="gtk_handle_box_set_handle_position">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
-          <parameter name="app_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="position">
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_groups" c:identifier="gtk_recent_info_get_groups">
+      <method name="get_handle_position"
+              c:identifier="gtk_handle_box_get_handle_position">
         <return-value>
-          <type name="gchar" c:type="gchar**"/>
+          <type name="PositionType" c:type="GtkPositionType"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="gsize" c:type="gsize*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="has_group" c:identifier="gtk_recent_info_has_group">
+      <method name="set_snap_edge" c:identifier="gtk_handle_box_set_snap_edge">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
-          <parameter name="group_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="edge">
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_icon" c:identifier="gtk_recent_info_get_icon">
-        <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_short_name"
-              c:identifier="gtk_recent_info_get_short_name">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_uri_display"
-              c:identifier="gtk_recent_info_get_uri_display">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_age" c:identifier="gtk_recent_info_get_age">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="is_local" c:identifier="gtk_recent_info_is_local">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="exists" c:identifier="gtk_recent_info_exists">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="match" c:identifier="gtk_recent_info_match">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="info_a">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-          <parameter name="info_b">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </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>
-      <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="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="engine">
-            <type name="GtkSearchEngine*" c:type="GtkSearchEngine*"/>
-          </parameter>
-          <parameter name="query">
-            <type name="GtkQuery*" c:type="GtkQuery*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="start">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="engine">
-            <type name="GtkSearchEngine*" c:type="GtkSearchEngine*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="stop">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="engine">
-            <type name="GtkSearchEngine*" c:type="GtkSearchEngine*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="is_indexed">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="engine">
-            <type name="GtkSearchEngine*" c:type="GtkSearchEngine*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="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>
-      </callback>
-      <callback name="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>
-      </callback>
-      <callback name="finished">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="engine">
-            <type name="GtkSearchEngine*" c:type="GtkSearchEngine*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="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>
-      </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="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="engine">
-          <type name="GtkSearchEngine" c:type="GtkSearchEngine*"/>
-        </parameter>
-        <parameter name="query">
-          <type name="GtkQuery" c:type="GtkQuery*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="search_engine_start"
-              c:identifier="_gtk_search_engine_start">
-      <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_stop" c:identifier="_gtk_search_engine_stop">
-      <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_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="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="disable" c:identifier="gtk_tooltips_disable">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
-          </parameter>
-        </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>
-      <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="tooltips_data_get" c:identifier="gtk_tooltips_data_get">
-      <return-value>
-        <type name="GtkTooltipsData*" c:type="GtkTooltipsData*"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tooltips_get_info_from_tip_window"
-              c:identifier="gtk_tooltips_get_info_from_tip_window">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="tip_window">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="tooltips">
-          <type name="Tooltips" c:type="GtkTooltips**"/>
-        </parameter>
-        <parameter name="current_widget">
-          <type name="Widget" c:type="GtkWidget**"/>
-        </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">
-        <return-value>
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_child_path_to_path"
-              c:identifier="gtk_tree_model_sort_convert_child_path_to_path">
-        <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
-          </parameter>
-          <parameter name="child_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_child_iter_to_iter"
-              c:identifier="gtk_tree_model_sort_convert_child_iter_to_iter">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <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="convert_path_to_child_path"
-              c:identifier="gtk_tree_model_sort_convert_path_to_child_path">
-        <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
-          </parameter>
-          <parameter name="sorted_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_iter_to_child_iter"
-              c:identifier="gtk_tree_model_sort_convert_iter_to_child_iter">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <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="reset_default_sort_func"
-              c:identifier="gtk_tree_model_sort_reset_default_sort_func">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="clear_cache"
-              c:identifier="gtk_tree_model_sort_clear_cache">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="iter_is_valid"
-              c:identifier="gtk_tree_model_sort_iter_is_valid">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <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="model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
-      </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="tree_model_sort_new_with_model"
-              c:identifier="gtk_tree_model_sort_new_with_model">
-      <return-value>
-        <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
-      </return-value>
-      <parameters>
-        <parameter name="child_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <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="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="n_columns">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="types">
-            <type name="GType" c:type="GType*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_value" c:identifier="gtk_tree_store_set_value">
-        <return-value>
-          <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="column">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GValue" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set" c:identifier="gtk_tree_store_set">
-        <return-value>
-          <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>
-        </parameters>
-      </method>
-      <method name="set_valuesv" c:identifier="gtk_tree_store_set_valuesv">
-        <return-value>
-          <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="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_valist" c:identifier="gtk_tree_store_set_valist">
-        <return-value>
-          <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="var_args">
-            <type name="va_list" c:type="va_list"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove" c:identifier="gtk_tree_store_remove">
-        <return-value>
-          <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>
-        </parameters>
-      </method>
-      <method name="insert" c:identifier="gtk_tree_store_insert">
-        <return-value>
-          <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>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="insert_before" c:identifier="gtk_tree_store_insert_before">
-        <return-value>
-          <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>
-          <parameter name="sibling">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="insert_after" c:identifier="gtk_tree_store_insert_after">
-        <return-value>
-          <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>
-          <parameter name="sibling">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="insert_with_values"
-              c:identifier="gtk_tree_store_insert_with_values">
-        <return-value>
-          <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>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="insert_with_valuesv"
-              c:identifier="gtk_tree_store_insert_with_valuesv">
-        <return-value>
-          <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>
-          <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="prepend" c:identifier="gtk_tree_store_prepend">
-        <return-value>
-          <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>
-        </parameters>
-      </method>
-      <method name="append" c:identifier="gtk_tree_store_append">
-        <return-value>
-          <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>
-        </parameters>
-      </method>
-      <method name="is_ancestor" c:identifier="gtk_tree_store_is_ancestor">
-        <return-value>
-          <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="descendant">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="iter_depth" c:identifier="gtk_tree_store_iter_depth">
-        <return-value>
-          <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>
-        </parameters>
-      </method>
-      <method name="clear" c:identifier="gtk_tree_store_clear">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="iter_is_valid" c:identifier="gtk_tree_store_iter_is_valid">
-        <return-value>
-          <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>
-        </parameters>
-      </method>
-      <method name="reorder" c:identifier="gtk_tree_store_reorder">
-        <return-value>
-          <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>
-        </parameters>
-      </method>
-      <method name="swap" c:identifier="gtk_tree_store_swap">
-        <return-value>
-          <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>
-          <parameter name="b">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="move_before" c:identifier="gtk_tree_store_move_before">
-        <return-value>
-          <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="position" allow-none="1">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="move_after" c:identifier="gtk_tree_store_move_after">
-        <return-value>
-          <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="position" allow-none="1">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </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="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"/>
-      </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="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="klass">
-          <type name="GObjectClass" c:type="GObjectClass*"/>
-        </parameter>
-      </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>
-      </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="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="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="string" c:type="gchar*"/>
-        </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">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
-          </parameter>
-          <parameter name="filename">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_filename"
-              c:identifier="gtk_file_selection_get_filename">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="complete" c:identifier="gtk_file_selection_complete">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
-          </parameter>
-          <parameter name="pattern">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="show_fileop_buttons"
-              c:identifier="gtk_file_selection_show_fileop_buttons">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="hide_fileop_buttons"
-              c:identifier="gtk_file_selection_hide_fileop_buttons">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_selections"
-              c:identifier="gtk_file_selection_get_selections">
-        <return-value>
-          <type name="gchar" c:type="gchar**"/>
-        </return-value>
-        <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_select_multiple"
-              c:identifier="gtk_file_selection_set_select_multiple">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
-          </parameter>
-          <parameter name="select_multiple">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_select_multiple"
-              c:identifier="gtk_file_selection_get_select_multiple">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
-          </parameter>
-        </parameters>
-      </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="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="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="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="none" 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="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="move" c:identifier="gtk_fixed_move">
-        <return-value>
-          <type name="none" 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="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_has_window" c:identifier="gtk_fixed_set_has_window">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <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_has_window" c:identifier="gtk_fixed_get_has_window">
-        <return-value>
-          <type name="boolean" 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="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="string" 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="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <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="get_use_font" c:identifier="gtk_font_button_get_use_font">
-        <return-value>
-          <type name="boolean" 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="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <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="get_use_size" c:identifier="gtk_font_button_get_use_size">
-        <return-value>
-          <type name="boolean" 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="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-          <parameter name="use_size">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_font_name"
-              c:identifier="gtk_font_button_get_font_name">
-        <return-value>
-          <type name="string" 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="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-          <parameter name="fontname">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_show_style"
-              c:identifier="gtk_font_button_get_show_style">
-        <return-value>
-          <type name="boolean" 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="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <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_show_size"
-              c:identifier="gtk_font_button_get_show_size">
-        <return-value>
-          <type name="boolean" 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="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <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="title">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="font-name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="use-font">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="use-size">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="show-style">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="show-size">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="font_set">
-        <return-value>
-          <type name="none" 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="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="font-set">
-        <return-value>
-          <type name="none" 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="string" 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="string" 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="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="fontsel">
-            <type name="FontSelection" c:type="GtkFontSelection*"/>
-          </parameter>
-          <parameter name="fontname">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_preview_text"
-              c:identifier="gtk_font_selection_get_preview_text">
-        <return-value>
-          <type name="string" 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="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="fontsel">
-            <type name="FontSelection" c:type="GtkFontSelection*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <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="string" 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="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
-          </parameter>
-          <parameter name="fontname">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_preview_text"
-              c:identifier="gtk_font_selection_dialog_get_preview_text">
-        <return-value>
-          <type name="string" 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="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
-          </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="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="string" 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="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="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="int32" 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="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="none" 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="none" 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="none" 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">
+      <method name="get_snap_edge" c:identifier="gtk_handle_box_get_snap_edge">
         <return-value>
           <type name="PositionType" c:type="GtkPositionType"/>
         </return-value>
@@ -46485,16 +43866,16 @@
         </parameters>
       </method>
       <property name="shadow">
-        <type name="GtkShadowType" c:type="GtkShadowType"/>
+        <type name="ShadowType" c:type="GtkShadowType"/>
       </property>
       <property name="shadow-type">
-        <type name="GtkShadowType" c:type="GtkShadowType"/>
+        <type name="ShadowType" c:type="GtkShadowType"/>
       </property>
       <property name="handle-position">
-        <type name="GtkPositionType" c:type="GtkPositionType"/>
+        <type name="PositionType" c:type="GtkPositionType"/>
       </property>
       <property name="snap-edge">
-        <type name="GtkPositionType" c:type="GtkPositionType"/>
+        <type name="PositionType" c:type="GtkPositionType"/>
       </property>
       <property name="snap-edge-set">
         <type name="boolean" c:type="gboolean"/>
@@ -46505,10 +43886,10 @@
         </return-value>
         <parameters>
           <parameter name="handle_box">
-            <type name="GtkHandleBox*" c:type="GtkHandleBox*"/>
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
           <parameter name="child">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -46518,10 +43899,10 @@
         </return-value>
         <parameters>
           <parameter name="handle_box">
-            <type name="GtkHandleBox*" c:type="GtkHandleBox*"/>
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
           <parameter name="child">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -46551,7 +43932,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -46561,14 +43942,14 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <class name="HButtonBox"
@@ -46579,7 +43960,7 @@
     </class>
     <function name="hbutton_box_new" c:identifier="gtk_hbutton_box_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="hbutton_box_get_spacing_default"
@@ -46591,7 +43972,7 @@
     <function name="hbutton_box_get_layout_default"
               c:identifier="gtk_hbutton_box_get_layout_default">
       <return-value>
-        <type name="GtkButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
+        <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
       </return-value>
     </function>
     <function name="hbutton_box_set_spacing_default"
@@ -46767,7 +44148,7 @@
         </return-value>
         <parameters>
           <parameter name="paned">
-            <type name="GtkPaned*" c:type="GtkPaned*"/>
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
           <parameter name="reverse">
             <type name="boolean" c:type="gboolean"/>
@@ -46780,7 +44161,7 @@
         </return-value>
         <parameters>
           <parameter name="paned">
-            <type name="GtkPaned*" c:type="GtkPaned*"/>
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
         </parameters>
       </callback>
@@ -46790,10 +44171,10 @@
         </return-value>
         <parameters>
           <parameter name="paned">
-            <type name="GtkPaned*" c:type="GtkPaned*"/>
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
           <parameter name="scroll">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
       </callback>
@@ -46803,7 +44184,7 @@
         </return-value>
         <parameters>
           <parameter name="paned">
-            <type name="GtkPaned*" c:type="GtkPaned*"/>
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
           <parameter name="reverse">
             <type name="boolean" c:type="gboolean"/>
@@ -46816,7 +44197,7 @@
         </return-value>
         <parameters>
           <parameter name="paned">
-            <type name="GtkPaned*" c:type="GtkPaned*"/>
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
         </parameters>
       </callback>
@@ -46826,7 +44207,7 @@
         </return-value>
         <parameters>
           <parameter name="paned">
-            <type name="GtkPaned*" c:type="GtkPaned*"/>
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
         </parameters>
       </callback>
@@ -46871,7 +44252,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -46904,7 +44285,7 @@
     </class>
     <function name="hpaned_new" c:identifier="gtk_hpaned_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <record name="GtkRulerMetric" c:type="GtkRulerMetric">
@@ -47003,16 +44384,16 @@
             <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
           <parameter name="lower">
-            <type name="gdouble" c:type="gdouble*"/>
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
           <parameter name="upper">
-            <type name="gdouble" c:type="gdouble*"/>
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
           <parameter name="position">
-            <type name="gdouble" c:type="gdouble*"/>
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
           <parameter name="max_size">
-            <type name="gdouble" c:type="gdouble*"/>
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
@@ -47029,7 +44410,7 @@
         <type name="double" c:type="gdouble"/>
       </property>
       <property name="metric">
-        <type name="GtkMetricType" c:type="GtkMetricType"/>
+        <type name="MetricType" c:type="GtkMetricType"/>
       </property>
       <callback name="draw_ticks">
         <return-value>
@@ -47037,7 +44418,7 @@
         </return-value>
         <parameters>
           <parameter name="ruler">
-            <type name="GtkRuler*" c:type="GtkRuler*"/>
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
         </parameters>
       </callback>
@@ -47047,7 +44428,7 @@
         </return-value>
         <parameters>
           <parameter name="ruler">
-            <type name="GtkRuler*" c:type="GtkRuler*"/>
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
         </parameters>
       </callback>
@@ -47080,7 +44461,7 @@
     </class>
     <function name="hruler_new" c:identifier="gtk_hruler_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <class name="Scale"
@@ -47177,10 +44558,10 @@
             <type name="Scale" c:type="GtkScale*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -47191,7 +44572,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="value-pos">
-        <type name="GtkPositionType" c:type="GtkPositionType"/>
+        <type name="PositionType" c:type="GtkPositionType"/>
       </property>
       <callback name="format_value">
         <return-value>
@@ -47199,7 +44580,7 @@
         </return-value>
         <parameters>
           <parameter name="scale">
-            <type name="GtkScale*" c:type="GtkScale*"/>
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
           <parameter name="value">
             <type name="double" c:type="gdouble"/>
@@ -47212,7 +44593,7 @@
         </return-value>
         <parameters>
           <parameter name="scale">
-            <type name="GtkScale*" c:type="GtkScale*"/>
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
         </parameters>
       </callback>
@@ -47222,13 +44603,13 @@
         </return-value>
         <parameters>
           <parameter name="scale">
-            <type name="GtkScale*" c:type="GtkScale*"/>
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -47278,10 +44659,10 @@
           <type name="Scale" c:type="GtkScale*"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -47306,7 +44687,7 @@
     </class>
     <function name="hscale_new" c:identifier="gtk_hscale_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="adjustment">
@@ -47317,7 +44698,7 @@
     <function name="hscale_new_with_range"
               c:identifier="gtk_hscale_new_with_range">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="min">
@@ -47345,12 +44726,12 @@
     </class>
     <function name="hseparator_new" c:identifier="gtk_hseparator_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <class name="IconFactory"
            c:type="GtkIconFactory"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkIconFactory"
            glib:get-type="gtk_icon_factory_get_type">
       <constructor name="new" c:identifier="gtk_icon_factory_new">
@@ -47370,13 +44751,13 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="icon_set">
-            <type name="GtkIconSet" c:type="GtkIconSet*"/>
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
         </parameters>
       </method>
       <method name="lookup" c:identifier="gtk_icon_factory_lookup">
         <return-value>
-          <type name="GtkIconSet" c:type="GtkIconSet*"/>
+          <type name="IconSet" c:type="GtkIconSet*"/>
         </return-value>
         <parameters>
           <parameter name="factory">
@@ -47432,7 +44813,7 @@
     <function name="icon_factory_lookup_default"
               c:identifier="gtk_icon_factory_lookup_default">
       <return-value>
-        <type name="GtkIconSet*" c:type="GtkIconSet*"/>
+        <type name="IconSet" c:type="GtkIconSet*"/>
       </return-value>
       <parameters>
         <parameter name="stock_id">
@@ -47449,10 +44830,10 @@
           <type name="IconSize" c:type="GtkIconSize"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -47469,16 +44850,16 @@
           <type name="IconSize" c:type="GtkIconSize"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="height">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.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"/>
+        <type name="IconSize" c:type="GtkIconSize"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -47509,7 +44890,7 @@
     <function name="icon_size_from_name"
               c:identifier="gtk_icon_size_from_name">
       <return-value>
-        <type name="GtkIconSize" c:type="GtkIconSize"/>
+        <type name="IconSize" c:type="GtkIconSize"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -47614,7 +44995,7 @@
             <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
           <parameter name="source">
-            <type name="GtkIconSource" c:type="GtkIconSource*"/>
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
@@ -47630,7 +45011,7 @@
             <type name="IconSize" c:type="GtkIconSize**"/>
           </parameter>
           <parameter name="n_sizes">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -47891,7 +45272,7 @@
     <function name="icon_factory_list_ids"
               c:identifier="_gtk_icon_factory_list_ids">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </return-value>
     </function>
     <function name="icon_factory_ensure_default_icons"
@@ -47904,12 +45285,12 @@
     <function name="icon_theme_error_quark"
               c:identifier="gtk_icon_theme_error_quark">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="GLib.GQuark" c:type="GQuark"/>
       </return-value>
     </function>
     <class name="IconTheme"
            c:type="GtkIconTheme"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkIconTheme"
            glib:get-type="gtk_icon_theme_get_type">
       <constructor name="new" c:identifier="gtk_icon_theme_new">
@@ -47974,10 +45355,10 @@
             <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
           <parameter name="path">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
           <parameter name="n_elements">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -48039,7 +45420,7 @@
       <method name="get_icon_sizes"
               c:identifier="gtk_icon_theme_get_icon_sizes">
         <return-value>
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </return-value>
         <parameters>
           <parameter name="icon_theme">
@@ -48052,7 +45433,7 @@
       </method>
       <method name="lookup_icon" c:identifier="gtk_icon_theme_lookup_icon">
         <return-value>
-          <type name="GtkIconInfo" c:type="GtkIconInfo*"/>
+          <type name="IconInfo" c:type="GtkIconInfo*"/>
         </return-value>
         <parameters>
           <parameter name="icon_theme">
@@ -48071,7 +45452,7 @@
       </method>
       <method name="choose_icon" c:identifier="gtk_icon_theme_choose_icon">
         <return-value>
-          <type name="GtkIconInfo" c:type="GtkIconInfo*"/>
+          <type name="IconInfo" c:type="GtkIconInfo*"/>
         </return-value>
         <parameters>
           <parameter name="icon_theme">
@@ -48106,13 +45487,13 @@
             <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
       <method name="list_icons" c:identifier="gtk_icon_theme_list_icons">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="icon_theme">
@@ -48125,7 +45506,7 @@
       </method>
       <method name="list_contexts" c:identifier="gtk_icon_theme_list_contexts">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="icon_theme">
@@ -48161,7 +45542,7 @@
         </return-value>
         <parameters>
           <parameter name="icon_theme">
-            <type name="GtkIconTheme*" c:type="GtkIconTheme*"/>
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
         </parameters>
       </callback>
@@ -48252,7 +45633,7 @@
             <type name="IconInfo" c:type="GtkIconInfo*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
@@ -48294,10 +45675,10 @@
             <type name="IconInfo" c:type="GtkIconInfo*"/>
           </parameter>
           <parameter name="points">
-            <type name="GdkPoint" c:type="GdkPoint**"/>
+            <type name="Gdk.GdkPoint" c:type="GdkPoint**"/>
           </parameter>
           <parameter name="n_points">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -48332,7 +45713,7 @@
     </function>
     <class name="Tooltip"
            c:type="GtkTooltip"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkTooltip"
            glib:get-type="gtk_tooltip_get_type">
       <method name="set_markup" c:identifier="gtk_tooltip_set_markup">
@@ -48467,7 +45848,7 @@
       </return-value>
       <parameters>
         <parameter name="event">
-          <type name="GdkEvent" c:type="GdkEvent*"/>
+          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
     </function>
@@ -48488,10 +45869,10 @@
       </return-value>
       <parameters>
         <parameter name="icon_view">
-          <type name="GtkIconView*" c:type="GtkIconView*"/>
+          <type name="IconView" c:type="GtkIconView*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -48913,7 +46294,7 @@
       <method name="get_selected_items"
               c:identifier="gtk_icon_view_get_selected_items">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="icon_view">
@@ -49193,10 +46574,10 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="bx">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="by">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -49247,10 +46628,10 @@
             <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
           <parameter name="x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="keyboard_tip">
             <type name="boolean" c:type="gboolean"/>
@@ -49301,13 +46682,13 @@
         <type name="int32" c:type="gint"/>
       </property>
       <property name="selection-mode">
-        <type name="GtkSelectionMode" c:type="GtkSelectionMode"/>
+        <type name="SelectionMode" c:type="GtkSelectionMode"/>
       </property>
       <property name="orientation">
-        <type name="GtkOrientation" c:type="GtkOrientation"/>
+        <type name="Orientation" c:type="GtkOrientation"/>
       </property>
       <property name="model">
-        <type name="GtkTreeModel" c:type="GtkTreeModel"/>
+        <type name="TreeModel" c:type="GtkTreeModel"/>
       </property>
       <property name="columns">
         <type name="int32" c:type="gint"/>
@@ -49339,13 +46720,13 @@
         </return-value>
         <parameters>
           <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
           <parameter name="hadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
           <parameter name="vadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </callback>
@@ -49355,10 +46736,10 @@
         </return-value>
         <parameters>
           <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </callback>
@@ -49368,7 +46749,7 @@
         </return-value>
         <parameters>
           <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -49378,7 +46759,7 @@
         </return-value>
         <parameters>
           <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -49388,7 +46769,7 @@
         </return-value>
         <parameters>
           <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -49398,7 +46779,7 @@
         </return-value>
         <parameters>
           <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -49408,7 +46789,7 @@
         </return-value>
         <parameters>
           <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -49418,10 +46799,10 @@
         </return-value>
         <parameters>
           <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
           <parameter name="step">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="count">
             <type name="int32" c:type="gint"/>
@@ -49434,7 +46815,7 @@
         </return-value>
         <parameters>
           <parameter name="icon_view">
-            <type name="GtkIconView*" c:type="GtkIconView*"/>
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -49444,7 +46825,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="p0">
             <type name="int32" c:type="gint"/>
@@ -49457,10 +46838,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -49485,7 +46866,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTreePath" c:type="GtkTreePath"/>
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -49507,13 +46888,13 @@
     </class>
     <function name="icon_view_new" c:identifier="gtk_icon_view_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="icon_view_new_with_model"
               c:identifier="gtk_icon_view_new_with_model">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="model">
@@ -49550,19 +46931,19 @@
         </parameters>
       </method>
       <property name="image">
-        <type name="GtkWidget" c:type="GtkWidget"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="image_menu_item_new_with_label"
               c:identifier="gtk_image_menu_item_new_with_label">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -49573,7 +46954,7 @@
     <function name="image_menu_item_new_with_mnemonic"
               c:identifier="gtk_image_menu_item_new_with_mnemonic">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -49584,7 +46965,7 @@
     <function name="image_menu_item_new_from_stock"
               c:identifier="gtk_image_menu_item_new_from_stock">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="stock_id">
@@ -49664,7 +47045,7 @@
     <function name="im_multicontext_new"
               c:identifier="gtk_im_multicontext_new">
       <return-value>
-        <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+        <type name="IMContext" c:type="GtkIMContext*"/>
       </return-value>
     </function>
     <class name="InputDialog"
@@ -49678,10 +47059,10 @@
         </return-value>
         <parameters>
           <parameter name="inputd">
-            <type name="GtkInputDialog*" c:type="GtkInputDialog*"/>
+            <type name="InputDialog" c:type="GtkInputDialog*"/>
           </parameter>
           <parameter name="device">
-            <type name="GdkDevice*" c:type="GdkDevice*"/>
+            <type name="Gdk.Device" c:type="GdkDevice*"/>
           </parameter>
         </parameters>
       </callback>
@@ -49691,10 +47072,10 @@
         </return-value>
         <parameters>
           <parameter name="inputd">
-            <type name="GtkInputDialog*" c:type="GtkInputDialog*"/>
+            <type name="InputDialog" c:type="GtkInputDialog*"/>
           </parameter>
           <parameter name="device">
-            <type name="GdkDevice*" c:type="GdkDevice*"/>
+            <type name="Gdk.Device" c:type="GdkDevice*"/>
           </parameter>
         </parameters>
       </callback>
@@ -49724,7 +47105,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkDevice" c:type="GdkDevice"/>
+            <type name="Gdk.Device" c:type="GdkDevice"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -49734,14 +47115,14 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GdkDevice" c:type="GdkDevice"/>
+            <type name="Gdk.Device" c:type="GdkDevice"/>
           </parameter>
         </parameters>
       </glib:signal>
     </class>
     <function name="input_dialog_new" c:identifier="gtk_input_dialog_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <class name="Invisible"
@@ -49773,7 +47154,7 @@
         </parameters>
       </method>
       <property name="screen">
-        <type name="GdkScreen" c:type="GdkScreen"/>
+        <type name="Gdk.Screen" c:type="GdkScreen"/>
       </property>
       <callback name="_gtk_reserved1">
         <return-value>
@@ -49798,13 +47179,13 @@
     </class>
     <function name="invisible_new" c:identifier="gtk_invisible_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="screen">
@@ -49864,10 +47245,10 @@
             <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
           <parameter name="width">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="height">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -49880,10 +47261,10 @@
             <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
           <parameter name="width">
-            <type name="guint" c:type="guint*"/>
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
           <parameter name="height">
-            <type name="guint" c:type="guint*"/>
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
         </parameters>
       </method>
@@ -49954,16 +47335,16 @@
         </parameters>
       </method>
       <property name="hadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+        <type name="Adjustment" c:type="GtkAdjustment"/>
       </property>
       <property name="vadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+        <type name="Adjustment" c:type="GtkAdjustment"/>
       </property>
       <property name="width">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="height">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <callback name="set_scroll_adjustments">
         <return-value>
@@ -49971,13 +47352,13 @@
         </return-value>
         <parameters>
           <parameter name="layout">
-            <type name="GtkLayout*" c:type="GtkLayout*"/>
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
           <parameter name="hadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
           <parameter name="vadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </callback>
@@ -50007,17 +47388,17 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
         </parameters>
       </glib:signal>
     </class>
     <function name="layout_new" c:identifier="gtk_layout_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="hadjustment">
@@ -50035,7 +47416,7 @@
       </return-value>
       <parameters>
         <parameter name="button">
-          <type name="GtkLinkButton*" c:type="GtkLinkButton*"/>
+          <type name="LinkButton" c:type="GtkLinkButton*"/>
         </parameter>
         <parameter name="link_">
           <type name="string" c:type="gchar*"/>
@@ -50099,7 +47480,7 @@
     </class>
     <function name="link_button_new" c:identifier="gtk_link_button_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="uri">
@@ -50110,7 +47491,7 @@
     <function name="link_button_new_with_label"
               c:identifier="gtk_link_button_new_with_label">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="uri">
@@ -50134,13 +47515,13 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
     <record name="GtkListItem" c:type="GtkListItem">
       <field name="item">
-        <type name="GtkItem" c:type="GtkItem"/>
+        <type name="Item" c:type="GtkItem"/>
       </field>
       <callback name="toggle_focus_row">
         <return-value>
@@ -50148,7 +47529,7 @@
         </return-value>
         <parameters>
           <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -50158,7 +47539,7 @@
         </return-value>
         <parameters>
           <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -50168,7 +47549,7 @@
         </return-value>
         <parameters>
           <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -50178,7 +47559,7 @@
         </return-value>
         <parameters>
           <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -50188,7 +47569,7 @@
         </return-value>
         <parameters>
           <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -50198,7 +47579,7 @@
         </return-value>
         <parameters>
           <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -50208,10 +47589,10 @@
         </return-value>
         <parameters>
           <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
           <parameter name="scroll_type">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
           <parameter name="position">
             <type name="float" c:type="gfloat"/>
@@ -50227,10 +47608,10 @@
         </return-value>
         <parameters>
           <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
           <parameter name="scroll_type">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
           <parameter name="position">
             <type name="float" c:type="gfloat"/>
@@ -50243,10 +47624,10 @@
         </return-value>
         <parameters>
           <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
           <parameter name="scroll_type">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
           <parameter name="position">
             <type name="float" c:type="gfloat"/>
@@ -50259,7 +47640,7 @@
         </return-value>
         <parameters>
           <parameter name="list_item">
-            <type name="GtkListItem*" c:type="GtkListItem*"/>
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -50271,13 +47652,13 @@
     </function>
     <function name="list_item_new" c:identifier="gtk_list_item_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="label">
@@ -50307,31 +47688,31 @@
     </function>
     <record name="GtkList" c:type="GtkList">
       <field name="container">
-        <type name="GtkContainer" c:type="GtkContainer"/>
+        <type name="Container" c:type="GtkContainer"/>
       </field>
       <field name="children">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </field>
       <field name="selection">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </field>
       <field name="undo_selection">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </field>
       <field name="undo_unselection">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </field>
       <field name="last_focus_child">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </field>
       <field name="undo_focus_child">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </field>
       <field name="htimer">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="vtimer">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="anchor">
         <type name="int32" c:type="gint"/>
@@ -50340,16 +47721,16 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="anchor_state">
-        <type name="GtkStateType" c:type="GtkStateType"/>
+        <type name="StateType" c:type="GtkStateType"/>
       </field>
       <field name="selection_mode">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="drag_selection">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="add_mode">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <callback name="selection_changed">
         <return-value>
@@ -50357,7 +47738,7 @@
         </return-value>
         <parameters>
           <parameter name="list">
-            <type name="GtkList*" c:type="GtkList*"/>
+            <type name="GtkList" c:type="GtkList*"/>
           </parameter>
         </parameters>
       </callback>
@@ -50367,10 +47748,10 @@
         </return-value>
         <parameters>
           <parameter name="list">
-            <type name="GtkList*" c:type="GtkList*"/>
+            <type name="GtkList" c:type="GtkList*"/>
           </parameter>
           <parameter name="child">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -50380,10 +47761,10 @@
         </return-value>
         <parameters>
           <parameter name="list">
-            <type name="GtkList*" c:type="GtkList*"/>
+            <type name="GtkList" c:type="GtkList*"/>
           </parameter>
           <parameter name="child">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -50395,7 +47776,7 @@
     </function>
     <function name="list_new" c:identifier="gtk_list_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="list_insert_items" c:identifier="gtk_list_insert_items">
@@ -50407,7 +47788,7 @@
           <type name="GtkList" c:type="GtkList*"/>
         </parameter>
         <parameter name="items">
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </parameter>
         <parameter name="position">
           <type name="int32" c:type="gint"/>
@@ -50423,7 +47804,7 @@
           <type name="GtkList" c:type="GtkList*"/>
         </parameter>
         <parameter name="items">
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
@@ -50436,7 +47817,7 @@
           <type name="GtkList" c:type="GtkList*"/>
         </parameter>
         <parameter name="items">
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
@@ -50449,7 +47830,7 @@
           <type name="GtkList" c:type="GtkList*"/>
         </parameter>
         <parameter name="items">
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
@@ -50463,7 +47844,7 @@
           <type name="GtkList" c:type="GtkList*"/>
         </parameter>
         <parameter name="items">
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
@@ -50722,10 +48103,10 @@
       </return-value>
       <parameters>
         <parameter name="grab_widget">
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="event">
-          <type name="GdkEventKey*" c:type="GdkEventKey*"/>
+          <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
         </parameter>
         <parameter name="func_data">
           <type name="any" c:type="gpointer"/>
@@ -50738,13 +48119,13 @@
       </return-value>
       <parameters>
         <parameter name="required_major">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="required_minor">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="required_micro">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -50802,19 +48183,19 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="entries">
-          <type name="GOptionEntry" c:type="GOptionEntry*"/>
+          <type name="GLib.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**"/>
+          <type name="GLib.GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
     <function name="get_option_group" c:identifier="gtk_get_option_group">
       <return-value>
-        <type name="GOptionGroup*" c:type="GOptionGroup*"/>
+        <type name="GOptionGroup" c:type="GOptionGroup*"/>
       </return-value>
       <parameters>
         <parameter name="open_default_display">
@@ -50845,7 +48226,7 @@
     <function name="get_default_language"
               c:identifier="gtk_get_default_language">
       <return-value>
-        <type name="PangoLanguage*" c:type="PangoLanguage*"/>
+        <type name="PangoLanguage" c:type="PangoLanguage*"/>
       </return-value>
     </function>
     <function name="events_pending" c:identifier="gtk_events_pending">
@@ -50859,7 +48240,7 @@
       </return-value>
       <parameters>
         <parameter name="event">
-          <type name="GdkEvent" c:type="GdkEvent*"/>
+          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
     </function>
@@ -50870,7 +48251,7 @@
     </function>
     <function name="main_level" c:identifier="gtk_main_level">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
     </function>
     <function name="main_quit" c:identifier="gtk_main_quit">
@@ -50915,7 +48296,7 @@
     </function>
     <function name="grab_get_current" c:identifier="gtk_grab_get_current">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="grab_remove" c:identifier="gtk_grab_remove">
@@ -50947,7 +48328,7 @@
       </return-value>
       <parameters>
         <parameter name="main_level">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="object">
           <type name="GtkObject" c:type="GtkObject*"/>
@@ -50956,11 +48337,11 @@
     </function>
     <function name="quit_add" c:identifier="gtk_quit_add">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="main_level">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="function">
           <type name="GtkFunction" c:type="GtkFunction"/>
@@ -50972,11 +48353,11 @@
     </function>
     <function name="quit_add_full" c:identifier="gtk_quit_add_full">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="main_level">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="function">
           <type name="GtkFunction" c:type="GtkFunction"/>
@@ -50998,7 +48379,7 @@
       </return-value>
       <parameters>
         <parameter name="quit_handler_id">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -51015,7 +48396,7 @@
     </function>
     <function name="timeout_add" c:identifier="gtk_timeout_add">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="interval">
@@ -51031,7 +48412,7 @@
     </function>
     <function name="timeout_add_full" c:identifier="gtk_timeout_add_full">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="interval">
@@ -51057,13 +48438,13 @@
       </return-value>
       <parameters>
         <parameter name="timeout_handler_id">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="idle_add" c:identifier="gtk_idle_add">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="function">
@@ -51076,7 +48457,7 @@
     </function>
     <function name="idle_add_priority" c:identifier="gtk_idle_add_priority">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="priority">
@@ -51092,7 +48473,7 @@
     </function>
     <function name="idle_add_full" c:identifier="gtk_idle_add_full">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="priority">
@@ -51118,7 +48499,7 @@
       </return-value>
       <parameters>
         <parameter name="idle_handler_id">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -51135,7 +48516,7 @@
     </function>
     <function name="input_add_full" c:identifier="gtk_input_add_full">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="source">
@@ -51145,7 +48526,7 @@
           <type name="GdkInputCondition" c:type="GdkInputCondition"/>
         </parameter>
         <parameter name="function">
-          <type name="GdkInputFunction" c:type="GdkInputFunction"/>
+          <type name="Gdk.GdkInputFunction" c:type="GdkInputFunction"/>
         </parameter>
         <parameter name="marshal">
           <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
@@ -51164,14 +48545,14 @@
       </return-value>
       <parameters>
         <parameter name="input_handler_id">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="key_snooper_install"
               c:identifier="gtk_key_snooper_install">
       <return-value>
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="snooper">
@@ -51188,13 +48569,13 @@
       </return-value>
       <parameters>
         <parameter name="snooper_handler_id">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="get_current_event" c:identifier="gtk_get_current_event">
       <return-value>
-        <type name="GdkEvent*" c:type="GdkEvent*"/>
+        <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
       </return-value>
     </function>
     <function name="get_current_event_time"
@@ -51216,11 +48597,11 @@
     </function>
     <function name="get_event_widget" c:identifier="gtk_get_event_widget">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="event">
-          <type name="GdkEvent" c:type="GdkEvent*"/>
+          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
     </function>
@@ -51233,7 +48614,7 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="event">
-          <type name="GdkEvent" c:type="GdkEvent*"/>
+          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
     </function>
@@ -51244,13 +48625,14 @@
       </return-value>
       <parameters>
         <parameter name="ihint">
-          <type name="GSignalInvocationHint" c:type="GSignalInvocationHint*"/>
+          <type name="GObject.GSignalInvocationHint"
+                c:type="GSignalInvocationHint*"/>
         </parameter>
         <parameter name="return_accu">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="handler_return">
-          <type name="GValue" c:type="GValue*"/>
+          <type name="GObject.GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="dummy">
           <type name="any" c:type="gpointer"/>
@@ -51287,42 +48669,168 @@
           <parameter name="menubar">
             <type name="MenuBar" c:type="GtkMenuBar*"/>
           </parameter>
-          <parameter name="pack_dir">
-            <type name="PackDirection" c:type="GtkPackDirection"/>
+          <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="PackDirection" c:type="GtkPackDirection"/>
+      </property>
+      <property name="child-pack-direction">
+        <type name="PackDirection" 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="Widget" 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="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="Tooltips" c:type="GtkTooltips*"/>
+      </field>
+      <field name="widget">
+        <type name="Widget" 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="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="disable" c:identifier="gtk_tooltips_disable">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
+          </parameter>
+        </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="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_child_pack_direction"
-              c:identifier="gtk_menu_bar_get_child_pack_direction">
+      <method name="set_tip" c:identifier="gtk_tooltips_set_tip">
         <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="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="set_child_pack_direction"
-              c:identifier="gtk_menu_bar_set_child_pack_direction">
+      <method name="force_window" c:identifier="gtk_tooltips_force_window">
         <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 name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
           </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"/>
@@ -51344,22 +48852,30 @@
         </return-value>
       </callback>
     </class>
-    <function name="menu_bar_new" c:identifier="gtk_menu_bar_new">
+    <function name="tooltips_data_get" c:identifier="gtk_tooltips_data_get">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="GtkTooltipsData" c:type="GtkTooltipsData*"/>
       </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="menu_bar_cycle_focus"
-              c:identifier="_gtk_menu_bar_cycle_focus">
+    <function name="tooltips_get_info_from_tip_window"
+              c:identifier="gtk_tooltips_get_info_from_tip_window">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="menubar">
-          <type name="MenuBar" c:type="GtkMenuBar*"/>
+        <parameter name="tip_window">
+          <type name="Window" c:type="GtkWindow*"/>
         </parameter>
-        <parameter name="dir">
-          <type name="DirectionType" c:type="GtkDirectionType"/>
+        <parameter name="tooltips">
+          <type name="Tooltips" c:type="GtkTooltips**"/>
+        </parameter>
+        <parameter name="current_widget">
+          <type name="Widget" c:type="GtkWidget**"/>
         </parameter>
       </parameters>
     </function>
@@ -51679,7 +49195,7 @@
         </return-value>
         <parameters>
           <parameter name="tool_item">
-            <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -51689,7 +49205,7 @@
         </return-value>
         <parameters>
           <parameter name="tool_item">
-            <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
       </callback>
@@ -51699,10 +49215,10 @@
         </return-value>
         <parameters>
           <parameter name="tool_item">
-            <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
           <parameter name="tooltips">
-            <type name="GtkTooltips*" c:type="GtkTooltips*"/>
+            <type name="Tooltips" c:type="GtkTooltips*"/>
           </parameter>
           <parameter name="tip_text">
             <type name="string" c:type="gchar*"/>
@@ -51748,7 +49264,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTooltips" c:type="GtkTooltips"/>
+            <type name="Tooltips" c:type="GtkTooltips"/>
           </parameter>
           <parameter name="p0">
             <type name="string" c:type="gchararray"/>
@@ -51929,7 +49445,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="label-widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
+        <type name="Widget" c:type="GtkWidget"/>
       </property>
       <property name="stock-id">
         <type name="string" c:type="gchararray"/>
@@ -51938,10 +49454,10 @@
         <type name="string" c:type="gchararray"/>
       </property>
       <property name="icon-widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
+        <type name="Widget" c:type="GtkWidget"/>
       </property>
       <field name="button_type">
-        <type name="GType" c:type="GType"/>
+        <type name="GObject.GType" c:type="GType"/>
       </field>
       <callback name="clicked">
         <return-value>
@@ -51949,7 +49465,7 @@
         </return-value>
         <parameters>
           <parameter name="tool_item">
-            <type name="GtkToolButton*" c:type="GtkToolButton*"/>
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -51981,7 +49497,7 @@
     </class>
     <function name="tool_button_new" c:identifier="gtk_tool_button_new">
       <return-value>
-        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
       </return-value>
       <parameters>
         <parameter name="icon_widget" allow-none="1">
@@ -51995,7 +49511,7 @@
     <function name="tool_button_new_from_stock"
               c:identifier="gtk_tool_button_new_from_stock">
       <return-value>
-        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
       </return-value>
       <parameters>
         <parameter name="stock_id">
@@ -52006,7 +49522,7 @@
     <function name="tool_button_get_button"
               c:identifier="_gtk_tool_button_get_button">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="button">
@@ -52092,7 +49608,7 @@
         </parameters>
       </method>
       <property name="menu">
-        <type name="GtkMenu" c:type="GtkMenu"/>
+        <type name="Menu" c:type="GtkMenu"/>
       </property>
       <callback name="show_menu">
         <return-value>
@@ -52100,7 +49616,7 @@
         </return-value>
         <parameters>
           <parameter name="button">
-            <type name="GtkMenuToolButton*" c:type="GtkMenuToolButton*"/>
+            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -52133,7 +49649,7 @@
     <function name="menu_tool_button_new"
               c:identifier="gtk_menu_tool_button_new">
       <return-value>
-        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
       </return-value>
       <parameters>
         <parameter name="icon_widget">
@@ -52147,7 +49663,7 @@
     <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*"/>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
       </return-value>
       <parameters>
         <parameter name="stock_id">
@@ -52215,10 +49731,10 @@
         </parameters>
       </method>
       <property name="message-type">
-        <type name="GtkMessageType" c:type="GtkMessageType"/>
+        <type name="MessageType" c:type="GtkMessageType"/>
       </property>
       <property name="buttons">
-        <type name="GtkButtonsType" c:type="GtkButtonsType"/>
+        <type name="ButtonsType" c:type="GtkButtonsType"/>
       </property>
       <property name="text">
         <type name="string" c:type="gchararray"/>
@@ -52233,7 +49749,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="image">
-        <type name="GtkWidget" c:type="GtkWidget"/>
+        <type name="Widget" c:type="GtkWidget"/>
       </property>
       <callback name="_gtk_reserved1">
         <return-value>
@@ -52258,7 +49774,7 @@
     </class>
     <function name="message_dialog_new" c:identifier="gtk_message_dialog_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="parent" allow-none="1">
@@ -52281,7 +49797,7 @@
     <function name="message_dialog_new_with_markup"
               c:identifier="gtk_message_dialog_new_with_markup">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="parent">
@@ -52316,7 +49832,7 @@
     </function>
     <function name="get_module_path" c:identifier="_gtk_get_module_path">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="GLib.gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="type">
@@ -52330,10 +49846,10 @@
       </return-value>
       <parameters>
         <parameter name="argc">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="argv">
-          <type name="gchar" c:type="gchar***"/>
+          <type name="GLib.gchar" c:type="gchar***"/>
         </parameter>
         <parameter name="gtk_modules_args">
           <type name="string" c:type="gchar*"/>
@@ -52360,10 +49876,10 @@
       </return-value>
       <parameters>
         <parameter name="argc">
-          <type name="gint*" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="argv">
-          <type name="gchar***" c:type="gchar***"/>
+          <type name="GLib.gchar" c:type="gchar***"/>
         </parameter>
       </parameters>
     </callback>
@@ -52373,21 +49889,21 @@
       </return-value>
       <parameters>
         <parameter name="display">
-          <type name="GdkDisplay*" c:type="GdkDisplay*"/>
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
         </parameter>
       </parameters>
     </callback>
     <record name="GtkNotebookPage" c:type="GtkNotebookPage"/>
     <callback name="GtkNotebookWindowCreationFunc">
       <return-value>
-        <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+        <type name="Notebook" c:type="GtkNotebook*"/>
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+          <type name="Notebook" c:type="GtkNotebook*"/>
         </parameter>
         <parameter name="page">
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="x">
           <type name="int32" c:type="gint"/>
@@ -52753,7 +50269,7 @@
             <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
           <parameter name="border_width">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -52767,7 +50283,7 @@
             <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
           <parameter name="tab_hborder">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -52781,7 +50297,7 @@
             <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
           <parameter name="tab_vborder">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -52961,10 +50477,10 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="expand">
-            <type name="gboolean" c:type="gboolean*"/>
+            <type name="GLib.gboolean" c:type="gboolean*"/>
           </parameter>
           <parameter name="fill">
-            <type name="gboolean" c:type="gboolean*"/>
+            <type name="GLib.gboolean" c:type="gboolean*"/>
           </parameter>
           <parameter name="pack_type">
             <type name="PackType" c:type="GtkPackType*"/>
@@ -53073,7 +50589,7 @@
         </parameters>
       </method>
       <property name="tab-pos">
-        <type name="GtkPositionType" c:type="GtkPositionType"/>
+        <type name="PositionType" c:type="GtkPositionType"/>
       </property>
       <property name="show-tabs">
         <type name="boolean" c:type="gboolean"/>
@@ -53085,13 +50601,13 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="tab-border">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="tab-hborder">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="tab-vborder">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="page">
         <type name="int32" c:type="gint"/>
@@ -53114,13 +50630,13 @@
         </return-value>
         <parameters>
           <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
           <parameter name="page">
-            <type name="GtkNotebookPage*" c:type="GtkNotebookPage*"/>
+            <type name="GtkNotebookPage" c:type="GtkNotebookPage*"/>
           </parameter>
           <parameter name="page_num">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
@@ -53130,7 +50646,7 @@
         </return-value>
         <parameters>
           <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
           <parameter name="move_focus">
             <type name="boolean" c:type="gboolean"/>
@@ -53143,10 +50659,10 @@
         </return-value>
         <parameters>
           <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
           <parameter name="type">
-            <type name="GtkNotebookTab" c:type="GtkNotebookTab"/>
+            <type name="NotebookTab" c:type="GtkNotebookTab"/>
           </parameter>
         </parameters>
       </callback>
@@ -53156,7 +50672,7 @@
         </return-value>
         <parameters>
           <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
           <parameter name="offset">
             <type name="int32" c:type="gint"/>
@@ -53169,10 +50685,10 @@
         </return-value>
         <parameters>
           <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
           <parameter name="direction">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </callback>
@@ -53182,10 +50698,10 @@
         </return-value>
         <parameters>
           <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
           <parameter name="direction">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
           <parameter name="move_to_last">
             <type name="boolean" c:type="gboolean"/>
@@ -53198,16 +50714,16 @@
         </return-value>
         <parameters>
           <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
           <parameter name="child">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="tab_label">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="menu_label">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="position">
             <type name="int32" c:type="gint"/>
@@ -53216,14 +50732,14 @@
       </callback>
       <callback name="create_window">
         <return-value>
-          <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+          <type name="Notebook" c:type="GtkNotebook*"/>
         </return-value>
         <parameters>
           <parameter name="notebook">
-            <type name="GtkNotebook*" c:type="GtkNotebook*"/>
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
           <parameter name="page">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -53247,7 +50763,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -53257,7 +50773,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkNotebookTab" c:type="GtkNotebookTab"/>
+            <type name="NotebookTab" c:type="GtkNotebookTab"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -53287,7 +50803,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -53297,7 +50813,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
           <parameter name="p0">
             <type name="boolean" c:type="gboolean"/>
@@ -53310,10 +50826,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
           <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -53323,10 +50839,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
           <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -53336,20 +50852,20 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
           <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </glib:signal>
       <glib:signal name="create-window">
         <return-value>
-          <type name="GtkNotebook" c:type="GtkNotebook"/>
+          <type name="Notebook" c:type="GtkNotebook"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
           <parameter name="p0">
             <type name="int32" c:type="gint"/>
@@ -53362,7 +50878,7 @@
     </class>
     <function name="notebook_new" c:identifier="gtk_notebook_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="notebook_set_window_creation_hook"
@@ -53379,31 +50895,31 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
     <record name="GtkOldEditable" c:type="GtkOldEditable">
       <field name="widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
+        <type name="Widget" c:type="GtkWidget"/>
       </field>
       <field name="current_pos">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="selection_start_pos">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="selection_end_pos">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="has_selection">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="editable">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="visible">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="clipboard_text">
         <type name="string" c:type="gchar*"/>
@@ -53414,7 +50930,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -53424,7 +50940,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
           <parameter name="is_editable">
             <type name="boolean" c:type="gboolean"/>
@@ -53437,7 +50953,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -53453,7 +50969,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
           <parameter name="n">
             <type name="int32" c:type="gint"/>
@@ -53466,7 +50982,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -53482,7 +50998,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -53495,7 +51011,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
           <parameter name="row">
             <type name="int32" c:type="gint"/>
@@ -53508,7 +51024,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
           <parameter name="direction">
             <type name="int32" c:type="gint"/>
@@ -53521,7 +51037,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
           <parameter name="direction">
             <type name="int32" c:type="gint"/>
@@ -53534,7 +51050,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
           <parameter name="direction">
             <type name="int32" c:type="gint"/>
@@ -53547,7 +51063,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -53557,7 +51073,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -53567,7 +51083,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -53577,7 +51093,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
           <parameter name="start_pos">
             <type name="int32" c:type="gint"/>
@@ -53593,7 +51109,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
           <parameter name="start_pos">
             <type name="int32" c:type="gint"/>
@@ -53609,7 +51125,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
           <parameter name="start_pos">
             <type name="int32" c:type="gint"/>
@@ -53625,7 +51141,7 @@
         </return-value>
         <parameters>
           <parameter name="editable">
-            <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
           </parameter>
           <parameter name="position">
             <type name="int32" c:type="gint"/>
@@ -53639,7 +51155,7 @@
       </return-value>
       <parameters>
         <parameter name="editable">
-          <type name="GtkOldEditable*" c:type="GtkOldEditable*"/>
+          <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
         </parameter>
         <parameter name="time_">
           <type name="uint32" c:type="guint32"/>
@@ -53737,12 +51253,12 @@
             <type name="OptionMenu" c:type="GtkOptionMenu*"/>
           </parameter>
           <parameter name="index_">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
       <property name="menu">
-        <type name="GtkMenu" c:type="GtkMenu"/>
+        <type name="Menu" c:type="GtkMenu"/>
       </property>
       <callback name="changed">
         <return-value>
@@ -53750,7 +51266,7 @@
         </return-value>
         <parameters>
           <parameter name="option_menu">
-            <type name="GtkOptionMenu*" c:type="GtkOptionMenu*"/>
+            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
           </parameter>
         </parameters>
       </callback>
@@ -53782,24 +51298,24 @@
     </class>
     <function name="option_menu_new" c:identifier="gtk_option_menu_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <record name="GtkPixmap" c:type="GtkPixmap">
       <field name="misc">
-        <type name="GtkMisc" c:type="GtkMisc"/>
+        <type name="Misc" c:type="GtkMisc"/>
       </field>
       <field name="pixmap">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
       </field>
       <field name="mask">
-        <type name="GdkBitmap*" c:type="GdkBitmap*"/>
+        <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
       </field>
       <field name="pixmap_insensitive">
-        <type name="GdkPixmap*" c:type="GdkPixmap*"/>
+        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
       </field>
       <field name="build_insensitive">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <function name="pixmap_get_type" c:identifier="gtk_pixmap_get_type">
@@ -53809,14 +51325,14 @@
     </function>
     <function name="pixmap_new" c:identifier="gtk_pixmap_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="pixmap">
           <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
         <parameter name="mask" allow-none="1">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
       </parameters>
     </function>
@@ -53832,7 +51348,7 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
         <parameter name="mask" allow-none="1">
-          <type name="GdkBitmap" c:type="GdkBitmap*"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
         </parameter>
       </parameters>
     </function>
@@ -53848,7 +51364,7 @@
           <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
         </parameter>
         <parameter name="mask">
-          <type name="GdkBitmap" c:type="GdkBitmap**"/>
+          <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
         </parameter>
       </parameters>
     </function>
@@ -53880,13 +51396,13 @@
             <type name="Socket" c:type="GtkSocket*"/>
           </parameter>
           <parameter name="window_id">
-            <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+            <type name="Gdk.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"/>
+          <type name="Gdk.GdkNativeWindow" c:type="GdkNativeWindow"/>
         </return-value>
         <parameters>
           <parameter name="socket_">
@@ -53903,7 +51419,7 @@
             <type name="Socket" c:type="GtkSocket*"/>
           </parameter>
           <parameter name="wid">
-            <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+            <type name="Gdk.GdkNativeWindow" c:type="GdkNativeWindow"/>
           </parameter>
         </parameters>
       </method>
@@ -53913,7 +51429,7 @@
         </return-value>
         <parameters>
           <parameter name="socket_">
-            <type name="GtkSocket*" c:type="GtkSocket*"/>
+            <type name="Socket" c:type="GtkSocket*"/>
           </parameter>
         </parameters>
       </callback>
@@ -53923,7 +51439,7 @@
         </return-value>
         <parameters>
           <parameter name="socket_">
-            <type name="GtkSocket*" c:type="GtkSocket*"/>
+            <type name="Socket" c:type="GtkSocket*"/>
           </parameter>
         </parameters>
       </callback>
@@ -53960,7 +51476,7 @@
     </class>
     <function name="socket_new" c:identifier="gtk_socket_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <class name="Plug"
@@ -53977,7 +51493,7 @@
             <type name="Plug" c:type="GtkPlug*"/>
           </parameter>
           <parameter name="socket_id">
-            <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+            <type name="Gdk.GdkNativeWindow" c:type="GdkNativeWindow"/>
           </parameter>
         </parameters>
       </method>
@@ -53994,13 +51510,13 @@
             <type name="Gdk.Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="socket_id">
-            <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+            <type name="Gdk.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"/>
+          <type name="Gdk.GdkNativeWindow" c:type="GdkNativeWindow"/>
         </return-value>
         <parameters>
           <parameter name="plug">
@@ -54017,7 +51533,7 @@
         </return-value>
         <parameters>
           <parameter name="plug">
-            <type name="GtkPlug*" c:type="GtkPlug*"/>
+            <type name="Plug" c:type="GtkPlug*"/>
           </parameter>
         </parameters>
       </callback>
@@ -54049,25 +51565,25 @@
     </class>
     <function name="plug_new" c:identifier="gtk_plug_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="socket_id">
-          <type name="GdkNativeWindow" c:type="GdkNativeWindow"/>
+          <type name="Gdk.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*"/>
+        <type name="Widget" 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"/>
+          <type name="Gdk.GdkNativeWindow" c:type="GdkNativeWindow"/>
         </parameter>
       </parameters>
     </function>
@@ -54100,10 +51616,10 @@
     </function>
     <record name="GtkPreview" c:type="GtkPreview">
       <field name="widget">
-        <type name="GtkWidget" c:type="GtkWidget"/>
+        <type name="Widget" c:type="GtkWidget"/>
       </field>
       <field name="buffer">
-        <type name="guchar*" c:type="guchar*"/>
+        <type name="GLib.guchar" c:type="guchar*"/>
       </field>
       <field name="buffer_width">
         <type name="uint16" c:type="guint16"/>
@@ -54121,10 +51637,10 @@
         <type name="GdkRgbDither" c:type="GdkRgbDither"/>
       </field>
       <field name="type">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="expand">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="info">
         <type name="GtkPreviewInfo" c:type="GtkPreviewInfo"/>
@@ -54132,7 +51648,7 @@
     </record>
     <record name="GtkPreviewInfo" c:type="GtkPreviewInfo">
       <field name="lookup">
-        <type name="guchar*" c:type="guchar*"/>
+        <type name="GLib.guchar" c:type="guchar*"/>
       </field>
       <field name="gamma">
         <type name="double" c:type="gdouble"/>
@@ -54150,7 +51666,7 @@
     </function>
     <function name="preview_new" c:identifier="gtk_preview_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="type">
@@ -54217,7 +51733,7 @@
           <type name="GtkPreview" c:type="GtkPreview*"/>
         </parameter>
         <parameter name="data">
-          <type name="guchar" c:type="guchar*"/>
+          <type name="GLib.guchar" c:type="guchar*"/>
         </parameter>
         <parameter name="x">
           <type name="int32" c:type="gint"/>
@@ -54260,16 +51776,16 @@
       </return-value>
       <parameters>
         <parameter name="nred_shades">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="ngreen_shades">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="nblue_shades">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="ngray_shades">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -54310,17 +51826,17 @@
     </function>
     <function name="preview_get_visual" c:identifier="gtk_preview_get_visual">
       <return-value>
-        <type name="GdkVisual*" c:type="GdkVisual*"/>
+        <type name="Gdk.Visual" 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*"/>
+        <type name="Gdk.Colormap" 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*"/>
+        <type name="GtkPreviewInfo" c:type="GtkPreviewInfo*"/>
       </return-value>
     </function>
     <function name="preview_reset" c:identifier="gtk_preview_reset">
@@ -54407,7 +51923,7 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </constructor>
@@ -54596,7 +52112,7 @@
     <function name="paper_size_get_paper_sizes"
               c:identifier="gtk_paper_size_get_paper_sizes">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="include_custom">
@@ -54612,7 +52128,7 @@
     </function>
     <class name="PageSetup"
            c:type="GtkPageSetup"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkPageSetup"
            glib:get-type="gtk_page_setup_get_type">
       <constructor name="new" c:identifier="gtk_page_setup_new">
@@ -54640,7 +52156,7 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </constructor>
@@ -54657,7 +52173,7 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </constructor>
@@ -54917,7 +52433,7 @@
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
@@ -54964,7 +52480,7 @@
     </record>
     <class name="PrintSettings"
            c:type="GtkPrintSettings"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkPrintSettings"
            glib:get-type="gtk_print_settings_get_type">
       <constructor name="new" c:identifier="gtk_print_settings_new">
@@ -54974,46 +52490,488 @@
       </constructor>
       <constructor name="copy" c:identifier="gtk_print_settings_copy">
         <return-value>
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <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="GLib.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="GLib.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="GLib.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="other">
+          <parameter name="settings">
             <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_file"
-                   c:identifier="gtk_print_settings_new_from_file">
+      </method>
+      <method name="set_use_color"
+              c:identifier="gtk_print_settings_set_use_color">
         <return-value>
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="use_color">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_key_file"
-                   c:identifier="gtk_print_settings_new_from_key_file">
+      </method>
+      <method name="get_collate" c:identifier="gtk_print_settings_get_collate">
         <return-value>
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="group_name">
-            <type name="string" c:type="gchar*"/>
+        </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="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="collate">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="to_file" c:identifier="gtk_print_settings_to_file">
+      </method>
+      <method name="get_reverse" c:identifier="gtk_print_settings_get_reverse">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -55021,15 +52979,9 @@
           <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">
+      <method name="set_reverse" c:identifier="gtk_print_settings_set_reverse">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -55037,41 +52989,45 @@
           <parameter name="settings">
             <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
+          <parameter name="reverse">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="group_name">
-            <type name="string" c:type="gchar*"/>
+        </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="has_key" c:identifier="gtk_print_settings_has_key">
+      <method name="set_duplex" c:identifier="gtk_print_settings_set_duplex">
         <return-value>
-          <type name="boolean" 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="string" c:type="gchar*"/>
+          <parameter name="duplex">
+            <type name="PrintDuplex" c:type="GtkPrintDuplex"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get" c:identifier="gtk_print_settings_get">
+      <method name="get_quality" c:identifier="gtk_print_settings_get_quality">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="PrintQuality" c:type="GtkPrintQuality"/>
         </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">
+      <method name="set_quality" c:identifier="gtk_print_settings_set_quality">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -55079,28 +53035,24 @@
           <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 name="quality">
+            <type name="PrintQuality" c:type="GtkPrintQuality"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unset" c:identifier="gtk_print_settings_unset">
+      <method name="get_n_copies"
+              c:identifier="gtk_print_settings_get_n_copies">
         <return-value>
-          <type name="none" c:type="void"/>
+          <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="foreach" c:identifier="gtk_print_settings_foreach">
+      <method name="set_n_copies"
+              c:identifier="gtk_print_settings_set_n_copies">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -55108,28 +53060,24 @@
           <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 name="num_copies">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_bool" c:identifier="gtk_print_settings_get_bool">
+      <method name="get_number_up"
+              c:identifier="gtk_print_settings_get_number_up">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <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="set_bool" c:identifier="gtk_print_settings_set_bool">
+      <method name="set_number_up"
+              c:identifier="gtk_print_settings_set_number_up">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -55137,29 +53085,37 @@
           <parameter name="settings">
             <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="number_up">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="value">
-            <type name="boolean" c:type="gboolean"/>
+        </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="get_double" c:identifier="gtk_print_settings_get_double">
+      <method name="set_resolution"
+              c:identifier="gtk_print_settings_set_resolution">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <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 name="resolution">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_double_with_default"
-              c:identifier="gtk_print_settings_get_double_with_default">
+      <method name="get_scale" c:identifier="gtk_print_settings_get_scale">
         <return-value>
           <type name="double" c:type="gdouble"/>
         </return-value>
@@ -55167,15 +53123,9 @@
           <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">
+      <method name="set_scale" c:identifier="gtk_print_settings_set_scale">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -55183,31 +53133,24 @@
           <parameter name="settings">
             <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="value">
+          <parameter name="scale">
             <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_length" c:identifier="gtk_print_settings_get_length">
+      <method name="get_print_pages"
+              c:identifier="gtk_print_settings_get_print_pages">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="PrintPages" c:type="GtkPrintPages"/>
         </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">
+      <method name="set_print_pages"
+              c:identifier="gtk_print_settings_set_print_pages">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -55215,64 +53158,69 @@
           <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 name="pages">
+            <type name="PrintPages" c:type="GtkPrintPages"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_int" c:identifier="gtk_print_settings_get_int">
+      <method name="get_page_ranges"
+              c:identifier="gtk_print_settings_get_page_ranges">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="GtkPageRange" c:type="GtkPageRange*"/>
         </return-value>
         <parameters>
           <parameter name="settings">
             <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="num_ranges">
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_int_with_default"
-              c:identifier="gtk_print_settings_get_int_with_default">
+      <method name="set_page_ranges"
+              c:identifier="gtk_print_settings_set_page_ranges">
         <return-value>
-          <type name="int32" 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="string" c:type="gchar*"/>
+          <parameter name="page_ranges">
+            <type name="GtkPageRange" c:type="GtkPageRange*"/>
           </parameter>
-          <parameter name="def">
+          <parameter name="num_ranges">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_int" c:identifier="gtk_print_settings_set_int">
+      <method name="get_page_set"
+              c:identifier="gtk_print_settings_get_page_set">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PageSet" c:type="GtkPageSet"/>
         </return-value>
         <parameters>
           <parameter name="settings">
             <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
+        </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="value">
-            <type name="int32" c:type="gint"/>
+          <parameter name="page_set">
+            <type name="PageSet" c:type="GtkPageSet"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_printer" c:identifier="gtk_print_settings_get_printer">
+      <method name="get_default_source"
+              c:identifier="gtk_print_settings_get_default_source">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -55282,7 +53230,8 @@
           </parameter>
         </parameters>
       </method>
-      <method name="set_printer" c:identifier="gtk_print_settings_set_printer">
+      <method name="set_default_source"
+              c:identifier="gtk_print_settings_set_default_source">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -55290,15 +53239,15 @@
           <parameter name="settings">
             <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="printer">
+          <parameter name="default_source">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_orientation"
-              c:identifier="gtk_print_settings_get_orientation">
+      <method name="get_media_type"
+              c:identifier="gtk_print_settings_get_media_type">
         <return-value>
-          <type name="PageOrientation" c:type="GtkPageOrientation"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="settings">
@@ -55306,8 +53255,8 @@
           </parameter>
         </parameters>
       </method>
-      <method name="set_orientation"
-              c:identifier="gtk_print_settings_set_orientation">
+      <method name="set_media_type"
+              c:identifier="gtk_print_settings_set_media_type">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -55315,15 +53264,14 @@
           <parameter name="settings">
             <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="orientation">
-            <type name="PageOrientation" c:type="GtkPageOrientation"/>
+          <parameter name="media_type">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paper_size"
-              c:identifier="gtk_print_settings_get_paper_size">
+      <method name="get_dither" c:identifier="gtk_print_settings_get_dither">
         <return-value>
-          <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="settings">
@@ -55331,8 +53279,7 @@
           </parameter>
         </parameters>
       </method>
-      <method name="set_paper_size"
-              c:identifier="gtk_print_settings_set_paper_size">
+      <method name="set_dither" c:identifier="gtk_print_settings_set_dither">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -55340,27 +53287,24 @@
           <parameter name="settings">
             <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="paper_size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="dither">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paper_width"
-              c:identifier="gtk_print_settings_get_paper_width">
+      <method name="get_finishings"
+              c:identifier="gtk_print_settings_get_finishings">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="string" c:type="gchar*"/>
         </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">
+      <method name="set_finishings"
+              c:identifier="gtk_print_settings_set_finishings">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -55368,30 +53312,24 @@
           <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 name="finishings">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paper_height"
-              c:identifier="gtk_print_settings_get_paper_height">
+      <method name="get_output_bin"
+              c:identifier="gtk_print_settings_get_output_bin">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="string" c:type="gchar*"/>
         </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">
+      <method name="set_output_bin"
+              c:identifier="gtk_print_settings_set_output_bin">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -55399,628 +53337,770 @@
           <parameter name="settings">
             <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="height">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="output_bin">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+        </parameters>
+      </method>
+    </class>
+    <class name="PrintContext"
+           c:type="GtkPrintContext"
+           parent="GObject.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.cairo_t" c:type="cairo_t*"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_use_color"
-              c:identifier="gtk_print_settings_get_use_color">
+      <method name="get_page_setup"
+              c:identifier="gtk_print_context_get_page_setup">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_color"
-              c:identifier="gtk_print_settings_set_use_color">
+      <method name="get_width" c:identifier="gtk_print_context_get_width">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
-          <parameter name="use_color">
-            <type name="boolean" c:type="gboolean"/>
+        </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_collate" c:identifier="gtk_print_settings_get_collate">
+      <method name="get_dpi_x" c:identifier="gtk_print_context_get_dpi_x">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_collate" c:identifier="gtk_print_settings_set_collate">
+      <method name="get_dpi_y" c:identifier="gtk_print_context_get_dpi_y">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
-          <parameter name="collate">
-            <type name="boolean" c:type="gboolean"/>
+        </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="get_reverse" c:identifier="gtk_print_settings_get_reverse">
+      <method name="create_pango_context"
+              c:identifier="gtk_print_context_create_pango_context">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_reverse" c:identifier="gtk_print_settings_set_reverse">
+      <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="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
-          <parameter name="reverse">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="cr">
+            <type name="Cairo.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>
-      <method name="get_duplex" c:identifier="gtk_print_settings_get_duplex">
+    </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="PrintDuplex" c:type="GtkPrintDuplex"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="preview">
+            <type name="PrintOperationPreview"
+                  c:type="GtkPrintOperationPreview*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_duplex" c:identifier="gtk_print_settings_set_duplex">
+      </callback>
+      <callback name="got_page_size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="preview">
+            <type name="PrintOperationPreview"
+                  c:type="GtkPrintOperationPreview*"/>
           </parameter>
-          <parameter name="duplex">
-            <type name="PrintDuplex" c:type="GtkPrintDuplex"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+          <parameter name="page_setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_quality" c:identifier="gtk_print_settings_get_quality">
+      </callback>
+      <callback name="render_page">
         <return-value>
-          <type name="PrintQuality" c:type="GtkPrintQuality"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="preview">
+            <type name="PrintOperationPreview"
+                  c:type="GtkPrintOperationPreview*"/>
+          </parameter>
+          <parameter name="page_nr">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_quality" c:identifier="gtk_print_settings_set_quality">
+      </callback>
+      <callback name="is_selected">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="preview">
+            <type name="PrintOperationPreview"
+                  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="PrintOperationPreview"
+                  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>
-        <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">
+      </callback>
+      <callback name="_gtk_reserved6">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </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">
+      </callback>
+      <callback name="_gtk_reserved7">
         <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">
+      </callback>
+      <glib:signal name="ready">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="object">
+            <type name="PrintContext" c:type="GtkPrintContext"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_number_up"
-              c:identifier="gtk_print_settings_set_number_up">
+      </glib:signal>
+      <glib:signal name="got-page-size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="object">
+            <type name="PrintContext" c:type="GtkPrintContext"/>
           </parameter>
-          <parameter name="number_up">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="PageSetup" c:type="GtkPageSetup"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_resolution"
-              c:identifier="gtk_print_settings_get_resolution">
-        <return-value>
+      </glib:signal>
+    </interface>
+    <function name="print_operation_preview_render_page"
+              c:identifier="gtk_print_operation_preview_render_page">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="preview">
+          <type name="PrintOperationPreview"
+                c:type="GtkPrintOperationPreview*"/>
+        </parameter>
+        <parameter name="page_nr">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="print_operation_preview_end_preview"
+              c:identifier="gtk_print_operation_preview_end_preview">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="preview">
+          <type name="PrintOperationPreview"
+                c:type="GtkPrintOperationPreview*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="print_operation_preview_is_selected"
+              c:identifier="gtk_print_operation_preview_is_selected">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="preview">
+          <type name="PrintOperationPreview"
+                c:type="GtkPrintOperationPreview*"/>
+        </parameter>
+        <parameter name="page_nr">
           <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkPrintOperationPrivate" c:type="GtkPrintOperationPrivate"/>
+    <function name="print_error_quark" c:identifier="gtk_print_error_quark">
+      <return-value>
+        <type name="GLib.GQuark" c:type="GQuark"/>
+      </return-value>
+    </function>
+    <class name="PrintOperation"
+           c:type="GtkPrintOperation"
+           parent="GObject.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>
-        <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_resolution"
-              c:identifier="gtk_print_settings_set_resolution">
+      </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="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="resolution">
-            <type name="int32" c:type="gint"/>
+          <parameter name="default_page_setup" allow-none="1">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_scale" c:identifier="gtk_print_settings_get_scale">
+      <method name="get_default_page_setup"
+              c:identifier="gtk_print_operation_get_default_page_setup">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_scale" c:identifier="gtk_print_settings_set_scale">
+      <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="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="scale">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="print_settings" allow-none="1">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_print_pages"
-              c:identifier="gtk_print_settings_get_print_pages">
+      <method name="get_print_settings"
+              c:identifier="gtk_print_operation_get_print_settings">
         <return-value>
-          <type name="PrintPages" c:type="GtkPrintPages"/>
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_print_pages"
-              c:identifier="gtk_print_settings_set_print_pages">
+      <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="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="pages">
-            <type name="PrintPages" c:type="GtkPrintPages"/>
+          <parameter name="job_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_page_ranges"
-              c:identifier="gtk_print_settings_get_page_ranges">
+      <method name="set_n_pages"
+              c:identifier="gtk_print_operation_set_n_pages">
         <return-value>
-          <type name="GtkPageRange" c:type="GtkPageRange*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="num_ranges">
-            <type name="gint" c:type="gint*"/>
+          <parameter name="n_pages">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_page_ranges"
-              c:identifier="gtk_print_settings_set_page_ranges">
+      <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="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="page_ranges">
-            <type name="GtkPageRange" c:type="GtkPageRange*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="num_ranges">
+          <parameter name="current_page">
             <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">
+      <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="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="page_set">
-            <type name="PageSet" c:type="GtkPageSet"/>
+          <parameter name="full_page">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_default_source"
-              c:identifier="gtk_print_settings_get_default_source">
+      <method name="set_unit" c:identifier="gtk_print_operation_set_unit">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <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_default_source"
-              c:identifier="gtk_print_settings_set_default_source">
+      <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="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="default_source">
+          <parameter name="filename">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_media_type"
-              c:identifier="gtk_print_settings_get_media_type">
+      <method name="set_track_print_status"
+              c:identifier="gtk_print_operation_set_track_print_status">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <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_media_type"
-              c:identifier="gtk_print_settings_set_media_type">
+      <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="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="media_type">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="show_progress">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_dither" c:identifier="gtk_print_settings_get_dither">
+      <method name="set_allow_async"
+              c:identifier="gtk_print_operation_set_allow_async">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <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_dither" c:identifier="gtk_print_settings_set_dither">
+      <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="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="dither">
+          <parameter name="label">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_finishings"
-              c:identifier="gtk_print_settings_get_finishings">
+      <method name="run" c:identifier="gtk_print_operation_run">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="PrintOperationResult" c:type="GtkPrintOperationResult"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </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 name="action">
+            <type name="PrintOperationAction"
+                  c:type="GtkPrintOperationAction"/>
           </parameter>
-          <parameter name="finishings">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="parent" allow-none="1">
+            <type name="Window" c:type="GtkWindow*"/>
           </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 name="error">
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_output_bin"
-              c:identifier="gtk_print_settings_set_output_bin">
+      <method name="get_error" c:identifier="gtk_print_operation_get_error">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="output_bin">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="error">
+            <type name="GLib.GError" c:type="GError**"/>
           </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">
+      <method name="get_status" c:identifier="gtk_print_operation_get_status">
         <return-value>
-          <type name="cairo_t" c:type="cairo_t*"/>
+          <type name="PrintStatus" c:type="GtkPrintStatus"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_page_setup"
-              c:identifier="gtk_print_context_get_page_setup">
+      <method name="get_status_string"
+              c:identifier="gtk_print_operation_get_status_string">
         <return-value>
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_width" c:identifier="gtk_print_context_get_width">
+      <method name="is_finished"
+              c:identifier="gtk_print_operation_is_finished">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_height" c:identifier="gtk_print_context_get_height">
+      <method name="cancel" c:identifier="gtk_print_operation_cancel">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_dpi_x" c:identifier="gtk_print_context_get_dpi_x">
+      <property name="default-page-setup">
+        <type name="PageSetup" c:type="GtkPageSetup"/>
+      </property>
+      <property name="print-settings">
+        <type name="PrintSettings" 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="Unit" 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="PrintStatus" 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="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </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 name="result">
+            <type name="PrintOperationResult"
+                  c:type="GtkPrintOperationResult"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_pango_fontmap"
-              c:identifier="gtk_print_context_get_pango_fontmap">
+      </callback>
+      <callback name="begin_print">
         <return-value>
-          <type name="Pango.FontMap" c:type="PangoFontMap*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
           <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">
+      </callback>
+      <callback name="paginate">
         <return-value>
-          <type name="Pango.Context" c:type="PangoContext*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
           <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">
+      </callback>
+      <callback name="request_page_setup">
         <return-value>
-          <type name="Pango.Layout" c:type="PangoLayout*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
           <parameter name="context">
             <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
+          <parameter name="page_nr">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="set_cairo_context"
-              c:identifier="gtk_print_context_set_cairo_context">
+      </callback>
+      <callback name="draw_page">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
           <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 name="page_nr">
+            <type name="int32" c:type="gint"/>
           </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="end_print">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="preview">
-            <type name="GtkPrintOperationPreview*"
-                  c:type="GtkPrintOperationPreview*"/>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
           <parameter name="context">
-            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="got_page_size">
+      <callback name="status_changed">
         <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 name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="render_page">
+      <callback name="create_custom_widget">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="preview">
-            <type name="GtkPrintOperationPreview*"
-                  c:type="GtkPrintOperationPreview*"/>
-          </parameter>
-          <parameter name="page_nr">
-            <type name="int32" c:type="gint"/>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_selected">
+      <callback name="custom_widget_apply">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="preview">
-            <type name="GtkPrintOperationPreview*"
-                  c:type="GtkPrintOperationPreview*"/>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="page_nr">
-            <type name="int32" c:type="gint"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="end_preview">
+      <callback name="preview">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
           <parameter name="preview">
-            <type name="GtkPrintOperationPreview*"
+            <type name="PrintOperationPreview"
                   c:type="GtkPrintOperationPreview*"/>
           </parameter>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+          <parameter name="parent">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
         </parameters>
       </callback>
       <callback name="_gtk_reserved1">
@@ -56058,535 +54138,649 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="ready">
+      <glib:signal name="done">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+            <type name="PrintOperationResult"
+                  c:type="GtkPrintOperationResult"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="got-page-size">
+      <glib:signal name="begin-print">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="PrintContext" 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="PrintContext" 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"/>
+            <type name="PrintContext" c:type="GtkPrintContext"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkPageSetup" c:type="GtkPageSetup"/>
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="PageSetup" c:type="GtkPageSetup"/>
           </parameter>
         </parameters>
       </glib:signal>
-    </interface>
-    <function name="print_operation_preview_render_page"
-              c:identifier="gtk_print_operation_preview_render_page">
+      <glib:signal name="draw-page">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="PrintContext" 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="PrintContext" 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.Object" 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="Widget" 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="PrintOperationPreview"
+                  c:type="GtkPrintOperationPreview"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="PrintContext" c:type="GtkPrintContext"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="Window" 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="none" c:type="void"/>
+        <type name="PageSetup" c:type="GtkPageSetup*"/>
       </return-value>
       <parameters>
-        <parameter name="preview">
-          <type name="PrintOperationPreview"
-                c:type="GtkPrintOperationPreview*"/>
+        <parameter name="parent" allow-none="1">
+          <type name="Window" c:type="GtkWindow*"/>
         </parameter>
-        <parameter name="page_nr">
-          <type name="int32" c:type="gint"/>
+        <parameter name="page_setup" allow-none="1">
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
+        </parameter>
+        <parameter name="settings">
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="print_operation_preview_end_preview"
-              c:identifier="gtk_print_operation_preview_end_preview">
+    <callback name="GtkPageSetupDoneFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="preview">
-          <type name="PrintOperationPreview"
-                c:type="GtkPrintOperationPreview*"/>
+        <parameter name="page_setup">
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="print_operation_preview_is_selected"
-              c:identifier="gtk_print_operation_preview_is_selected">
+    </callback>
+    <function name="print_run_page_setup_dialog_async"
+              c:identifier="gtk_print_run_page_setup_dialog_async">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="preview">
-          <type name="PrintOperationPreview"
-                c:type="GtkPrintOperationPreview*"/>
+        <parameter name="parent">
+          <type name="Window" c:type="GtkWindow*"/>
         </parameter>
-        <parameter name="page_nr">
-          <type name="int32" c:type="gint"/>
+        <parameter name="page_setup">
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
+        </parameter>
+        <parameter name="settings">
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+        </parameter>
+        <parameter name="done_cb">
+          <type name="GtkPageSetupDoneFunc" c:type="GtkPageSetupDoneFunc"/>
+        </parameter>
+        <parameter name="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">
-        <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">
+    <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="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="default_page_setup" allow-none="1">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </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 name="show_text">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_print_settings"
-              c:identifier="gtk_print_operation_set_print_settings">
+      <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="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
-          <parameter name="print_settings" allow-none="1">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="x_align">
+            <type name="float" c:type="gfloat"/>
           </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 name="y_align">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_job_name"
-              c:identifier="gtk_print_operation_set_job_name">
+      <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="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
-          <parameter name="job_name">
+          <parameter name="format">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_n_pages"
-              c:identifier="gtk_print_operation_set_n_pages">
+      <method name="set_adjustment" c:identifier="gtk_progress_set_adjustment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
-          <parameter name="n_pages">
-            <type name="int32" c:type="gint"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_current_page"
-              c:identifier="gtk_print_operation_set_current_page">
+      <method name="configure" c:identifier="gtk_progress_configure">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
-          <parameter name="current_page">
-            <type name="int32" c:type="gint"/>
+          <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_use_full_page"
-              c:identifier="gtk_print_operation_set_use_full_page">
+      <method name="set_percentage" c:identifier="gtk_progress_set_percentage">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
-          <parameter name="full_page">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="percentage">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_unit" c:identifier="gtk_print_operation_set_unit">
+      <method name="set_value" c:identifier="gtk_progress_set_value">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_export_filename"
-              c:identifier="gtk_print_operation_set_export_filename">
+      <method name="get_value" c:identifier="gtk_progress_get_value">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="filename">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_track_print_status"
-              c:identifier="gtk_print_operation_set_track_print_status">
+      <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="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
-          <parameter name="track_status">
+          <parameter name="activity_mode">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_progress"
-              c:identifier="gtk_print_operation_set_show_progress">
+      <method name="get_current_text"
+              c:identifier="gtk_progress_get_current_text">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="show_progress">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_allow_async"
-              c:identifier="gtk_print_operation_set_allow_async">
+      <method name="get_text_from_value"
+              c:identifier="gtk_progress_get_text_from_value">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
-          <parameter name="allow_async">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_custom_tab_label"
-              c:identifier="gtk_print_operation_set_custom_tab_label">
+      <method name="get_current_percentage"
+              c:identifier="gtk_progress_get_current_percentage">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="label">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="run" c:identifier="gtk_print_operation_run">
+      <method name="get_percentage_from_value"
+              c:identifier="gtk_progress_get_percentage_from_value">
         <return-value>
-          <type name="PrintOperationResult" c:type="GtkPrintOperationResult"/>
+          <type name="double" c:type="gdouble"/>
         </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 name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_error" c:identifier="gtk_print_operation_get_error">
+      <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="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+        </parameters>
+      </callback>
+      <callback name="update">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_status" c:identifier="gtk_print_operation_get_status">
+      </callback>
+      <callback name="act_mode_enter">
         <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="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_status_string"
-              c:identifier="gtk_print_operation_get_status_string">
+      </callback>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <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="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_finished"
-              c:identifier="gtk_print_operation_is_finished">
+      <method name="set_text" c:identifier="gtk_progress_bar_set_text">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="cancel" c:identifier="gtk_print_operation_cancel">
+      <method name="set_fraction" c:identifier="gtk_progress_bar_set_fraction">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="fraction">
+            <type name="double" c:type="gdouble"/>
           </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">
+      <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="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
-          <parameter name="result">
-            <type name="GtkPrintOperationResult"
-                  c:type="GtkPrintOperationResult"/>
+          <parameter name="fraction">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="begin_print">
+      </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="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
-          <parameter name="context">
-            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          <parameter name="orientation">
+            <type name="ProgressBarOrientation"
+                  c:type="GtkProgressBarOrientation"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="paginate">
+      </method>
+      <method name="get_text" c:identifier="gtk_progress_bar_get_text">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="context">
-            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="request_page_setup">
+      </method>
+      <method name="get_fraction" c:identifier="gtk_progress_bar_get_fraction">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="context">
-            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
-          <parameter name="page_nr">
-            <type name="int32" c:type="gint"/>
+        </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="setup">
-            <type name="GtkPageSetup*" c:type="GtkPageSetup*"/>
+        </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>
-      </callback>
-      <callback name="draw_page">
+      </method>
+      <method name="set_ellipsize"
+              c:identifier="gtk_progress_bar_set_ellipsize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
-          <parameter name="context">
-            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          <parameter name="mode">
+            <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
           </parameter>
-          <parameter name="page_nr">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </method>
+      <method name="get_ellipsize"
+              c:identifier="gtk_progress_bar_get_ellipsize">
+        <return-value>
+          <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="end_print">
+      </method>
+      <method name="set_bar_style"
+              c:identifier="gtk_progress_bar_set_bar_style">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
-          <parameter name="context">
-            <type name="GtkPrintContext*" c:type="GtkPrintContext*"/>
+          <parameter name="style">
+            <type name="ProgressBarStyle" c:type="GtkProgressBarStyle"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="status_changed">
+      </method>
+      <method name="set_discrete_blocks"
+              c:identifier="gtk_progress_bar_set_discrete_blocks">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="blocks">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="create_custom_widget">
+      </method>
+      <method name="set_activity_step"
+              c:identifier="gtk_progress_bar_set_activity_step">
         <return-value>
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="step">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="custom_widget_apply">
+      </method>
+      <method name="set_activity_blocks"
+              c:identifier="gtk_progress_bar_set_activity_blocks">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="GtkPrintOperation*" c:type="GtkPrintOperation*"/>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
-          <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <parameter name="blocks">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="preview">
+      </method>
+      <method name="update" c:identifier="gtk_progress_bar_update">
         <return-value>
-          <type name="boolean" 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 name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
           </parameter>
-          <parameter name="parent">
-            <type name="GtkWindow*" c:type="GtkWindow*"/>
+          <parameter name="percentage">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </callback>
+      </method>
+      <property name="fraction">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="pulse-step">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="orientation">
+        <type name="ProgressBarOrientation"
+              c:type="GtkProgressBarOrientation"/>
+      </property>
+      <property name="text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="ellipsize">
+        <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
+      </property>
+      <property name="adjustment">
+        <type name="Adjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="bar-style">
+        <type name="ProgressBarStyle" c:type="GtkProgressBarStyle"/>
+      </property>
+      <property name="activity-step">
+        <type name="uint32" c:type="guint"/>
+      </property>
+      <property name="activity-blocks">
+        <type name="uint32" c:type="guint"/>
+      </property>
+      <property name="discrete-blocks">
+        <type name="uint32" c:type="guint"/>
+      </property>
       <callback name="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
@@ -56607,410 +54801,357 @@
           <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">
+    </class>
+    <function name="progress_bar_new" c:identifier="gtk_progress_bar_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="progress_bar_new_with_adjustment"
+              c:identifier="gtk_progress_bar_new_with_adjustment">
+      <return-value>
+        <type name="Widget" 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="none" c:type="void"/>
+          <type name="ToggleAction" c:type="GtkToggleAction*"/>
         </return-value>
-      </callback>
-      <glib:signal name="done">
+        <parameters>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="tooltip">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="toggled" c:identifier="gtk_toggle_action_toggled">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkPrintOperationResult"
-                  c:type="GtkPrintOperationResult"/>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="begin-print">
+      </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="object">
-            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          </parameter>
+          <parameter name="is_active">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="paginate">
+      </method>
+      <method name="get_active" c:identifier="gtk_toggle_action_get_active">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="request-page-setup">
+      </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="object">
-            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="GtkPageSetup" c:type="GtkPageSetup"/>
+          <parameter name="draw_as_radio">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="draw-page">
+      </method>
+      <method name="get_draw_as_radio"
+              c:identifier="gtk_toggle_action_get_draw_as_radio">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="end-print">
+      </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="object">
-            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="status-changed">
+      </callback>
+      <callback name="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="create-custom-widget">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="GObject" c:type="GObject"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="custom-widget-apply">
+      </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="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
-          </parameter>
-        </parameters>
       </glib:signal>
-      <glib:signal name="preview">
+    </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="boolean" c:type="gboolean"/>
+          <type name="RadioAction" c:type="GtkRadioAction*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkPrintOperationPreview"
-                  c:type="GtkPrintOperationPreview"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="GtkPrintContext" c:type="GtkPrintContext"/>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="GtkWindow" c:type="GtkWindow"/>
+          <parameter name="tooltip">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="print_run_page_setup_dialog"
-              c:identifier="gtk_print_run_page_setup_dialog">
-      <return-value>
-        <type name="GtkPageSetup*" c:type="GtkPageSetup*"/>
-      </return-value>
-      <parameters>
-        <parameter name="parent" allow-none="1">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="page_setup" allow-none="1">
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
-        </parameter>
-        <parameter name="settings">
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <callback name="GtkPageSetupDoneFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="page_setup">
-          <type name="GtkPageSetup*" c:type="GtkPageSetup*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <function name="print_run_page_setup_dialog_async"
-              c:identifier="gtk_print_run_page_setup_dialog_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="page_setup">
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
-        </parameter>
-        <parameter name="settings">
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-        </parameter>
-        <parameter name="done_cb">
-          <type name="GtkPageSetupDoneFunc" c:type="GtkPageSetupDoneFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <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">
+      </constructor>
+      <method name="get_group" c:identifier="gtk_radio_action_get_group">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
-          </parameter>
-          <parameter name="show_text">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="action">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_text_alignment"
-              c:identifier="gtk_progress_set_text_alignment">
+      <method name="set_group" c:identifier="gtk_radio_action_set_group">
         <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 name="action">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
           </parameter>
-          <parameter name="y_align">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="group">
+            <type name="GLib.GSList" c:type="GSList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_format_string"
-              c:identifier="gtk_progress_set_format_string">
+      <method name="get_current_value"
+              c:identifier="gtk_radio_action_get_current_value">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
-          </parameter>
-          <parameter name="format">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="action">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_adjustment" c:identifier="gtk_progress_set_adjustment">
+      <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="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="action">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
           </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="current_value">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="configure" c:identifier="gtk_progress_configure">
+      <property name="value">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="group">
+        <type name="RadioAction" 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="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 name="action">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
           </parameter>
-          <parameter name="max">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="current">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_percentage" c:identifier="gtk_progress_set_percentage">
+      </callback>
+      <callback name="_gtk_reserved1">
         <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">
+      </callback>
+      <callback name="_gtk_reserved2">
         <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">
+      </callback>
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </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">
+      </callback>
+      <callback name="_gtk_reserved4">
         <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">
+      </callback>
+      <glib:signal name="changed">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="object">
+            <type name="RadioAction" c:type="GtkRadioAction"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_text_from_value"
-              c:identifier="gtk_progress_get_text_from_value">
+      </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="string" c:type="gchar*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="radio_group_member">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_current_percentage"
-              c:identifier="gtk_progress_get_current_percentage">
+      <method name="new_with_label_from_widget"
+              c:identifier="gtk_radio_button_new_with_label_from_widget">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <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_percentage_from_value"
-              c:identifier="gtk_progress_get_percentage_from_value">
+      <method name="new_with_mnemonic_from_widget"
+              c:identifier="gtk_radio_button_new_with_mnemonic_from_widget">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="radio_group_member">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
           </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
           </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">
+      <method name="get_group" c:identifier="gtk_radio_button_get_group">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="GtkProgress*" c:type="GtkProgress*"/>
+          <parameter name="radio_button">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="update">
+      </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="progress">
-            <type name="GtkProgress*" c:type="GtkProgress*"/>
+          <parameter name="radio_button">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          </parameter>
+          <parameter name="group">
+            <type name="GLib.GSList" c:type="GSList*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="act_mode_enter">
+      </method>
+      <property name="group">
+        <type name="RadioButton" c:type="GtkRadioButton"/>
+      </property>
+      <callback name="group_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="GtkProgress*" c:type="GtkProgress*"/>
+          <parameter name="radio_button">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
           </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"/>
@@ -57026,244 +55167,333 @@
           <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">
+      <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="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="group">
+          <type name="GLib.GSList" c:type="GSList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="radio_button_new_with_label"
+              c:identifier="gtk_radio_button_new_with_label">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="group">
+          <type name="GLib.GSList" c:type="GSList*"/>
+        </parameter>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="radio_button_new_with_mnemonic"
+              c:identifier="gtk_radio_button_new_with_mnemonic">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="group">
+          <type name="GLib.GSList" c:type="GSList*"/>
+        </parameter>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </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="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="group">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_text" c:identifier="gtk_progress_bar_set_text">
+      <method name="new_with_mnemonic_from_widget"
+              c:identifier="gtk_radio_menu_item_new_with_mnemonic_from_widget">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="group">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
           </parameter>
-          <parameter name="text">
+          <parameter name="label">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_fraction" c:identifier="gtk_progress_bar_set_fraction">
+      <method name="new_with_label_from_widget"
+              c:identifier="gtk_radio_menu_item_new_with_label_from_widget">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="group">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
           </parameter>
-          <parameter name="fraction">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_pulse_step"
-              c:identifier="gtk_progress_bar_set_pulse_step">
+      <method name="get_group" c:identifier="gtk_radio_menu_item_get_group">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
-          </parameter>
-          <parameter name="fraction">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="radio_menu_item">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_orientation"
-              c:identifier="gtk_progress_bar_set_orientation">
+      <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="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="radio_menu_item">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
           </parameter>
-          <parameter name="orientation">
-            <type name="ProgressBarOrientation"
-                  c:type="GtkProgressBarOrientation"/>
+          <parameter name="group">
+            <type name="GLib.GSList" c:type="GSList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_text" c:identifier="gtk_progress_bar_get_text">
+      <property name="group">
+        <type name="RadioMenuItem" c:type="GtkRadioMenuItem"/>
+      </property>
+      <callback name="group_changed">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="radio_menu_item">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_fraction" c:identifier="gtk_progress_bar_get_fraction">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_pulse_step"
-              c:identifier="gtk_progress_bar_get_pulse_step">
+      </callback>
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_orientation"
-              c:identifier="gtk_progress_bar_get_orientation">
+      </callback>
+      <callback name="_gtk_reserved4">
         <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>
-        </parameters>
-      </method>
-      <method name="set_ellipsize"
-              c:identifier="gtk_progress_bar_set_ellipsize">
+      </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="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="group">
+          <type name="GLib.GSList" c:type="GSList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="radio_menu_item_new_with_label"
+              c:identifier="gtk_radio_menu_item_new_with_label">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="group">
+          <type name="GLib.GSList" c:type="GSList*"/>
+        </parameter>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="radio_menu_item_new_with_mnemonic"
+              c:identifier="gtk_radio_menu_item_new_with_mnemonic">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="group">
+          <type name="GLib.GSList" c:type="GSList*"/>
+        </parameter>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </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">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="button">
+            <type name="ToggleToolButton" c:type="GtkToggleToolButton*"/>
           </parameter>
-          <parameter name="mode">
-            <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
+          <parameter name="is_active">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_ellipsize"
-              c:identifier="gtk_progress_bar_get_ellipsize">
+      <method name="get_active"
+              c:identifier="gtk_toggle_tool_button_get_active">
         <return-value>
-          <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="button">
+            <type name="ToggleToolButton" c:type="GtkToggleToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_bar_style"
-              c:identifier="gtk_progress_bar_set_bar_style">
+      <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="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
-          </parameter>
-          <parameter name="style">
-            <type name="ProgressBarStyle" c:type="GtkProgressBarStyle"/>
+          <parameter name="button">
+            <type name="ToggleToolButton" c:type="GtkToggleToolButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_discrete_blocks"
-              c:identifier="gtk_progress_bar_set_discrete_blocks">
+      </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="ToolItem" 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="ToolItem" c:type="GtkToolItem*"/>
+      </return-value>
+      <parameters>
+        <parameter name="stock_id">
+          <type name="string" 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="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
-          </parameter>
-          <parameter name="blocks">
-            <type name="guint" c:type="guint"/>
+          <parameter name="group">
+            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_activity_step"
-              c:identifier="gtk_progress_bar_set_activity_step">
+      <method name="new_with_stock_from_widget"
+              c:identifier="gtk_radio_tool_button_new_with_stock_from_widget">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="ToolItem" c:type="GtkToolItem*"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="group">
+            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
           </parameter>
-          <parameter name="step">
-            <type name="guint" c:type="guint"/>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_activity_blocks"
-              c:identifier="gtk_progress_bar_set_activity_blocks">
+      <method name="get_group" c:identifier="gtk_radio_tool_button_get_group">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
-          </parameter>
-          <parameter name="blocks">
-            <type name="guint" c:type="guint"/>
+          <parameter name="button">
+            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="update" c:identifier="gtk_progress_bar_update">
+      <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="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="button">
+            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
           </parameter>
-          <parameter name="percentage">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="group">
+            <type name="GLib.GSList" c:type="GSList*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="fraction">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="pulse-step">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="orientation">
-        <type name="GtkProgressBarOrientation"
-              c:type="GtkProgressBarOrientation"/>
-      </property>
-      <property name="text">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <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 name="group">
+        <type name="RadioToolButton" c:type="GtkRadioToolButton"/>
       </property>
       <callback name="_gtk_reserved1">
         <return-value>
@@ -57286,230 +55516,247 @@
         </return-value>
       </callback>
     </class>
-    <function name="progress_bar_new" c:identifier="gtk_progress_bar_new">
+    <function name="radio_tool_button_new"
+              c:identifier="gtk_radio_tool_button_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
       </return-value>
+      <parameters>
+        <parameter name="group">
+          <type name="GLib.GSList" c:type="GSList*"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="progress_bar_new_with_adjustment"
-              c:identifier="gtk_progress_bar_new_with_adjustment">
+    <function name="radio_tool_button_new_from_stock"
+              c:identifier="gtk_radio_tool_button_new_from_stock">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
       </return-value>
       <parameters>
-        <parameter name="adjustment" allow-none="1">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="group">
+          <type name="GLib.GSList" c:type="GSList*"/>
+        </parameter>
+        <parameter name="stock_id">
+          <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="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="GLib.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="GLib.GQuark" c:type="GQuark"/>
+      </return-value>
+    </function>
+    <class name="RecentManager"
+           c:type="GtkRecentManager"
+           parent="GObject.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="ToggleAction" c:type="GtkToggleAction*"/>
+          <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*"/>
         </return-value>
         <parameters>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="label">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="tooltip">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
       </constructor>
-      <method name="toggled" c:identifier="gtk_toggle_action_toggled">
+      <method name="set_screen" c:identifier="gtk_recent_manager_set_screen">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <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_active" c:identifier="gtk_toggle_action_set_active">
+      <method name="add_item" c:identifier="gtk_recent_manager_add_item">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
-          <parameter name="is_active">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_active" c:identifier="gtk_toggle_action_get_active">
+      <method name="add_full" c:identifier="gtk_recent_manager_add_full">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <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="set_draw_as_radio"
-              c:identifier="gtk_toggle_action_set_draw_as_radio">
+      <method name="remove_item" c:identifier="gtk_recent_manager_remove_item">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
-          <parameter name="draw_as_radio">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_draw_as_radio"
-              c:identifier="gtk_toggle_action_get_draw_as_radio">
+      <method name="lookup_item" c:identifier="gtk_recent_manager_lookup_item">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="RecentInfo" c:type="GtkRecentInfo*"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <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="GLib.GError" c:type="GError**"/>
           </parameter>
         </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">
+      <method name="has_item" c:identifier="gtk_recent_manager_has_item">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="GtkToggleAction*" c:type="GtkToggleAction*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          </parameter>
+          <parameter name="uri">
+            <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>
-      <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">
+      </method>
+      <method name="move_item" c:identifier="gtk_recent_manager_move_item">
         <return-value>
-          <type name="RadioAction" c:type="GtkRadioAction*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="label">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
-          <parameter name="tooltip">
+          <parameter name="uri">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="stock_id">
+          <parameter name="new_uri">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="value">
-            <type name="int32" c:type="gint"/>
+          <parameter name="error">
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="get_group" c:identifier="gtk_radio_action_get_group">
+      </method>
+      <method name="set_limit" c:identifier="gtk_recent_manager_set_limit">
         <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="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          </parameter>
+          <parameter name="limit">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_group" c:identifier="gtk_radio_action_set_group">
+      <method name="get_limit" c:identifier="gtk_recent_manager_get_limit">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="RadioAction" c:type="GtkRadioAction*"/>
-          </parameter>
-          <parameter name="group">
-            <type name="GSList" c:type="GSList*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_current_value"
-              c:identifier="gtk_radio_action_get_current_value">
+      <method name="get_items" c:identifier="gtk_recent_manager_get_items">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_current_value"
-              c:identifier="gtk_radio_action_set_current_value">
+      <method name="purge_items" c:identifier="gtk_recent_manager_purge_items">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
-          <parameter name="current_value">
-            <type name="int32" c:type="gint"/>
+          <parameter name="error">
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <property name="value">
-        <type name="int32" c:type="gint"/>
+      <property name="filename">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <property name="group">
-        <type name="GtkRadioAction" c:type="GtkRadioAction"/>
+      <property name="limit">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="current-value">
+      <property name="size">
         <type name="int32" c:type="gint"/>
       </property>
       <callback name="changed">
@@ -57517,30 +55764,27 @@
           <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 name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="_gtk_recent1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="_gtk_recent2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="_gtk_recent3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="_gtk_recent4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -57549,481 +55793,288 @@
         <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">
+    <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="Widget" c:type="GtkWidget*"/>
+          <type name="RecentInfo" c:type="GtkRecentInfo*"/>
         </return-value>
         <parameters>
-          <parameter name="radio_group_member">
-            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="new_with_label_from_widget"
-              c:identifier="gtk_radio_button_new_with_label_from_widget">
+      </constructor>
+      <method name="unref" c:identifier="gtk_recent_info_unref">
         <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>
-          <parameter name="label">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="new_with_mnemonic_from_widget"
-              c:identifier="gtk_radio_button_new_with_mnemonic_from_widget">
+      <method name="get_uri" c:identifier="gtk_recent_info_get_uri">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="string" c:type="gchar*"/>
         </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 name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_group" c:identifier="gtk_radio_button_get_group">
+      <method name="get_display_name"
+              c:identifier="gtk_recent_info_get_display_name">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="radio_button">
-            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_group" c:identifier="gtk_radio_button_set_group">
+      <method name="get_description"
+              c:identifier="gtk_recent_info_get_description">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="radio_button">
-            <type name="RadioButton" c:type="GtkRadioButton*"/>
-          </parameter>
-          <parameter name="group">
-            <type name="GSList" c:type="GSList*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="group">
-        <type name="GtkRadioButton" c:type="GtkRadioButton"/>
-      </property>
-      <callback name="group_changed">
+      <method name="get_mime_type"
+              c:identifier="gtk_recent_info_get_mime_type">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="radio_button">
-            <type name="GtkRadioButton*" c:type="GtkRadioButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </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">
+      </method>
+      <method name="get_added" c:identifier="gtk_recent_info_get_added">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="time_t" c:type="time_t"/>
         </return-value>
-      </callback>
-      <glib:signal name="group-changed">
+        <parameters>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_modified" c:identifier="gtk_recent_info_get_modified">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="time_t" c:type="time_t"/>
         </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="group">
-          <type name="GSList" c:type="GSList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <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="group">
-          <type name="GSList" c:type="GSList*"/>
-        </parameter>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="radio_button_new_with_mnemonic"
-              c:identifier="gtk_radio_button_new_with_mnemonic">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="group">
-          <type name="GSList" c:type="GSList*"/>
-        </parameter>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
-        </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">
+        <parameters>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_visited" c:identifier="gtk_recent_info_get_visited">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="time_t" c:type="time_t"/>
         </return-value>
         <parameters>
-          <parameter name="group">
-            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="new_with_mnemonic_from_widget"
-              c:identifier="gtk_radio_menu_item_new_with_mnemonic_from_widget">
+      <method name="get_private_hint"
+              c:identifier="gtk_recent_info_get_private_hint">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="group">
-            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
-          </parameter>
-          <parameter name="label">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="new_with_label_from_widget"
-              c:identifier="gtk_radio_menu_item_new_with_label_from_widget">
+      <method name="get_application_info"
+              c:identifier="gtk_recent_info_get_application_info">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="group">
-            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
-          <parameter name="label">
+          <parameter name="app_name">
             <type name="string" c:type="gchar*"/>
           </parameter>
+          <parameter name="app_exec">
+            <type name="GLib.gchar" c:type="gchar**"/>
+          </parameter>
+          <parameter name="count">
+            <type name="GLib.guint" c:type="guint*"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="time_t" c:type="time_t*"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="get_group" c:identifier="gtk_radio_menu_item_get_group">
+      <method name="get_applications"
+              c:identifier="gtk_recent_info_get_applications">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </return-value>
         <parameters>
-          <parameter name="radio_menu_item">
-            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          <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_group" c:identifier="gtk_radio_menu_item_set_group">
+      <method name="last_application"
+              c:identifier="gtk_recent_info_last_application">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </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 name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="group">
-        <type name="GtkRadioMenuItem" c:type="GtkRadioMenuItem"/>
-      </property>
-      <callback name="group_changed">
+      <method name="has_application"
+              c:identifier="gtk_recent_info_has_application">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="radio_menu_item">
-            <type name="GtkRadioMenuItem*" c:type="GtkRadioMenuItem*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+          <parameter name="app_name">
+            <type name="string" c:type="gchar*"/>
           </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="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="group">
-          <type name="GSList" c:type="GSList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="radio_menu_item_new_with_label"
-              c:identifier="gtk_radio_menu_item_new_with_label">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="group">
-          <type name="GSList" c:type="GSList*"/>
-        </parameter>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="radio_menu_item_new_with_mnemonic"
-              c:identifier="gtk_radio_menu_item_new_with_mnemonic">
-      <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="group">
-          <type name="GSList" c:type="GSList*"/>
-        </parameter>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
-        </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">
+      </method>
+      <method name="get_groups" c:identifier="gtk_recent_info_get_groups">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToggleToolButton" c:type="GtkToggleToolButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
-          <parameter name="is_active">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="length">
+            <type name="gsize" c:type="gsize*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_active"
-              c:identifier="gtk_toggle_tool_button_get_active">
+      <method name="has_group" c:identifier="gtk_recent_info_has_group">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToggleToolButton" c:type="GtkToggleToolButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+          <parameter name="group_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="active">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="toggled">
+      <method name="get_icon" c:identifier="gtk_recent_info_get_icon">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="GtkToggleToolButton*" c:type="GtkToggleToolButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="int32" c:type="gint"/>
           </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">
+      </method>
+      <method name="get_short_name"
+              c:identifier="gtk_recent_info_get_short_name">
         <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="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="string" 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*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="new_with_stock_from_widget"
-              c:identifier="gtk_radio_tool_button_new_with_stock_from_widget">
+      <method name="get_uri_display"
+              c:identifier="gtk_recent_info_get_uri_display">
         <return-value>
-          <type name="ToolItem" c:type="GtkToolItem*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="group">
-            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
-          </parameter>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_group" c:identifier="gtk_radio_tool_button_get_group">
+      <method name="get_age" c:identifier="gtk_recent_info_get_age">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_group" c:identifier="gtk_radio_tool_button_set_group">
+      <method name="is_local" c:identifier="gtk_recent_info_is_local">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
-          </parameter>
-          <parameter name="group">
-            <type name="GSList" c:type="GSList*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </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">
+      <method name="exists" c:identifier="gtk_recent_info_exists">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="match" c:identifier="gtk_recent_info_match">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-    </class>
-    <function name="radio_tool_button_new"
-              c:identifier="gtk_radio_tool_button_new">
-      <return-value>
-        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
-      </return-value>
-      <parameters>
-        <parameter name="group">
-          <type name="GSList" c:type="GSList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="radio_tool_button_new_from_stock"
-              c:identifier="gtk_radio_tool_button_new_from_stock">
+        <parameters>
+          <parameter name="info_a">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+          <parameter name="info_b">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <function name="recent_manager_sync"
+              c:identifier="_gtk_recent_manager_sync">
       <return-value>
-        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+        <type name="none" c:type="void"/>
       </return-value>
-      <parameters>
-        <parameter name="group">
-          <type name="GSList" c:type="GSList*"/>
-        </parameter>
-        <parameter name="stock_id">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
     </function>
     <record name="GtkRecentActionPrivate" c:type="GtkRecentActionPrivate"/>
     <class name="RecentAction"
@@ -58062,7 +56113,7 @@
     </class>
     <function name="recent_action_new" c:identifier="gtk_recent_action_new">
       <return-value>
-        <type name="GtkAction*" c:type="GtkAction*"/>
+        <type name="Action" c:type="GtkAction*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -58082,7 +56133,7 @@
     <function name="recent_action_new_for_manager"
               c:identifier="gtk_recent_action_new_for_manager">
       <return-value>
-        <type name="GtkAction*" c:type="GtkAction*"/>
+        <type name="Action" c:type="GtkAction*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -58104,7 +56155,7 @@
     </function>
     <record name="GtkRecentFilterInfo" c:type="GtkRecentFilterInfo">
       <field name="contains">
-        <type name="GtkRecentFilterFlags" c:type="GtkRecentFilterFlags"/>
+        <type name="RecentFilterFlags" c:type="GtkRecentFilterFlags"/>
       </field>
       <field name="uri">
         <type name="string" c:type="gchar*"/>
@@ -58116,10 +56167,10 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="applications">
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="GLib.gchar" c:type="gchar**"/>
       </field>
       <field name="groups">
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="GLib.gchar" c:type="gchar**"/>
       </field>
       <field name="age">
         <type name="int32" c:type="gint"/>
@@ -58131,7 +56182,7 @@
       </return-value>
       <parameters>
         <parameter name="filter_info">
-          <type name="GtkRecentFilterInfo*" c:type="GtkRecentFilterInfo*"/>
+          <type name="GtkRecentFilterInfo" c:type="GtkRecentFilterInfo*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -58267,7 +56318,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="data_destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
@@ -58301,10 +56352,10 @@
       </return-value>
       <parameters>
         <parameter name="a">
-          <type name="GtkRecentInfo*" c:type="GtkRecentInfo*"/>
+          <type name="RecentInfo" c:type="GtkRecentInfo*"/>
         </parameter>
         <parameter name="b">
-          <type name="GtkRecentInfo*" c:type="GtkRecentInfo*"/>
+          <type name="RecentInfo" c:type="GtkRecentInfo*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -58315,56 +56366,56 @@
     <function name="recent_chooser_error_quark"
               c:identifier="gtk_recent_chooser_error_quark">
       <return-value>
-        <type name="GQuark" c:type="GQuark"/>
+        <type name="GLib.GQuark" c:type="GQuark"/>
       </return-value>
     </function>
     <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"/>
+        <type name="RecentFilter" 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">
+      <property name="show-tips">
         <type name="boolean" c:type="gboolean"/>
       </property>
+      <property name="limit">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="recent-manager">
+        <type name="RecentManager" c:type="GtkRecentManager"/>
+      </property>
+      <property name="sort-type">
+        <type name="RecentSortType" c:type="GtkRecentSortType"/>
+      </property>
       <property name="show-not-found">
         <type name="boolean" c:type="gboolean"/>
       </property>
+      <property name="select-multiple">
+        <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*"/>
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
           <parameter name="uri">
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -58374,7 +56425,7 @@
         </return-value>
         <parameters>
           <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
       </callback>
@@ -58384,13 +56435,13 @@
         </return-value>
         <parameters>
           <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
           <parameter name="uri">
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -58400,7 +56451,7 @@
         </return-value>
         <parameters>
           <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
           <parameter name="uri">
             <type name="string" c:type="gchar*"/>
@@ -58413,7 +56464,7 @@
         </return-value>
         <parameters>
           <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
       </callback>
@@ -58423,27 +56474,27 @@
         </return-value>
         <parameters>
           <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_items">
         <return-value>
-          <type name="GList*" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_recent_manager">
         <return-value>
-          <type name="GtkRecentManager*" c:type="GtkRecentManager*"/>
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
         </return-value>
         <parameters>
           <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
       </callback>
@@ -58453,10 +56504,10 @@
         </return-value>
         <parameters>
           <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
           <parameter name="filter">
-            <type name="GtkRecentFilter*" c:type="GtkRecentFilter*"/>
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -58466,20 +56517,20 @@
         </return-value>
         <parameters>
           <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
           <parameter name="filter">
-            <type name="GtkRecentFilter*" c:type="GtkRecentFilter*"/>
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="list_filters">
         <return-value>
-          <type name="GSList*" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
           <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
       </callback>
@@ -58489,7 +56540,7 @@
         </return-value>
         <parameters>
           <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
           <parameter name="sort_func">
             <type name="GtkRecentSortFunc" c:type="GtkRecentSortFunc"/>
@@ -58498,7 +56549,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </callback>
@@ -58508,7 +56559,7 @@
         </return-value>
         <parameters>
           <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
       </callback>
@@ -58518,7 +56569,7 @@
         </return-value>
         <parameters>
           <parameter name="chooser">
-            <type name="GtkRecentChooser*" c:type="GtkRecentChooser*"/>
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
       </callback>
@@ -58750,7 +56801,7 @@
     <function name="recent_chooser_get_sort_type"
               c:identifier="gtk_recent_chooser_get_sort_type">
       <return-value>
-        <type name="GtkRecentSortType" c:type="GtkRecentSortType"/>
+        <type name="RecentSortType" c:type="GtkRecentSortType"/>
       </return-value>
       <parameters>
         <parameter name="chooser">
@@ -58774,7 +56825,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="data_destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -58791,7 +56842,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -58809,7 +56860,7 @@
     <function name="recent_chooser_get_current_item"
               c:identifier="gtk_recent_chooser_get_current_item">
       <return-value>
-        <type name="GtkRecentInfo*" c:type="GtkRecentInfo*"/>
+        <type name="RecentInfo" c:type="GtkRecentInfo*"/>
       </return-value>
       <parameters>
         <parameter name="chooser">
@@ -58830,7 +56881,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="error">
-          <type name="GError" c:type="GError**"/>
+          <type name="GLib.GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
@@ -58873,7 +56924,7 @@
     <function name="recent_chooser_get_items"
               c:identifier="gtk_recent_chooser_get_items">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GLib.GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="chooser">
@@ -58884,7 +56935,7 @@
     <function name="recent_chooser_get_uris"
               c:identifier="gtk_recent_chooser_get_uris">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="GLib.gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="chooser">
@@ -58926,7 +56977,7 @@
     <function name="recent_chooser_list_filters"
               c:identifier="gtk_recent_chooser_list_filters">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="chooser">
@@ -58951,7 +57002,7 @@
     <function name="recent_chooser_get_filter"
               c:identifier="gtk_recent_chooser_get_filter">
       <return-value>
-        <type name="GtkRecentFilter*" c:type="GtkRecentFilter*"/>
+        <type name="RecentFilter" c:type="GtkRecentFilter*"/>
       </return-value>
       <parameters>
         <parameter name="chooser">
@@ -58970,7 +57021,7 @@
     <function name="recent_chooser_dialog_new"
               c:identifier="gtk_recent_chooser_dialog_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="title">
@@ -58987,7 +57038,7 @@
     <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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="title">
@@ -59063,13 +57114,13 @@
     <function name="recent_chooser_menu_new"
               c:identifier="gtk_recent_chooser_menu_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="manager">
@@ -59088,13 +57139,13 @@
     <function name="recent_chooser_widget_new"
               c:identifier="gtk_recent_chooser_widget_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="manager">
@@ -59117,7 +57168,7 @@
             <type name="ScaleButton" c:type="GtkScaleButton*"/>
           </parameter>
           <parameter name="icons">
-            <type name="gchar" c:type="gchar**"/>
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
         </parameters>
       </method>
@@ -59173,10 +57224,10 @@
         <type name="double" c:type="gdouble"/>
       </property>
       <property name="size">
-        <type name="GtkIconSize" c:type="GtkIconSize"/>
+        <type name="IconSize" c:type="GtkIconSize"/>
       </property>
       <property name="adjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+        <type name="Adjustment" c:type="GtkAdjustment"/>
       </property>
       <property name="icons">
         <type name="GStrv" c:type="GStrv"/>
@@ -59187,7 +57238,7 @@
         </return-value>
         <parameters>
           <parameter name="button">
-            <type name="GtkScaleButton*" c:type="GtkScaleButton*"/>
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
           </parameter>
           <parameter name="value">
             <type name="double" c:type="gdouble"/>
@@ -59237,7 +57288,7 @@
     </class>
     <function name="scale_button_new" c:identifier="gtk_scale_button_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="size">
@@ -59253,7 +57304,7 @@
           <type name="double" c:type="gdouble"/>
         </parameter>
         <parameter name="icons">
-          <type name="gchar" c:type="gchar**"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
@@ -59338,13 +57389,13 @@
         </parameters>
       </method>
       <property name="hadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+        <type name="Adjustment" c:type="GtkAdjustment"/>
       </property>
       <property name="vadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+        <type name="Adjustment" c:type="GtkAdjustment"/>
       </property>
       <property name="shadow-type">
-        <type name="GtkShadowType" c:type="GtkShadowType"/>
+        <type name="ShadowType" c:type="GtkShadowType"/>
       </property>
       <callback name="set_scroll_adjustments">
         <return-value>
@@ -59352,13 +57403,13 @@
         </return-value>
         <parameters>
           <parameter name="viewport">
-            <type name="GtkViewport*" c:type="GtkViewport*"/>
+            <type name="Viewport" c:type="GtkViewport*"/>
           </parameter>
           <parameter name="hadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
           <parameter name="vadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </callback>
@@ -59368,17 +57419,17 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
         </parameters>
       </glib:signal>
     </class>
     <function name="viewport_new" c:identifier="gtk_viewport_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="hadjustment">
@@ -59574,25 +57625,25 @@
         </parameters>
       </method>
       <property name="hadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+        <type name="Adjustment" c:type="GtkAdjustment"/>
       </property>
       <property name="vadjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+        <type name="Adjustment" c:type="GtkAdjustment"/>
       </property>
       <property name="hscrollbar-policy">
-        <type name="GtkPolicyType" c:type="GtkPolicyType"/>
+        <type name="PolicyType" c:type="GtkPolicyType"/>
       </property>
       <property name="vscrollbar-policy">
-        <type name="GtkPolicyType" c:type="GtkPolicyType"/>
+        <type name="PolicyType" c:type="GtkPolicyType"/>
       </property>
       <property name="window-placement">
-        <type name="GtkCornerType" c:type="GtkCornerType"/>
+        <type name="CornerType" 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"/>
+        <type name="ShadowType" c:type="GtkShadowType"/>
       </property>
       <field name="scrollbar_spacing">
         <type name="int32" c:type="gint"/>
@@ -59603,10 +57654,10 @@
         </return-value>
         <parameters>
           <parameter name="scrolled_window">
-            <type name="GtkScrolledWindow*" c:type="GtkScrolledWindow*"/>
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
           <parameter name="scroll">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
           <parameter name="horizontal">
             <type name="boolean" c:type="gboolean"/>
@@ -59619,10 +57670,10 @@
         </return-value>
         <parameters>
           <parameter name="scrolled_window">
-            <type name="GtkScrolledWindow*" c:type="GtkScrolledWindow*"/>
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
           <parameter name="direction">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </callback>
@@ -59652,7 +57703,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -59662,7 +57713,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
           <parameter name="p0">
             <type name="boolean" c:type="gboolean"/>
@@ -59673,7 +57724,7 @@
     <function name="scrolled_window_new"
               c:identifier="gtk_scrolled_window_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="hadjustment">
@@ -59704,7 +57755,7 @@
     <function name="separator_menu_item_new"
               c:identifier="gtk_separator_menu_item_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <record name="GtkSeparatorToolItemPrivate"
@@ -59764,12 +57815,12 @@
     <function name="separator_tool_item_new"
               c:identifier="gtk_separator_tool_item_new">
       <return-value>
-        <type name="GtkToolItem*" c:type="GtkToolItem*"/>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
       </return-value>
     </function>
     <class name="SizeGroup"
            c:type="GtkSizeGroup"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkSizeGroup"
            glib:get-type="gtk_size_group_get_type">
       <constructor name="new" c:identifier="gtk_size_group_new">
@@ -59858,7 +57909,7 @@
       </method>
       <method name="get_widgets" c:identifier="gtk_size_group_get_widgets">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
           <parameter name="size_group">
@@ -59867,7 +57918,7 @@
         </parameters>
       </method>
       <property name="mode">
-        <type name="GtkSizeGroupMode" c:type="GtkSizeGroupMode"/>
+        <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
       </property>
       <property name="ignore-hidden">
         <type name="boolean" c:type="gboolean"/>
@@ -59952,7 +58003,7 @@
             <type name="double" c:type="gdouble"/>
           </parameter>
           <parameter name="digits">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -59990,13 +58041,13 @@
             <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
           <parameter name="digits">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_digits" c:identifier="gtk_spin_button_get_digits">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="spin_button">
@@ -60031,10 +58082,10 @@
             <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
           <parameter name="step">
-            <type name="gdouble" c:type="gdouble*"/>
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
           <parameter name="page">
-            <type name="gdouble" c:type="gdouble*"/>
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
@@ -60063,10 +58114,10 @@
             <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
           <parameter name="min">
-            <type name="gdouble" c:type="gdouble*"/>
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
           <parameter name="max">
-            <type name="gdouble" c:type="gdouble*"/>
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
@@ -60229,13 +58280,13 @@
         </parameters>
       </method>
       <property name="adjustment">
-        <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+        <type name="Adjustment" c:type="GtkAdjustment"/>
       </property>
       <property name="climb-rate">
         <type name="double" c:type="gdouble"/>
       </property>
       <property name="digits">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="snap-to-ticks">
         <type name="boolean" c:type="gboolean"/>
@@ -60247,7 +58298,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="update-policy">
-        <type name="GtkSpinButtonUpdatePolicy"
+        <type name="SpinButtonUpdatePolicy"
               c:type="GtkSpinButtonUpdatePolicy"/>
       </property>
       <property name="value">
@@ -60259,10 +58310,10 @@
         </return-value>
         <parameters>
           <parameter name="spin_button">
-            <type name="GtkSpinButton*" c:type="GtkSpinButton*"/>
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
           <parameter name="new_value">
-            <type name="gdouble*" c:type="gdouble*"/>
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </callback>
@@ -60272,7 +58323,7 @@
         </return-value>
         <parameters>
           <parameter name="spin_button">
-            <type name="GtkSpinButton*" c:type="GtkSpinButton*"/>
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -60282,7 +58333,7 @@
         </return-value>
         <parameters>
           <parameter name="spin_button">
-            <type name="GtkSpinButton*" c:type="GtkSpinButton*"/>
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -60292,10 +58343,10 @@
         </return-value>
         <parameters>
           <parameter name="spin_button">
-            <type name="GtkSpinButton*" c:type="GtkSpinButton*"/>
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
           <parameter name="scroll">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
       </callback>
@@ -60305,7 +58356,7 @@
         </return-value>
         <parameters>
           <parameter name="spin_button">
-            <type name="GtkSpinButton*" c:type="GtkSpinButton*"/>
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -60335,7 +58386,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkScrollType" c:type="GtkScrollType"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -60362,7 +58413,7 @@
     </class>
     <function name="spin_button_new" c:identifier="gtk_spin_button_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="adjustment">
@@ -60372,14 +58423,14 @@
           <type name="double" c:type="gdouble"/>
         </parameter>
         <parameter name="digits">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="spin_button_new_with_range"
               c:identifier="gtk_spin_button_new_with_range">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="min">
@@ -60401,7 +58452,7 @@
       <method name="get_context_id"
               c:identifier="gtk_statusbar_get_context_id">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="statusbar">
@@ -60414,14 +58465,14 @@
       </method>
       <method name="push" c:identifier="gtk_statusbar_push">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" 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"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="text">
             <type name="string" c:type="gchar*"/>
@@ -60437,7 +58488,7 @@
             <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
           <parameter name="context_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -60450,10 +58501,10 @@
             <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
           <parameter name="context_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="message_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -60494,10 +58545,10 @@
         </return-value>
         <parameters>
           <parameter name="statusbar">
-            <type name="GtkStatusbar*" c:type="GtkStatusbar*"/>
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
           <parameter name="context_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="text">
             <type name="string" c:type="gchar*"/>
@@ -60510,10 +58561,10 @@
         </return-value>
         <parameters>
           <parameter name="statusbar">
-            <type name="GtkStatusbar*" c:type="GtkStatusbar*"/>
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
           <parameter name="context_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="text">
             <type name="string" c:type="gchar*"/>
@@ -60546,7 +58597,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="p0">
             <type name="string" c:type="gchararray"/>
@@ -60559,7 +58610,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="p0">
             <type name="string" c:type="gchararray"/>
@@ -60569,13 +58620,13 @@
     </class>
     <function name="statusbar_new" c:identifier="gtk_statusbar_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <record name="GtkStatusIconPrivate" c:type="GtkStatusIconPrivate"/>
     <class name="StatusIcon"
            c:type="GtkStatusIcon"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkStatusIcon"
            glib:get-type="gtk_status_icon_get_type">
       <constructor name="new" c:identifier="gtk_status_icon_new">
@@ -60859,19 +58910,19 @@
         <type name="string" c:type="gchararray"/>
       </property>
       <property name="storage-type">
-        <type name="GtkImageType" c:type="GtkImageType"/>
+        <type name="ImageType" c:type="GtkImageType"/>
       </property>
       <property name="size">
         <type name="int32" c:type="gint"/>
       </property>
       <property name="screen">
-        <type name="GdkScreen" c:type="GdkScreen"/>
+        <type name="Gdk.Screen" c:type="GdkScreen"/>
       </property>
       <property name="visible">
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="orientation">
-        <type name="GtkOrientation" c:type="GtkOrientation"/>
+        <type name="Orientation" c:type="GtkOrientation"/>
       </property>
       <property name="embedded">
         <type name="boolean" c:type="gboolean"/>
@@ -60885,7 +58936,7 @@
         </return-value>
         <parameters>
           <parameter name="status_icon">
-            <type name="GtkStatusIcon*" c:type="GtkStatusIcon*"/>
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
       </callback>
@@ -60895,10 +58946,10 @@
         </return-value>
         <parameters>
           <parameter name="status_icon">
-            <type name="GtkStatusIcon*" c:type="GtkStatusIcon*"/>
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
           <parameter name="button">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="activate_time">
             <type name="uint32" c:type="guint32"/>
@@ -60911,7 +58962,7 @@
         </return-value>
         <parameters>
           <parameter name="status_icon">
-            <type name="GtkStatusIcon*" c:type="GtkStatusIcon*"/>
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
           <parameter name="size">
             <type name="int32" c:type="gint"/>
@@ -60942,10 +58993,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="p0">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -60975,13 +59026,13 @@
           <type name="Menu" c:type="GtkMenu*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="y">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="push_in">
-          <type name="gboolean" c:type="gboolean*"/>
+          <type name="GLib.gboolean" c:type="gboolean*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -60999,7 +59050,7 @@
         <type name="GdkModifierType" c:type="GdkModifierType"/>
       </field>
       <field name="keyval">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="translation_domain">
         <type name="string" c:type="gchar*"/>
@@ -61014,7 +59065,7 @@
           <type name="GtkStockItem" c:type="GtkStockItem*"/>
         </parameter>
         <parameter name="n_items">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -61027,7 +59078,7 @@
           <type name="GtkStockItem" c:type="GtkStockItem*"/>
         </parameter>
         <parameter name="n_items">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -61046,12 +59097,12 @@
     </function>
     <function name="stock_list_ids" c:identifier="gtk_stock_list_ids">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.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*"/>
+        <type name="GtkStockItem" c:type="GtkStockItem*"/>
       </return-value>
       <parameters>
         <parameter name="item">
@@ -61091,7 +59142,7 @@
     </function>
     <record name="GtkTableChild" c:type="GtkTableChild">
       <field name="widget">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </field>
       <field name="left_attach">
         <type name="uint16" c:type="guint16"/>
@@ -61112,22 +59163,22 @@
         <type name="uint16" c:type="guint16"/>
       </field>
       <field name="xexpand">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="yexpand">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="xshrink">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="yshrink">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="xfill">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="yfill">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <record name="GtkTableRowCol" c:type="GtkTableRowCol">
@@ -61141,19 +59192,19 @@
         <type name="uint16" c:type="guint16"/>
       </field>
       <field name="need_expand">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="need_shrink">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="expand">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="shrink">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="empty">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <class name="Table"
@@ -61170,10 +59221,10 @@
             <type name="Table" c:type="GtkTable*"/>
           </parameter>
           <parameter name="rows">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="columns">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -61189,16 +59240,16 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="left_attach">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="right_attach">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="top_attach">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="bottom_attach">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="xoptions">
             <type name="AttachOptions" c:type="GtkAttachOptions"/>
@@ -61207,10 +59258,10 @@
             <type name="AttachOptions" c:type="GtkAttachOptions"/>
           </parameter>
           <parameter name="xpadding">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="ypadding">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -61226,16 +59277,16 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="left_attach">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="right_attach">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="top_attach">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="bottom_attach">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -61248,23 +59299,23 @@
             <type name="Table" c:type="GtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="spacing">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" 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"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="table">
             <type name="Table" c:type="GtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -61277,23 +59328,23 @@
             <type name="Table" c:type="GtkTable*"/>
           </parameter>
           <parameter name="column">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="spacing">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" 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"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="table">
             <type name="Table" c:type="GtkTable*"/>
           </parameter>
           <parameter name="column">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -61307,14 +59358,14 @@
             <type name="Table" c:type="GtkTable*"/>
           </parameter>
           <parameter name="spacing">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" 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"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="table">
@@ -61332,14 +59383,14 @@
             <type name="Table" c:type="GtkTable*"/>
           </parameter>
           <parameter name="spacing">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" 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"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="table">
@@ -61371,16 +59422,16 @@
         </parameters>
       </method>
       <property name="n-rows">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="n-columns">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="column-spacing">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="row-spacing">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </property>
       <property name="homogeneous">
         <type name="boolean" c:type="gboolean"/>
@@ -61388,14 +59439,14 @@
     </class>
     <function name="table_new" c:identifier="gtk_table_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="rows">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="columns">
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="homogeneous">
           <type name="boolean" c:type="gboolean"/>
@@ -61431,7 +59482,7 @@
     <function name="tearoff_menu_item_new"
               c:identifier="gtk_tearoff_menu_item_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <callback name="GtkTextTagTableForeach">
@@ -61440,7 +59491,7 @@
       </return-value>
       <parameters>
         <parameter name="tag">
-          <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+          <type name="TextTag" c:type="GtkTextTag*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -61449,7 +59500,7 @@
     </callback>
     <class name="TextTagTable"
            c:type="GtkTextTagTable"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkTextTagTable"
            glib:get-type="gtk_text_tag_table_get_type">
       <constructor name="new" c:identifier="gtk_text_tag_table_new">
@@ -61516,10 +59567,10 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="GtkTextTagTable*" c:type="GtkTextTagTable*"/>
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
           </parameter>
           <parameter name="tag">
-            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
           <parameter name="size_changed">
             <type name="boolean" c:type="gboolean"/>
@@ -61532,10 +59583,10 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="GtkTextTagTable*" c:type="GtkTextTagTable*"/>
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
           </parameter>
           <parameter name="tag">
-            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
         </parameters>
       </callback>
@@ -61545,10 +59596,10 @@
         </return-value>
         <parameters>
           <parameter name="table">
-            <type name="GtkTextTagTable*" c:type="GtkTextTagTable*"/>
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
           </parameter>
           <parameter name="tag">
-            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
         </parameters>
       </callback>
@@ -61578,7 +59629,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTextTag" c:type="GtkTextTag"/>
+            <type name="TextTag" c:type="GtkTextTag"/>
           </parameter>
           <parameter name="p0">
             <type name="boolean" c:type="gboolean"/>
@@ -61591,7 +59642,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTextTag" c:type="GtkTextTag"/>
+            <type name="TextTag" c:type="GtkTextTag"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -61601,7 +59652,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTextTag" c:type="GtkTextTag"/>
+            <type name="TextTag" c:type="GtkTextTag"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -61636,7 +59687,7 @@
     </function>
     <class name="TextMark"
            c:type="GtkTextMark"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkTextMark"
            glib:get-type="gtk_text_mark_get_type">
       <constructor name="new" c:identifier="gtk_text_mark_new">
@@ -61697,7 +59748,7 @@
       </method>
       <method name="get_buffer" c:identifier="gtk_text_mark_get_buffer">
         <return-value>
-          <type name="GtkTextBuffer" c:type="GtkTextBuffer*"/>
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
         </return-value>
         <parameters>
           <parameter name="mark">
@@ -61747,7 +59798,7 @@
     <record name="GtkTextLogAttrCache" c:type="GtkTextLogAttrCache"/>
     <class name="TextBuffer"
            c:type="GtkTextBuffer"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkTextBuffer"
            glib:get-type="gtk_text_buffer_get_type">
       <constructor name="new" c:identifier="gtk_text_buffer_new">
@@ -62748,7 +60799,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="user_data_destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
@@ -62786,7 +60837,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="user_data_destroy">
-            <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
@@ -62873,7 +60924,7 @@
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="n_formats">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -62887,7 +60938,7 @@
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="n_formats">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -62940,12 +60991,12 @@
             <type name="size" c:type="gsize"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
       <property name="tag-table">
-        <type name="GtkTextTagTable" c:type="GtkTextTagTable"/>
+        <type name="TextTagTable" c:type="GtkTextTagTable"/>
       </property>
       <property name="text">
         <type name="string" c:type="gchararray"/>
@@ -62957,10 +61008,10 @@
         <type name="int32" c:type="gint"/>
       </property>
       <property name="copy-target-list">
-        <type name="GtkTargetList" c:type="GtkTargetList"/>
+        <type name="TargetList" c:type="GtkTargetList"/>
       </property>
       <property name="paste-target-list">
-        <type name="GtkTargetList" c:type="GtkTargetList"/>
+        <type name="TargetList" c:type="GtkTargetList"/>
       </property>
       <callback name="insert_text">
         <return-value>
@@ -62968,10 +61019,10 @@
         </return-value>
         <parameters>
           <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="pos">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="text">
             <type name="string" c:type="gchar*"/>
@@ -62987,13 +61038,13 @@
         </return-value>
         <parameters>
           <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="pos">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf*" c:type="GdkPixbuf*"/>
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </callback>
@@ -63003,13 +61054,13 @@
         </return-value>
         <parameters>
           <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="pos">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="anchor">
-            <type name="GtkTextChildAnchor*" c:type="GtkTextChildAnchor*"/>
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
           </parameter>
         </parameters>
       </callback>
@@ -63019,13 +61070,13 @@
         </return-value>
         <parameters>
           <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="start">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="end">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -63035,7 +61086,7 @@
         </return-value>
         <parameters>
           <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
       </callback>
@@ -63045,7 +61096,7 @@
         </return-value>
         <parameters>
           <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
       </callback>
@@ -63055,13 +61106,13 @@
         </return-value>
         <parameters>
           <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="location">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="mark">
-            <type name="GtkTextMark*" c:type="GtkTextMark*"/>
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
       </callback>
@@ -63071,10 +61122,10 @@
         </return-value>
         <parameters>
           <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="mark">
-            <type name="GtkTextMark*" c:type="GtkTextMark*"/>
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
       </callback>
@@ -63084,16 +61135,16 @@
         </return-value>
         <parameters>
           <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="tag">
-            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
           <parameter name="start_char">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="end_char">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -63103,16 +61154,16 @@
         </return-value>
         <parameters>
           <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="tag">
-            <type name="GtkTextTag*" c:type="GtkTextTag*"/>
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
           <parameter name="start_char">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="end_char">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -63122,7 +61173,7 @@
         </return-value>
         <parameters>
           <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
       </callback>
@@ -63132,7 +61183,7 @@
         </return-value>
         <parameters>
           <parameter name="buffer">
-            <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
       </callback>
@@ -63177,7 +61228,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
           <parameter name="p0">
             <type name="string" c:type="gchararray"/>
@@ -63193,7 +61244,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
           <parameter name="p0">
             <type name="GdkPixbuf" c:type="GdkPixbuf"/>
@@ -63206,10 +61257,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTextChildAnchor" c:type="GtkTextChildAnchor"/>
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -63219,10 +61270,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -63237,10 +61288,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTextMark" c:type="GtkTextMark"/>
+            <type name="TextMark" c:type="GtkTextMark"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -63250,7 +61301,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTextMark" c:type="GtkTextMark"/>
+            <type name="TextMark" c:type="GtkTextMark"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -63260,13 +61311,13 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTextTag" c:type="GtkTextTag"/>
+            <type name="TextTag" c:type="GtkTextTag"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
           <parameter name="p1">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -63276,13 +61327,13 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkTextTag" c:type="GtkTextTag"/>
+            <type name="TextTag" c:type="GtkTextTag"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
           <parameter name="p1">
-            <type name="GtkTextIter" c:type="GtkTextIter"/>
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -63310,7 +61361,7 @@
     <function name="text_buffer_get_btree"
               c:identifier="_gtk_text_buffer_get_btree">
       <return-value>
-        <type name="GtkTextBTree*" c:type="GtkTextBTree*"/>
+        <type name="GtkTextBTree" c:type="GtkTextBTree*"/>
       </return-value>
       <parameters>
         <parameter name="buffer">
@@ -63321,7 +61372,7 @@
     <function name="text_buffer_get_line_log_attrs"
               c:identifier="_gtk_text_buffer_get_line_log_attrs">
       <return-value>
-        <type name="PangoLogAttr*" c:type="PangoLogAttr*"/>
+        <type name="Pango.PangoLogAttr" c:type="PangoLogAttr*"/>
       </return-value>
       <parameters>
         <parameter name="buffer">
@@ -63331,7 +61382,7 @@
           <type name="TextIter" c:type="GtkTextIter*"/>
         </parameter>
         <parameter name="char_len">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -63351,23 +61402,23 @@
     </function>
     <callback name="GtkTextBufferSerializeFunc">
       <return-value>
-        <type name="guint8*" c:type="guint8*"/>
+        <type name="guint8" c:type="guint8*"/>
       </return-value>
       <parameters>
         <parameter name="register_buffer">
-          <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
         </parameter>
         <parameter name="content_buffer">
-          <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
         </parameter>
         <parameter name="start">
-          <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          <type name="TextIter" c:type="GtkTextIter*"/>
         </parameter>
         <parameter name="end">
-          <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          <type name="TextIter" c:type="GtkTextIter*"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize*" c:type="gsize*"/>
+          <type name="gsize" c:type="gsize*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -63380,16 +61431,16 @@
       </return-value>
       <parameters>
         <parameter name="register_buffer">
-          <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
         </parameter>
         <parameter name="content_buffer">
-          <type name="GtkTextBuffer*" c:type="GtkTextBuffer*"/>
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
         </parameter>
         <parameter name="iter">
-          <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+          <type name="TextIter" c:type="GtkTextIter*"/>
         </parameter>
         <parameter name="data">
-          <type name="guint8*" c:type="guint8*"/>
+          <type name="guint8" c:type="guint8*"/>
         </parameter>
         <parameter name="length">
           <type name="size" c:type="gsize"/>
@@ -63401,7 +61452,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="error">
-          <type name="GError**" c:type="GError**"/>
+          <type name="GLib.GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </callback>
@@ -63615,7 +61666,7 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="trailing">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -63638,10 +61689,10 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -63660,7 +61711,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="line_top">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -63683,10 +61734,10 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="window_x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="window_y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -63709,10 +61760,10 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="buffer_x">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="buffer_y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -64233,10 +62284,10 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="wrap-mode">
-        <type name="GtkWrapMode" c:type="GtkWrapMode"/>
+        <type name="WrapMode" c:type="GtkWrapMode"/>
       </property>
       <property name="justification">
-        <type name="GtkJustification" c:type="GtkJustification"/>
+        <type name="Justification" c:type="GtkJustification"/>
       </property>
       <property name="left-margin">
         <type name="int32" c:type="gint"/>
@@ -64254,7 +62305,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="buffer">
-        <type name="GtkTextBuffer" c:type="GtkTextBuffer"/>
+        <type name="TextBuffer" c:type="GtkTextBuffer"/>
       </property>
       <property name="overwrite">
         <type name="boolean" c:type="gboolean"/>
@@ -64268,13 +62319,13 @@
         </return-value>
         <parameters>
           <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="hadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
           <parameter name="vadjustment">
-            <type name="GtkAdjustment*" c:type="GtkAdjustment*"/>
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </callback>
@@ -64284,10 +62335,10 @@
         </return-value>
         <parameters>
           <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="menu">
-            <type name="GtkMenu*" c:type="GtkMenu*"/>
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
         </parameters>
       </callback>
@@ -64297,10 +62348,10 @@
         </return-value>
         <parameters>
           <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="step">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="count">
             <type name="int32" c:type="gint"/>
@@ -64316,7 +62367,7 @@
         </return-value>
         <parameters>
           <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="count">
             <type name="int32" c:type="gint"/>
@@ -64332,7 +62383,7 @@
         </return-value>
         <parameters>
           <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -64342,7 +62393,7 @@
         </return-value>
         <parameters>
           <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="str">
             <type name="string" c:type="gchar*"/>
@@ -64355,10 +62406,10 @@
         </return-value>
         <parameters>
           <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="type">
-            <type name="GtkDeleteType" c:type="GtkDeleteType"/>
+            <type name="DeleteType" c:type="GtkDeleteType"/>
           </parameter>
           <parameter name="count">
             <type name="int32" c:type="gint"/>
@@ -64371,7 +62422,7 @@
         </return-value>
         <parameters>
           <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -64381,7 +62432,7 @@
         </return-value>
         <parameters>
           <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -64391,7 +62442,7 @@
         </return-value>
         <parameters>
           <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -64401,7 +62452,7 @@
         </return-value>
         <parameters>
           <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -64411,7 +62462,7 @@
         </return-value>
         <parameters>
           <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </callback>
@@ -64421,10 +62472,10 @@
         </return-value>
         <parameters>
           <parameter name="text_view">
-            <type name="GtkTextView*" c:type="GtkTextView*"/>
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="direction">
-            <type name="GtkDirectionType" c:type="GtkDirectionType"/>
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </callback>
@@ -64469,7 +62520,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkMovementStep" c:type="GtkMovementStep"/>
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="p0">
             <type name="int32" c:type="gint"/>
@@ -64490,7 +62541,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkMenu" c:type="GtkMenu"/>
+            <type name="Menu" c:type="GtkMenu"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -64510,7 +62561,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkDeleteType" c:type="GtkDeleteType"/>
+            <type name="DeleteType" c:type="GtkDeleteType"/>
           </parameter>
           <parameter name="p0">
             <type name="int32" c:type="gint"/>
@@ -64543,10 +62594,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkAdjustment" c:type="GtkAdjustment"/>
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -64579,7 +62630,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkScrollStep" c:type="GtkScrollStep"/>
+            <type name="ScrollStep" c:type="GtkScrollStep"/>
           </parameter>
           <parameter name="p0">
             <type name="int32" c:type="gint"/>
@@ -64599,13 +62650,13 @@
     </class>
     <function name="text_view_new" c:identifier="gtk_text_view_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" 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*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="buffer">
@@ -64615,13 +62666,13 @@
     </function>
     <record name="GtkTipsQuery" c:type="GtkTipsQuery">
       <field name="label">
-        <type name="GtkLabel" c:type="GtkLabel"/>
+        <type name="Label" c:type="GtkLabel"/>
       </field>
       <field name="emit_always">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="in_query">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="label_inactive">
         <type name="string" c:type="gchar*"/>
@@ -64630,13 +62681,13 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="caller">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </field>
       <field name="last_crossed">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </field>
       <field name="query_cursor">
-        <type name="GdkCursor*" c:type="GdkCursor*"/>
+        <type name="GdkCursor" c:type="GdkCursor*"/>
       </field>
       <callback name="start_query">
         <return-value>
@@ -64644,7 +62695,7 @@
         </return-value>
         <parameters>
           <parameter name="tips_query">
-            <type name="GtkTipsQuery*" c:type="GtkTipsQuery*"/>
+            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
           </parameter>
         </parameters>
       </callback>
@@ -64654,7 +62705,7 @@
         </return-value>
         <parameters>
           <parameter name="tips_query">
-            <type name="GtkTipsQuery*" c:type="GtkTipsQuery*"/>
+            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
           </parameter>
         </parameters>
       </callback>
@@ -64664,10 +62715,10 @@
         </return-value>
         <parameters>
           <parameter name="tips_query">
-            <type name="GtkTipsQuery*" c:type="GtkTipsQuery*"/>
+            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="tip_text">
             <type name="string" c:type="gchar*"/>
@@ -64683,10 +62734,10 @@
         </return-value>
         <parameters>
           <parameter name="tips_query">
-            <type name="GtkTipsQuery*" c:type="GtkTipsQuery*"/>
+            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="tip_text">
             <type name="string" c:type="gchar*"/>
@@ -64695,7 +62746,7 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="event">
-            <type name="GdkEventButton*" c:type="GdkEventButton*"/>
+            <type name="Gdk.GdkEventButton" c:type="GdkEventButton*"/>
           </parameter>
         </parameters>
       </callback>
@@ -64728,7 +62779,7 @@
     </function>
     <function name="tips_query_new" c:identifier="gtk_tips_query_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="tips_query_start_query"
@@ -64786,16 +62837,16 @@
     </function>
     <record name="GtkToolbarChild" c:type="GtkToolbarChild">
       <field name="type">
-        <type name="GtkToolbarChildType" c:type="GtkToolbarChildType"/>
+        <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
       </field>
       <field name="widget">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </field>
       <field name="icon">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </field>
       <field name="label">
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </field>
     </record>
     <record name="GtkToolbarPrivate" c:type="GtkToolbarPrivate"/>
@@ -65366,10 +63417,10 @@
         </parameters>
       </method>
       <property name="orientation">
-        <type name="GtkOrientation" c:type="GtkOrientation"/>
+        <type name="Orientation" c:type="GtkOrientation"/>
       </property>
       <property name="toolbar-style">
-        <type name="GtkToolbarStyle" c:type="GtkToolbarStyle"/>
+        <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
       </property>
       <property name="show-arrow">
         <type name="boolean" c:type="gboolean"/>
@@ -65378,7 +63429,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="icon-size">
-        <type name="GtkIconSize" c:type="GtkIconSize"/>
+        <type name="IconSize" c:type="GtkIconSize"/>
       </property>
       <property name="icon-size-set">
         <type name="boolean" c:type="gboolean"/>
@@ -65389,10 +63440,10 @@
         </return-value>
         <parameters>
           <parameter name="toolbar">
-            <type name="GtkToolbar*" c:type="GtkToolbar*"/>
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
           <parameter name="orientation">
-            <type name="GtkOrientation" c:type="GtkOrientation"/>
+            <type name="Orientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
       </callback>
@@ -65402,10 +63453,10 @@
         </return-value>
         <parameters>
           <parameter name="toolbar">
-            <type name="GtkToolbar*" c:type="GtkToolbar*"/>
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
           <parameter name="style">
-            <type name="GtkToolbarStyle" c:type="GtkToolbarStyle"/>
+            <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
           </parameter>
         </parameters>
       </callback>
@@ -65415,7 +63466,7 @@
         </return-value>
         <parameters>
           <parameter name="toolbar">
-            <type name="GtkToolbar*" c:type="GtkToolbar*"/>
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -65449,7 +63500,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkOrientation" c:type="GtkOrientation"/>
+            <type name="Orientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -65459,7 +63510,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkToolbarStyle" c:type="GtkToolbarStyle"/>
+            <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -65492,7 +63543,7 @@
     </class>
     <function name="toolbar_new" c:identifier="gtk_toolbar_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="toolbar_elide_underscores"
@@ -65554,10 +63605,10 @@
         </return-value>
         <parameters>
           <parameter name="drag_source">
-            <type name="GtkTreeDragSource*" c:type="GtkTreeDragSource*"/>
+            <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </callback>
@@ -65567,13 +63618,13 @@
         </return-value>
         <parameters>
           <parameter name="drag_source">
-            <type name="GtkTreeDragSource*" c:type="GtkTreeDragSource*"/>
+            <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
           <parameter name="selection_data">
-            <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
           </parameter>
         </parameters>
       </callback>
@@ -65583,10 +63634,10 @@
         </return-value>
         <parameters>
           <parameter name="drag_source">
-            <type name="GtkTreeDragSource*" c:type="GtkTreeDragSource*"/>
+            <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
           </parameter>
           <parameter name="path">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </callback>
@@ -65647,99 +63698,247 @@
         </return-value>
         <parameters>
           <parameter name="drag_dest">
-            <type name="GtkTreeDragDest*" c:type="GtkTreeDragDest*"/>
+            <type name="TreeDragDest" c:type="GtkTreeDragDest*"/>
           </parameter>
           <parameter name="dest">
-            <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
           <parameter name="selection_data">
-            <type name="GtkSelectionData*" c:type="GtkSelectionData*"/>
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="row_drop_possible">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="boolean" 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>
+      </callback>
+    </interface>
+    <function name="tree_drag_dest_drag_data_received"
+              c:identifier="gtk_tree_drag_dest_drag_data_received">
+      <return-value>
+        <type name="boolean" 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="boolean" 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="boolean" 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="boolean" 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="GObject.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">
+        <return-value>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_model">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="convert_child_path_to_path"
+              c:identifier="gtk_tree_model_sort_convert_child_path_to_path">
+        <return-value>
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          </parameter>
+          <parameter name="child_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="convert_child_iter_to_iter"
+              c:identifier="gtk_tree_model_sort_convert_child_iter_to_iter">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <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="convert_path_to_child_path"
+              c:identifier="gtk_tree_model_sort_convert_path_to_child_path">
+        <return-value>
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          </parameter>
+          <parameter name="sorted_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="convert_iter_to_child_iter"
+              c:identifier="gtk_tree_model_sort_convert_iter_to_child_iter">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <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="reset_default_sort_func"
+              c:identifier="gtk_tree_model_sort_reset_default_sort_func">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="clear_cache"
+              c:identifier="gtk_tree_model_sort_clear_cache">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="iter_is_valid"
+              c:identifier="gtk_tree_model_sort_iter_is_valid">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <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="model">
+        <type name="TreeModel" c:type="GtkTreeModel"/>
+      </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>
-        <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="boolean" 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="boolean" 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">
+    </class>
+    <function name="tree_model_sort_new_with_model"
+              c:identifier="gtk_tree_model_sort_new_with_model">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="TreeModel" c:type="GtkTreeModel*"/>
       </return-value>
       <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="tree_model">
+        <parameter name="child_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="boolean" 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>
     <callback name="GtkTreeSelectionFunc">
@@ -65748,13 +63947,13 @@
       </return-value>
       <parameters>
         <parameter name="selection">
-          <type name="GtkTreeSelection*" c:type="GtkTreeSelection*"/>
+          <type name="TreeSelection" c:type="GtkTreeSelection*"/>
         </parameter>
         <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
         <parameter name="path_currently_selected">
           <type name="boolean" c:type="gboolean"/>
@@ -65770,13 +63969,13 @@
       </return-value>
       <parameters>
         <parameter name="model">
-          <type name="GtkTreeModel*" c:type="GtkTreeModel*"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
         <parameter name="path">
-          <type name="GtkTreePath*" c:type="GtkTreePath*"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
         <parameter name="iter">
-          <type name="GtkTreeIter*" c:type="GtkTreeIter*"/>
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -65785,7 +63984,7 @@
     </callback>
     <class name="TreeSelection"
            c:type="GtkTreeSelection"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkTreeSelection"
            glib:get-type="gtk_tree_selection_get_type">
       <method name="set_mode" c:identifier="gtk_tree_selection_set_mode">
@@ -65873,7 +64072,7 @@
       <method name="get_selected_rows"
               c:identifier="gtk_tree_selection_get_selected_rows">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="selection">
@@ -66056,7 +64255,7 @@
         </return-value>
         <parameters>
           <parameter name="selection">
-            <type name="GtkTreeSelection*" c:type="GtkTreeSelection*"/>
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
         </parameters>
       </callback>
@@ -66086,10 +64285,413 @@
         </return-value>
       </glib:signal>
     </class>
+    <class name="TreeStore"
+           c:type="GtkTreeStore"
+           parent="GObject.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="GObject.GType" c:type="GType*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="set_column_types"
+              c:identifier="gtk_tree_store_set_column_types">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          </parameter>
+          <parameter name="n_columns">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="types">
+            <type name="GObject.GType" c:type="GType*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_value" c:identifier="gtk_tree_store_set_value">
+        <return-value>
+          <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="column">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.GValue" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set" c:identifier="gtk_tree_store_set">
+        <return-value>
+          <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>
+        </parameters>
+      </method>
+      <method name="set_valuesv" c:identifier="gtk_tree_store_set_valuesv">
+        <return-value>
+          <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="columns">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="values">
+            <type name="GObject.GValue" c:type="GValue*"/>
+          </parameter>
+          <parameter name="n_values">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_valist" c:identifier="gtk_tree_store_set_valist">
+        <return-value>
+          <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="var_args">
+            <type name="va_list" c:type="va_list"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove" c:identifier="gtk_tree_store_remove">
+        <return-value>
+          <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>
+        </parameters>
+      </method>
+      <method name="insert" c:identifier="gtk_tree_store_insert">
+        <return-value>
+          <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>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_before" c:identifier="gtk_tree_store_insert_before">
+        <return-value>
+          <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>
+          <parameter name="sibling">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_after" c:identifier="gtk_tree_store_insert_after">
+        <return-value>
+          <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>
+          <parameter name="sibling">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_with_values"
+              c:identifier="gtk_tree_store_insert_with_values">
+        <return-value>
+          <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>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_with_valuesv"
+              c:identifier="gtk_tree_store_insert_with_valuesv">
+        <return-value>
+          <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>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="columns">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="values">
+            <type name="GObject.GValue" c:type="GValue*"/>
+          </parameter>
+          <parameter name="n_values">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="prepend" c:identifier="gtk_tree_store_prepend">
+        <return-value>
+          <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>
+        </parameters>
+      </method>
+      <method name="append" c:identifier="gtk_tree_store_append">
+        <return-value>
+          <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>
+        </parameters>
+      </method>
+      <method name="is_ancestor" c:identifier="gtk_tree_store_is_ancestor">
+        <return-value>
+          <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="descendant">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="iter_depth" c:identifier="gtk_tree_store_iter_depth">
+        <return-value>
+          <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>
+        </parameters>
+      </method>
+      <method name="clear" c:identifier="gtk_tree_store_clear">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="iter_is_valid" c:identifier="gtk_tree_store_iter_is_valid">
+        <return-value>
+          <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>
+        </parameters>
+      </method>
+      <method name="reorder" c:identifier="gtk_tree_store_reorder">
+        <return-value>
+          <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="GLib.gint" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="swap" c:identifier="gtk_tree_store_swap">
+        <return-value>
+          <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>
+          <parameter name="b">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="move_before" c:identifier="gtk_tree_store_move_before">
+        <return-value>
+          <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="position" allow-none="1">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="move_after" c:identifier="gtk_tree_store_move_after">
+        <return-value>
+          <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="position" allow-none="1">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </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>
     <record name="GtkUIManagerPrivate" c:type="GtkUIManagerPrivate"/>
     <class name="UIManager"
            c:type="GtkUIManager"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkUIManager"
            glib:get-type="gtk_ui_manager_get_type">
       <constructor name="new" c:identifier="gtk_ui_manager_new">
@@ -66156,7 +64758,7 @@
       <method name="get_action_groups"
               c:identifier="gtk_ui_manager_get_action_groups">
         <return-value>
-          <type name="GList" c:type="GList*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="self">
@@ -66190,7 +64792,7 @@
       </method>
       <method name="get_toplevels" c:identifier="gtk_ui_manager_get_toplevels">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
           <parameter name="self">
@@ -66217,7 +64819,7 @@
       <method name="add_ui_from_string"
               c:identifier="gtk_ui_manager_add_ui_from_string">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="self">
@@ -66230,14 +64832,14 @@
             <type name="ssize" c:type="gssize"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
       <method name="add_ui_from_file"
               c:identifier="gtk_ui_manager_add_ui_from_file">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="self">
@@ -66247,7 +64849,7 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError" c:type="GError**"/>
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
@@ -66260,7 +64862,7 @@
             <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
           <parameter name="merge_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="path">
             <type name="string" c:type="gchar*"/>
@@ -66288,7 +64890,7 @@
             <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
           <parameter name="merge_id">
-            <type name="guint" c:type="guint"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -66314,7 +64916,7 @@
       </method>
       <method name="new_merge_id" c:identifier="gtk_ui_manager_new_merge_id">
         <return-value>
-          <type name="guint" c:type="guint"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="self">
@@ -66334,10 +64936,10 @@
         </return-value>
         <parameters>
           <parameter name="merge">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
           <parameter name="widget">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -66347,7 +64949,7 @@
         </return-value>
         <parameters>
           <parameter name="merge">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
         </parameters>
       </callback>
@@ -66357,13 +64959,13 @@
         </return-value>
         <parameters>
           <parameter name="merge">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
           <parameter name="action">
-            <type name="GtkAction*" c:type="GtkAction*"/>
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
           <parameter name="proxy">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -66373,13 +64975,13 @@
         </return-value>
         <parameters>
           <parameter name="merge">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
           <parameter name="action">
-            <type name="GtkAction*" c:type="GtkAction*"/>
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
           <parameter name="proxy">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
@@ -66389,10 +64991,10 @@
         </return-value>
         <parameters>
           <parameter name="merge">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
           <parameter name="action">
-            <type name="GtkAction*" c:type="GtkAction*"/>
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </callback>
@@ -66402,20 +65004,20 @@
         </return-value>
         <parameters>
           <parameter name="merge">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
           <parameter name="action">
-            <type name="GtkAction*" c:type="GtkAction*"/>
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="get_widget">
         <return-value>
-          <type name="GtkWidget*" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
           <parameter name="manager">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
           <parameter name="path">
             <type name="string" c:type="gchar*"/>
@@ -66424,11 +65026,11 @@
       </callback>
       <callback name="get_action">
         <return-value>
-          <type name="GtkAction*" c:type="GtkAction*"/>
+          <type name="Action" c:type="GtkAction*"/>
         </return-value>
         <parameters>
           <parameter name="manager">
-            <type name="GtkUIManager*" c:type="GtkUIManager*"/>
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
           <parameter name="path">
             <type name="string" c:type="gchar*"/>
@@ -66451,10 +65053,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkAction" c:type="GtkAction"/>
+            <type name="Action" c:type="GtkAction"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -66464,10 +65066,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkAction" c:type="GtkAction"/>
+            <type name="Action" c:type="GtkAction"/>
           </parameter>
           <parameter name="p0">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -66477,7 +65079,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkAction" c:type="GtkAction"/>
+            <type name="Action" c:type="GtkAction"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -66487,7 +65089,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkAction" c:type="GtkAction"/>
+            <type name="Action" c:type="GtkAction"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -66497,7 +65099,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkWidget" c:type="GtkWidget"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -66515,7 +65117,7 @@
     </class>
     <function name="vbutton_box_new" c:identifier="gtk_vbutton_box_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <function name="vbutton_box_get_spacing_default"
@@ -66538,7 +65140,7 @@
     <function name="vbutton_box_get_layout_default"
               c:identifier="gtk_vbutton_box_get_layout_default">
       <return-value>
-        <type name="GtkButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
+        <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
       </return-value>
     </function>
     <function name="vbutton_box_set_layout_default"
@@ -66580,7 +65182,7 @@
     </class>
     <function name="volume_button_new" c:identifier="gtk_volume_button_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <class name="VPaned"
@@ -66591,7 +65193,7 @@
     </class>
     <function name="vpaned_new" c:identifier="gtk_vpaned_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <class name="VRuler"
@@ -66602,7 +65204,7 @@
     </class>
     <function name="vruler_new" c:identifier="gtk_vruler_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <class name="VScale"
@@ -66613,7 +65215,7 @@
     </class>
     <function name="vscale_new" c:identifier="gtk_vscale_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="adjustment">
@@ -66624,7 +65226,7 @@
     <function name="vscale_new_with_range"
               c:identifier="gtk_vscale_new_with_range">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
         <parameter name="min">
@@ -66646,7 +65248,7 @@
     </class>
     <function name="vseparator_new" c:identifier="gtk_vseparator_new">
       <return-value>
-        <type name="GtkWidget*" c:type="GtkWidget*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
     <record name="GtkIMContextInfo" c:type="GtkIMContextInfo">
@@ -66675,13 +65277,13 @@
           <type name="GtkIMContextInfo" c:type="GtkIMContextInfo***"/>
         </parameter>
         <parameter name="n_contexts">
-          <type name="guint" c:type="guint*"/>
+          <type name="GLib.guint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
     <function name="im_module_create" c:identifier="_gtk_im_module_create">
       <return-value>
-        <type name="GtkIMContext*" c:type="GtkIMContext*"/>
+        <type name="IMContext" c:type="GtkIMContext*"/>
       </return-value>
       <parameters>
         <parameter name="context_id">
@@ -66720,16 +65322,16 @@
     <record name="GtkTextLineData" c:type="GtkTextLineData"/>
     <record name="GtkTextLineDisplay" c:type="GtkTextLineDisplay">
       <field name="layout">
-        <type name="PangoLayout*" c:type="PangoLayout*"/>
+        <type name="Pango.Layout" c:type="PangoLayout*"/>
       </field>
       <field name="cursors">
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </field>
       <field name="shaped_objects">
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GLib.GSList" c:type="GSList*"/>
       </field>
       <field name="direction">
-        <type name="GtkTextDirection" c:type="GtkTextDirection"/>
+        <type name="TextDirection" c:type="GtkTextDirection"/>
       </field>
       <field name="width">
         <type name="int32" c:type="gint"/>
@@ -66762,22 +65364,22 @@
         <type name="boolean" c:type="gboolean"/>
       </field>
       <field name="line">
-        <type name="GtkTextLine*" c:type="GtkTextLine*"/>
+        <type name="GtkTextLine" c:type="GtkTextLine*"/>
       </field>
       <field name="pg_bg_color">
-        <type name="GdkColor*" c:type="GdkColor*"/>
+        <type name="GdkColor" c:type="GdkColor*"/>
       </field>
       <field name="block_cursor">
         <type name="GdkRectangle" c:type="GdkRectangle"/>
       </field>
       <field name="cursors_invalid">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="has_block_cursor">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="cursor_at_line_end">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <record name="GtkTextCursorDisplay" c:type="GtkTextCursorDisplay">
@@ -66791,15 +65393,15 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="is_strong">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
       <field name="is_weak">
-        <type name="guint" c:type="guint"/>
+        <type name="uint32" c:type="guint"/>
       </field>
     </record>
     <record name="GtkTextAttrAppearance" c:type="GtkTextAttrAppearance">
       <field name="attr">
-        <type name="PangoAttribute" c:type="PangoAttribute"/>
+        <type name="Pango.PangoAttribute" c:type="PangoAttribute"/>
       </field>
       <field name="appearance">
         <type name="GtkTextAppearance" c:type="GtkTextAppearance"/>
@@ -66807,7 +65409,7 @@
     </record>
     <class name="TextLayout"
            c:type="GtkTextLayout"
-           parent="GLib.Object"
+           parent="GObject.Object"
            glib:type-name="GtkTextLayout"
            glib:get-type="gtk_text_layout_get_type">
       <constructor name="new" c:identifier="gtk_text_layout_new">
@@ -66989,16 +65591,16 @@
             <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="width">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_lines" c:identifier="gtk_text_layout_get_lines">
         <return-value>
-          <type name="GSList" c:type="GSList*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -67011,7 +65613,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="first_line_y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -67084,7 +65686,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="line_top">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -67121,7 +65723,7 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="trailing">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -67309,10 +65911,10 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="y">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="gint" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -67515,7 +66117,7 @@
             <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="widgets">
-            <type name="GList" c:type="GList**"/>
+            <type name="GLib.GList" c:type="GList**"/>
           </parameter>
         </parameters>
       </method>
@@ -67525,7 +66127,7 @@
         </return-value>
         <parameters>
           <parameter name="layout">
-            <type name="GtkTextLayout*" c:type="GtkTextLayout*"/>
+            <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
         </parameters>
       </callback>
@@ -67535,7 +66137,7 @@
         </return-value>
         <parameters>
           <parameter name="layout">
-            <type name="GtkTextLayout*" c:type="GtkTextLayout*"/>
+            <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="y">
             <type name="int32" c:type="gint"/>
@@ -67550,17 +66152,17 @@
       </callback>
       <callback name="wrap">
         <return-value>
-          <type name="GtkTextLineData*" c:type="GtkTextLineData*"/>
+          <type name="GtkTextLineData" c:type="GtkTextLineData*"/>
         </return-value>
         <parameters>
           <parameter name="layout">
-            <type name="GtkTextLayout*" c:type="GtkTextLayout*"/>
+            <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="line">
-            <type name="GtkTextLine*" c:type="GtkTextLine*"/>
+            <type name="GtkTextLine" c:type="GtkTextLine*"/>
           </parameter>
           <parameter name="line_data">
-            <type name="GtkTextLineData*" c:type="GtkTextLineData*"/>
+            <type name="GtkTextLineData" c:type="GtkTextLineData*"/>
           </parameter>
         </parameters>
       </callback>
@@ -67570,16 +66172,16 @@
         </return-value>
         <parameters>
           <parameter name="layout">
-            <type name="GtkTextLayout*" c:type="GtkTextLayout*"/>
+            <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="line">
-            <type name="GtkTextLine*" c:type="GtkTextLine*"/>
+            <type name="GtkTextLine" c:type="GtkTextLine*"/>
           </parameter>
           <parameter name="attrs">
-            <type name="PangoLogAttr**" c:type="PangoLogAttr**"/>
+            <type name="Pango.PangoLogAttr" c:type="PangoLogAttr**"/>
           </parameter>
           <parameter name="n_attrs">
-            <type name="gint*" c:type="gint*"/>
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -67589,13 +66191,13 @@
         </return-value>
         <parameters>
           <parameter name="layout">
-            <type name="GtkTextLayout*" c:type="GtkTextLayout*"/>
+            <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="start">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="end">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -67605,13 +66207,13 @@
         </return-value>
         <parameters>
           <parameter name="layout">
-            <type name="GtkTextLayout*" c:type="GtkTextLayout*"/>
+            <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="line">
-            <type name="GtkTextLine*" c:type="GtkTextLine*"/>
+            <type name="GtkTextLine" c:type="GtkTextLine*"/>
           </parameter>
           <parameter name="line_data">
-            <type name="GtkTextLineData*" c:type="GtkTextLineData*"/>
+            <type name="GtkTextLineData" c:type="GtkTextLineData*"/>
           </parameter>
         </parameters>
       </callback>
@@ -67621,10 +66223,10 @@
         </return-value>
         <parameters>
           <parameter name="layout">
-            <type name="GtkTextLayout*" c:type="GtkTextLayout*"/>
+            <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="child">
-            <type name="GtkWidget*" c:type="GtkWidget*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -67640,13 +66242,13 @@
         </return-value>
         <parameters>
           <parameter name="layout">
-            <type name="GtkTextLayout*" c:type="GtkTextLayout*"/>
+            <type name="TextLayout" c:type="GtkTextLayout*"/>
           </parameter>
           <parameter name="start">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="end">
-            <type name="GtkTextIter*" c:type="GtkTextIter*"/>
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </callback>
@@ -67716,10 +66318,10 @@
           <type name="TextIter" c:type="GtkTextIter*"/>
         </parameter>
         <parameter name="x">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
         <parameter name="width">
-          <type name="gint" c:type="gint*"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]